From 3c05dd79d04da765b1ec93ea97474b3b8d9e0af3 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Thu, 29 Aug 2019 15:45:49 +0100 Subject: Use generic memset/memcpy/memmove in benchtests Use the generic C memset/memcpy/memmove in benchtests since comparing against a slow byte-oriented implementation makes no sense. Reviewed-by: Adhemerval Zanella 2019-08-29 Wilco Dijkstra * benchtests/bench-memcpy.c (simple_memcpy): Remove. (generic_memcpy): Include generic C memcpy. * benchtests/bench-memmove.c (simple_memmove): Remove. (generic_memmove): Include generic C memmove. * benchtests/bench-memset.c (simple_memset): Remove. (generic_memset): Include generic C memset. * benchtests/bench-memset-large.c (simple_memset): Remove. (generic_memset): Include generic C memset. * benchtests/bench-memset-walk.c (simple_memset): Remove. (generic_memset): Include generic C memset. * string/memcpy.c (MEMCPY): Add defines to enable redirection. * string/memset.c (MEMSET): Likewise. * sysdeps/x86_64/memcopy.h: Remove empty file. --- string/memcpy.c | 8 +++++--- string/memset.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'string') diff --git a/string/memcpy.c b/string/memcpy.c index a1c4c72d67..2315b6fecb 100644 --- a/string/memcpy.c +++ b/string/memcpy.c @@ -21,10 +21,12 @@ #include #include -#undef memcpy +#ifndef MEMCPY +# define MEMCPY memcpy +#endif void * -memcpy (void *dstpp, const void *srcpp, size_t len) +MEMCPY (void *dstpp, const void *srcpp, size_t len) { unsigned long int dstp = (long int) dstpp; unsigned long int srcp = (long int) srcpp; @@ -57,4 +59,4 @@ memcpy (void *dstpp, const void *srcpp, size_t len) return dstpp; } -libc_hidden_builtin_def (memcpy) +libc_hidden_builtin_def (MEMCPY) diff --git a/string/memset.c b/string/memset.c index 4ac8cb6426..950445c51c 100644 --- a/string/memset.c +++ b/string/memset.c @@ -18,11 +18,13 @@ #include #include -#undef memset +#ifndef MEMSET +# define MEMSET memset +#endif void * inhibit_loop_to_libcall -memset (void *dstpp, int c, size_t len) +MEMSET (void *dstpp, int c, size_t len) { long int dstp = (long int) dstpp; @@ -85,4 +87,4 @@ memset (void *dstpp, int c, size_t len) return dstpp; } -libc_hidden_builtin_def (memset) +libc_hidden_builtin_def (MEMSET) -- cgit 1.4.1