public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Benchtests: Remove simple_mem(r)chr
@ 2023-03-08 18:46 Wilco Dijkstra
0 siblings, 0 replies; only message in thread
From: Wilco Dijkstra @ 2023-03-08 18:46 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dcfcb8e3928f68706e2bfa7527de363a899d2a69
commit dcfcb8e3928f68706e2bfa7527de363a899d2a69
Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
Date: Fri Mar 3 12:54:45 2023 +0000
Benchtests: Remove simple_mem(r)chr
Instead of benchmarking slow byte oriented loops, include the optimized
generic memchr/memrchr implementation. Adjust iteration count to reduce
benchmark time.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
benchtests/bench-memchr.c | 40 ++++++++++++++++++++++------------------
benchtests/bench-memrchr.c | 16 ++++------------
2 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/benchtests/bench-memchr.c b/benchtests/bench-memchr.c
index b99995e293..90bd3879e3 100644
--- a/benchtests/bench-memchr.c
+++ b/benchtests/bench-memchr.c
@@ -16,6 +16,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include "json-lib.h"
+
#ifndef WIDE
# define SMALL_CHAR 127
#else
@@ -31,35 +33,25 @@
# endif /* WIDE */
# include "bench-string.h"
-# ifndef WIDE
-# define SIMPLE_MEMCHR simple_memchr
-# else
-# define SIMPLE_MEMCHR simple_wmemchr
-# endif /* WIDE */
+typedef void *(*proto_t) (const void *, int, size_t);
-typedef CHAR *(*proto_t) (const CHAR *, int, size_t);
-CHAR *SIMPLE_MEMCHR (const CHAR *, int, size_t);
+void *
+generic_memchr (const void *, int, size_t);
-IMPL (SIMPLE_MEMCHR, 0)
IMPL (MEMCHR, 1)
-CHAR *
-SIMPLE_MEMCHR (const CHAR *s, int c, size_t n)
-{
- while (n--)
- if (*s++ == (CHAR) c)
- return (CHAR *) s - 1;
- return NULL;
-}
+# ifndef WIDE
+IMPL (generic_memchr, 0)
+# endif
+
#endif /* !USE_AS_MEMRCHR */
-#include "json-lib.h"
static void
do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, int c,
size_t n)
{
- size_t i, iters = INNER_LOOP_ITERS_LARGE;
+ size_t i, iters = INNER_LOOP_ITERS;
timing_t start, stop, cur;
TIMING_NOW (start);
@@ -250,3 +242,15 @@ test_main (void)
}
#include <support/test-driver.c>
+
+#ifndef WIDE
+# ifndef USE_AS_MEMRCHR
+# undef MEMCHR
+# define MEMCHR generic_memchr
+# include <string/memchr.c>
+# else
+# undef MEMRCHR
+# define MEMRCHR generic_memrchr
+# include <string/memrchr.c>
+# endif
+#endif
diff --git a/benchtests/bench-memrchr.c b/benchtests/bench-memrchr.c
index 4f594ee7cd..1f8c884503 100644
--- a/benchtests/bench-memrchr.c
+++ b/benchtests/bench-memrchr.c
@@ -21,20 +21,12 @@
#include "bench-string.h"
typedef char *(*proto_t) (const char *, int, size_t);
-char *simple_memrchr (const char *, int, size_t);
-IMPL (simple_memrchr, 0)
-IMPL (memrchr, 1)
+void *
+generic_memrchr (const void *, int, size_t);
-char *
-simple_memrchr (const char *s, int c, size_t n)
-{
- s = s + n;
- while (n--)
- if (*--s == (char) c)
- return (char *) s;
- return NULL;
-}
+IMPL (memrchr, 1)
+IMPL (generic_memrchr, 0)
#define USE_AS_MEMRCHR
#include "bench-memchr.c"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-08 18:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 18:46 [glibc] Benchtests: Remove simple_mem(r)chr Wilco Dijkstra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).