* [PATCH] Benchtests: Remove simple_memcmp
@ 2023-03-08 11:02 Wilco Dijkstra
2023-03-08 15:23 ` Adhemerval Zanella Netto
0 siblings, 1 reply; 2+ messages in thread
From: Wilco Dijkstra @ 2023-03-08 11:02 UTC (permalink / raw)
To: 'GNU C Library'
Remove the slow byte oriented simple_memcmp.
---
diff --git a/benchtests/bench-memcmp.c b/benchtests/bench-memcmp.c
index a9379530656f474433ed6d852f75f71b1a1eb385..4d2b8cbb30b1d847ecde540be9f0049dd5249acf 100644
--- a/benchtests/bench-memcmp.c
+++ b/benchtests/bench-memcmp.c
@@ -19,46 +19,16 @@
#define TEST_MAIN
#ifdef TEST_MEMCMPEQ
# define TEST_NAME "__memcmpeq"
-# define SIMPLE_MEMCMP simple_memcmpeq
#elif defined WIDE
# define TEST_NAME "wmemcmp"
-# define SIMPLE_MEMCMP simple_wmemcmp
#else
# define TEST_NAME "memcmp"
-# define SIMPLE_MEMCMP simple_memcmp
#endif
#include "bench-string.h"
-#ifdef WIDE
-
-int
-SIMPLE_MEMCMP (const wchar_t *s1, const wchar_t *s2, size_t n)
-{
- int ret = 0;
- /* Warning!
- wmemcmp has to use SIGNED comparison for elements.
- memcmp has to use UNSIGNED comparison for elemnts.
- */
- while (n-- && (ret = *s1 < *s2 ? -1 : *s1 == *s2 ? 0 : 1) == 0) {s1++; s2++;}
- return ret;
-}
-#else
-# include <limits.h>
-
-int
-SIMPLE_MEMCMP (const char *s1, const char *s2, size_t n)
-{
- int ret = 0;
-
- while (n-- && (ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) == 0);
- return ret;
-}
-#endif
-
-# include "json-lib.h"
+#include "json-lib.h"
typedef int (*proto_t) (const CHAR *, const CHAR *, size_t);
-IMPL (SIMPLE_MEMCMP, 0)
IMPL (MEMCMP, 1)
static void
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] Benchtests: Remove simple_memcmp
2023-03-08 11:02 [PATCH] Benchtests: Remove simple_memcmp Wilco Dijkstra
@ 2023-03-08 15:23 ` Adhemerval Zanella Netto
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella Netto @ 2023-03-08 15:23 UTC (permalink / raw)
To: Wilco Dijkstra, 'GNU C Library'
On 08/03/23 08:02, Wilco Dijkstra via Libc-alpha wrote:
>
> Remove the slow byte oriented simple_memcmp.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
>
> ---
>
> diff --git a/benchtests/bench-memcmp.c b/benchtests/bench-memcmp.c
> index a9379530656f474433ed6d852f75f71b1a1eb385..4d2b8cbb30b1d847ecde540be9f0049dd5249acf 100644
> --- a/benchtests/bench-memcmp.c
> +++ b/benchtests/bench-memcmp.c
> @@ -19,46 +19,16 @@
> #define TEST_MAIN
> #ifdef TEST_MEMCMPEQ
> # define TEST_NAME "__memcmpeq"
> -# define SIMPLE_MEMCMP simple_memcmpeq
> #elif defined WIDE
> # define TEST_NAME "wmemcmp"
> -# define SIMPLE_MEMCMP simple_wmemcmp
> #else
> # define TEST_NAME "memcmp"
> -# define SIMPLE_MEMCMP simple_memcmp
> #endif
> #include "bench-string.h"
> -#ifdef WIDE
> -
> -int
> -SIMPLE_MEMCMP (const wchar_t *s1, const wchar_t *s2, size_t n)
> -{
> - int ret = 0;
> - /* Warning!
> - wmemcmp has to use SIGNED comparison for elements.
> - memcmp has to use UNSIGNED comparison for elemnts.
> - */
> - while (n-- && (ret = *s1 < *s2 ? -1 : *s1 == *s2 ? 0 : 1) == 0) {s1++; s2++;}
> - return ret;
> -}
> -#else
> -# include <limits.h>
> -
> -int
> -SIMPLE_MEMCMP (const char *s1, const char *s2, size_t n)
> -{
> - int ret = 0;
> -
> - while (n-- && (ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) == 0);
> - return ret;
> -}
> -#endif
> -
> -# include "json-lib.h"
> +#include "json-lib.h"
>
> typedef int (*proto_t) (const CHAR *, const CHAR *, size_t);
>
> -IMPL (SIMPLE_MEMCMP, 0)
> IMPL (MEMCMP, 1)
>
> static void
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-08 15:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 11:02 [PATCH] Benchtests: Remove simple_memcmp Wilco Dijkstra
2023-03-08 15:23 ` Adhemerval Zanella Netto
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).