Benchtests: Remove simple_memcmp

Message ID PAWPR08MB89825054F6DC5176D969D8C583B49@PAWPR08MB8982.eurprd08.prod.outlook.com
State Committed
Commit 183b425a05f421db0f21a9a81553816525fe93b9
Headers
Series Benchtests: Remove simple_memcmp |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit fail Patch caused testsuite regressions

Commit Message

Wilco Dijkstra March 8, 2023, 11:02 a.m. UTC
  Remove the slow byte oriented simple_memcmp.

---
  

Comments

Adhemerval Zanella March 8, 2023, 3:23 p.m. UTC | #1
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
>
  

Patch

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