From b0e02d5b6d65cdfc972494484ef9a67b8e55e8f0 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Fri, 3 Mar 2023 12:57:49 +0000 Subject: [PATCH] Benchtests: Remove memchr_strnlen Remove memchr_strnlen since it is now the same as generic_strnlen. Adjust iteration count to reduce benchmark time. Keep memchr_strlen since the generic strlen does not use memchr. Reviewed-by: Adhemerval Zanella --- benchtests/bench-strlen.c | 2 +- benchtests/bench-strnlen.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/benchtests/bench-strlen.c b/benchtests/bench-strlen.c index cae88dd6ec..9b91f8a10e 100644 --- a/benchtests/bench-strlen.c +++ b/benchtests/bench-strlen.c @@ -48,7 +48,7 @@ IMPL (STRLEN, 1) static void do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, size_t exp_len) { - size_t len = CALL (impl, s), i, iters = INNER_LOOP_ITERS_LARGE; + size_t len = CALL (impl, s), i, iters = INNER_LOOP_ITERS8; timing_t start, stop, cur; if (len != exp_len) diff --git a/benchtests/bench-strnlen.c b/benchtests/bench-strnlen.c index c997d7da4c..a1840afa85 100644 --- a/benchtests/bench-strnlen.c +++ b/benchtests/bench-strnlen.c @@ -22,7 +22,6 @@ #else # define TEST_NAME "wcsnlen" # define generic_strnlen generic_wcsnlen -# define memchr_strnlen wcschr_wcsnlen #endif /* WIDE */ #include "bench-string.h" #include "json-lib.h" @@ -38,22 +37,14 @@ typedef size_t (*proto_t) (const CHAR *, size_t); size_t generic_strnlen (const CHAR *, size_t); -size_t -memchr_strnlen (const CHAR *s, size_t maxlen) -{ - const CHAR *s1 = MEMCHR (s, 0, maxlen); - return (s1 == NULL) ? maxlen : s1 - s; -} - IMPL (STRNLEN, 1) -IMPL (memchr_strnlen, 0) IMPL (generic_strnlen, 0) static void do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len) { - size_t len = CALL (impl, s, maxlen), i, iters = INNER_LOOP_ITERS_LARGE; + size_t len = CALL (impl, s, maxlen), i, iters = INNER_LOOP_ITERS; timing_t start, stop, cur; if (len != exp_len)