AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Benchtests: Remove simple_str(r)chr

Browse Source 
Instead of benchmarking slow byte oriented loops, include the optimized generic
strchr and strrchr implementation.  Adjust iteration count to reduce benchmark
time.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Wilco Dijkstra 2023-03-03 16:10:55 +00:00
parent 9ab7c42387
commit 10f980d31e
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
benchtests/bench-strchr.c
View File

@ -39,7 +39,6 @@
# ifdef USE_FOR_STRCHRNUL
# undef STRCHR
# define STRCHR strchrnul
# define simple_STRCHR simple_STRCHRNUL
# endif /* !USE_FOR_STRCHRNUL */
# define MIDDLE_CHAR 127
# define SMALL_CHAR 23
@ -47,7 +46,6 @@
# ifdef USE_FOR_STRCHRNUL
# undef STRCHR
# define STRCHR wcschrnul
# define simple_STRCHR simple_WCSCHRNUL
# endif /* !USE_FOR_STRCHRNUL */
# define MIDDLE_CHAR 1121
# define SMALL_CHAR 851
@ -67,18 +65,19 @@
typedef CHAR *(*proto_t) (const CHAR *, int);
CHAR *
simple_STRCHR (const CHAR *s, int c)
{
for (; *s != (CHAR) c; ++s)
if (*s == '\0')
return NULLRET ((CHAR *) s);
return (CHAR *) s;
}
IMPL (simple_STRCHR, 0)
IMPL (STRCHR, 1)
#ifndef WIDE
char *generic_strchr (const char *, int);
char *generic_strchrnul (const char *, int);
# ifndef USE_FOR_STRCHRNUL
IMPL (generic_strchr, 0)
# else
IMPL (generic_strchrnul, 0)
# endif
#endif
#ifndef USE_FOR_STRCHRNUL
/* Random benchmarks for strchr (if return is CHAR or NULL). The
rational for the benchmark is returning null/char can be done with
@ -97,7 +96,7 @@ static void __attribute__ ((noinline, noclone))
do_one_rand_plus_branch_test (json_ctx_t *json_ctx, impl_t *impl,
const CHAR *s, const CHAR *c)
{
size_t i, iters = INNER_LOOP_ITERS_LARGE;
size_t i, iters = INNER_LOOP_ITERS8;
int must_execute = 0;
timing_t start, stop, cur;
TIMING_NOW (start);
@ -122,7 +121,7 @@ static void __attribute__ ((noinline, noclone))
do_one_rand_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s,
const CHAR *c)
{
size_t i, iters = INNER_LOOP_ITERS_LARGE;
size_t i, iters = INNER_LOOP_ITERS8;
timing_t start, stop, cur;
TIMING_NOW (start);
for (i = 0; i < iters; ++i)
@ -210,7 +209,7 @@ static void
do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, int c,
const CHAR *exp_res)
{
size_t i, iters = INNER_LOOP_ITERS_LARGE;
size_t i, iters = INNER_LOOP_ITERS8;
timing_t start, stop, cur;
const CHAR *res = CALL (impl, s, c);
if (res != exp_res)
@ -401,3 +400,12 @@ test_main (void)
}
#include <support/test-driver.c>
#ifndef WIDE
# undef STRCHRNUL
# define STRCHRNUL generic_strchrnul
# undef STRCHR
# define STRCHR generic_strchr
# include <string/strchrnul.c>
# include <string/strchr.c>
#endif

31
benchtests/bench-strrchr.c
View File

@ -28,31 +28,21 @@
#define BIG_CHAR MAX_CHAR
#ifdef WIDE
# define SIMPLE_STRRCHR simple_wcsrchr
# define SMALL_CHAR 1273
#else
# define SIMPLE_STRRCHR simple_strrchr
# define SMALL_CHAR 127
char *
generic_strrchr (const char *, int);
IMPL (generic_strrchr, 0)
#endif
typedef CHAR *(*proto_t) (const CHAR *, int);
CHAR *SIMPLE_STRRCHR (const CHAR *, int);
IMPL (SIMPLE_STRRCHR, 0)
IMPL (STRRCHR, 1)
CHAR *
SIMPLE_STRRCHR (const CHAR *s, int c)
{
const CHAR *ret = NULL;
for (; *s != '\0'; ++s)
if (*s == (CHAR) c)
ret = s;
return (CHAR *) (c == '\0' ? s : ret);
}
static void
do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, int c,
CHAR *exp_res)
@ -237,3 +227,12 @@ test_main (void)
}
#include <support/test-driver.c>
#define weak_alias(X,Y)
#define libc_hidden_builtin_def(X)
#ifndef WIDE
# undef STRRCHR
# define STRRCHR generic_strrchr
# define __memrchr memrchr
# include <string/strrchr.c>
#endif