From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1895) id 2E7E13850846; Wed, 8 Mar 2023 18:46:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E7E13850846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678301201; bh=7gwNbbmXpE2wQ/E1ipaEMhGd54zi8NS2tJ5juuxehac=; h=From:To:Subject:Date:From; b=yP24gD5vNqSxp5HKIWBD5cJmfCPW9bEPswYQYX8SnprGxiEkyM5aSbkWfKhBlj1pB IXAzwDl0np8StDXRpUmSdrKd4Y2qpKQ5ZTsHYFlPqvTpX59RTSp2285eV0GwWqPifn jiiLKsacgJKPieOaBiUX0B2wJiK33QB4wH4zxxHc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Wilco Dijkstra To: glibc-cvs@sourceware.org Subject: [glibc] Benchtests: Remove memchr_strnlen X-Act-Checkin: glibc X-Git-Author: Wilco Dijkstra X-Git-Refname: refs/heads/master X-Git-Oldrev: dcfcb8e3928f68706e2bfa7527de363a899d2a69 X-Git-Newrev: b0e02d5b6d65cdfc972494484ef9a67b8e55e8f0 Message-Id: <20230308184641.2E7E13850846@sourceware.org> Date: Wed, 8 Mar 2023 18:46:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b0e02d5b6d65cdfc972494484ef9a67b8e55e8f0 commit b0e02d5b6d65cdfc972494484ef9a67b8e55e8f0 Author: Wilco Dijkstra Date: Fri Mar 3 12:57:49 2023 +0000 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 Diff: --- 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)