From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id B284F211BB for ; Thu, 27 Dec 2018 18:26:41 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :content-type:content-transfer-encoding:mime-version; q=dns; s= default; b=t2LfBoGRu/86+t+1bIyMBWeVOp1a5SK4V1obzQHIFjXCOcm9Diu4W xeojUBUslmqGnZKO2RFKXe10PdfTL0IAjioTnXMRdW3cH2WW7rTH2uPwbT6gLGYe IeyKH3ueF9a9JXvQXK4c//F9PA9XYKiZJdVsyt7VayKDLHLRPnjPN4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :content-type:content-transfer-encoding:mime-version; s=default; bh=6Nc0VGFiUzrVez8SU7UmnzDVnbQ=; b=exRROQcsUp1S97FNn+kgz5WKhQBJ +QzMk3RFD4pJtLm2FMSKX0TcSG6xv1SMz6VcgCUWxhi0UdejyPRqYlWE5Wh94nuA A/Nm17qu9tzU3eiEfp862Kiz86FNdUZT28jP2LpPuX+NXvalGIpK0G9lCpgUFjBt HJQTlcBWbf+ncgE= Received: (qmail 6199 invoked by alias); 27 Dec 2018 18:26:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 6186 invoked by uid 89); 27 Dec 2018 18:26:38 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GJSVy6DH7g5PUBwo0r4vkwHjb1s35njYKODbO6MWB5s=; b=M1/2whzsCf9wriS+Aco0O7JAVHMqD3fpQHawmGZSyjyp89ipK9gLSKb1EhiNLyouxXOTcHWXtrKLPf4I1potwhC6khXbVu4Lw0D+AxUGlOZBHxEhWt8fSuddG6fIZCLSr/22puBw3yyHXt0VcgSlqTvvIALUHo/AM2F4aNyyQVo= From: Wilco Dijkstra To: 'GNU C Library' CC: nd Subject: [PATCH] Improve string benchtests Date: Thu, 27 Dec 2018 18:26:30 +0000 Message-ID: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Wilco.Dijkstra@arm.com; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Replace slow byte-oriented tests in several string benchmarks with the generic implementations from the string/ directory so the comparisons are more realistic and useful. OK to commit? ChangeLog: 2018-12-27 Wilco Dijkstra * benchtests/bench-stpcpy.c (SIMPLE_STPCPY): Remove function. (generic_stpcpy): New function. * benchtests/bench-stpncpy.c (SIMPLE_STPNCPY): Remove function. (generic_stpncpy): New function. * benchtests/bench-strcat.c (SIMPLE_STRCAT): Remove function. (generic_strcat): New function. * benchtests/bench-strcpy.c (SIMPLE_STRCPY): Remove function. (generic_strcpy): New function. * benchtests/bench-strncat.c (SIMPLE_STRNCAT): Remove function. (STUPID_STRNCAT): Remove function. (generic_strncat): New function. * benchtests/bench-strncpy.c (SIMPLE_STRNCPY): Remove function. (STUPID_STRNCPY): Remove function. (generic_strncpy): New function. * benchtests/bench-strnlen.c (SIMPLE_STRNLEN): Remove function. (generic_strnlen): New function. (memchr_strnlen): New function. -- diff --git a/benchtests/bench-stpcpy.c b/benchtests/bench-stpcpy.c index 77ffb0f5c22b8d8ba83d46e903a23c90d8c983c1..7982c1886bb0af680b00757d838= 3b2ef84503533 100644 --- a/benchtests/bench-stpcpy.c +++ b/benchtests/bench-stpcpy.c @@ -24,22 +24,15 @@ # define TEST_NAME "wcpcpy" #endif /* WIDE */ #include "bench-string.h" -#ifndef WIDE -# define SIMPLE_STPCPY simple_stpcpy -#else -# define SIMPLE_STPCPY simple_wcpcpy -#endif /* WIDE */ - -CHAR *SIMPLE_STPCPY (CHAR *, const CHAR *); - -IMPL (SIMPLE_STPCPY, 0) -IMPL (STPCPY, 1) =20 CHAR * -SIMPLE_STPCPY (CHAR *dst, const CHAR *src) +generic_stpcpy (CHAR *dst, const CHAR *src) { - while ((*dst++ =3D *src++) !=3D '\0'); - return dst - 1; + size_t len =3D STRLEN (src); + return (CHAR*)MEMCPY (dst, src, len + 1) + len; } =20 +IMPL (STPCPY, 1) +IMPL (generic_stpcpy, 0) + #include "bench-strcpy.c" diff --git a/benchtests/bench-stpncpy.c b/benchtests/bench-stpncpy.c index 40c82cf716e6d7bc8fcb8d5a390da1ee8fee3245..331f5e67b7fc054bd678dbd264a= 24e43f940c0ed 100644 --- a/benchtests/bench-stpncpy.c +++ b/benchtests/bench-stpncpy.c @@ -24,47 +24,19 @@ # define TEST_NAME "wcpncpy" #endif /* WIDE */ #include "bench-string.h" -#ifndef WIDE -# define SIMPLE_STPNCPY simple_stpncpy -# define STUPID_STPNCPY stupid_stpncpy -#else -# define SIMPLE_STPNCPY simple_wcpncpy -# define STUPID_STPNCPY stupid_wcpncpy -#endif /* WIDE */ - -CHAR *SIMPLE_STPNCPY (CHAR *, const CHAR *, size_t); -CHAR *STUPID_STPNCPY (CHAR *, const CHAR *, size_t); - -IMPL (STUPID_STPNCPY, 0) -IMPL (SIMPLE_STPNCPY, 0) -IMPL (STPNCPY, 1) - -CHAR * -SIMPLE_STPNCPY (CHAR *dst, const CHAR *src, size_t n) -{ - while (n--) - if ((*dst++ =3D *src++) =3D=3D '\0') - { - size_t i; - - for (i =3D 0; i < n; ++i) - dst[i] =3D '\0'; - return dst - 1; - } - return dst; -} =20 CHAR * -STUPID_STPNCPY (CHAR *dst, const CHAR *src, size_t n) +generic_stpncpy (CHAR *dst, const CHAR *src, size_t n) { size_t nc =3D STRNLEN (src, n); - size_t i; - - for (i =3D 0; i < nc; ++i) - dst[i] =3D src[i]; - for (; i < n; ++i) - dst[i] =3D '\0'; - return dst + nc; + MEMCPY (dst, src, nc); + dst +=3D nc; + if (nc =3D=3D n) + return dst; + return MEMSET (dst, 0, n - nc); } =20 +IMPL (STPNCPY, 1) +IMPL (generic_stpncpy, 0) + #include "bench-strncpy.c" diff --git a/benchtests/bench-strcat.c b/benchtests/bench-strcat.c index 6b3b084ae19a931cb2bda07794380b5745ccfc86..d3e96f4ec6331bea0027016eb6a= f4a276d0e6714 100644 --- a/benchtests/bench-strcat.c +++ b/benchtests/bench-strcat.c @@ -28,31 +28,25 @@ =20 #ifndef WIDE # define sfmt "s" -# define SIMPLE_STRCAT simple_strcat # define SMALL_CHAR 127 #else # define sfmt "ls" -# define SIMPLE_STRCAT simple_wcscat # define SMALL_CHAR 1273 #endif /* WIDE */ =20 =20 typedef CHAR *(*proto_t) (CHAR *, const CHAR *); -CHAR *SIMPLE_STRCAT (CHAR *, const CHAR *); - -IMPL (SIMPLE_STRCAT, 0) -IMPL (STRCAT, 1) =20 CHAR * -SIMPLE_STRCAT (CHAR *dst, const CHAR *src) +generic_strcat (CHAR *dst, const CHAR *src) { - CHAR *ret =3D dst; - while (*dst++ !=3D '\0'); - --dst; - while ((*dst++ =3D *src++) !=3D '\0'); - return ret; + STRCPY (dst + STRLEN (dst), src); + return dst; } =20 +IMPL (STRCAT, 1) +IMPL (generic_strcat, 0) + static void do_one_test (impl_t *impl, CHAR *dst, const CHAR *src) { diff --git a/benchtests/bench-strcpy.c b/benchtests/bench-strcpy.c index e5fd27ffba9ca6dd871e658d1cffc22f28047e49..426ee8f79ad8400b5ceddad5d6c= dfc3523f49f16 100644 --- a/benchtests/bench-strcpy.c +++ b/benchtests/bench-strcpy.c @@ -34,25 +34,17 @@ # else # define TEST_NAME "wcscpy" # endif -# include "bench-string.h" -# ifndef WIDE -# define SIMPLE_STRCPY simple_strcpy -# else -# define SIMPLE_STRCPY simple_wcscpy -# endif - -CHAR *SIMPLE_STRCPY (CHAR *, const CHAR *); - -IMPL (SIMPLE_STRCPY, 0) -IMPL (STRCPY, 1) +#include "bench-string.h" =20 CHAR * -SIMPLE_STRCPY (CHAR *dst, const CHAR *src) +generic_strcpy (CHAR *dst, const CHAR *src) { - CHAR *ret =3D dst; - while ((*dst++ =3D *src++) !=3D '\0'); - return ret; + return MEMCPY (dst, src, STRLEN (src) + 1); } + +IMPL (STRCPY, 1) +IMPL (generic_strcpy, 0) + #endif =20 typedef CHAR *(*proto_t) (CHAR *, const CHAR *); diff --git a/benchtests/bench-strncat.c b/benchtests/bench-strncat.c index 7e0112273ba0727ae29407e38724c39159ce1c93..da8318e9a24e50ca491b65e092c= c5152b3c47715 100644 --- a/benchtests/bench-strncat.c +++ b/benchtests/bench-strncat.c @@ -27,35 +27,26 @@ #define BIG_CHAR MAX_CHAR =20 #ifndef WIDE -# define SIMPLE_STRNCAT simple_strncat -# define STUPID_STRNCAT stupid_strncat # define SMALL_CHAR 127 #else -# define SIMPLE_STRNCAT simple_wcsncat -# define STUPID_STRNCAT stupid_wcsncat # define SMALL_CHAR 1273 #endif /* WIDE */ =20 typedef CHAR *(*proto_t) (CHAR *, const CHAR *, size_t); -CHAR *STUPID_STRNCAT (CHAR *, const CHAR *, size_t); -CHAR *SIMPLE_STRNCAT (CHAR *, const CHAR *, size_t); - -IMPL (STUPID_STRNCAT, 0) -IMPL (STRNCAT, 2) =20 CHAR * -STUPID_STRNCAT (CHAR *dst, const CHAR *src, size_t n) +generic_strncat (CHAR *dst, const CHAR *src, size_t n) { - CHAR *ret =3D dst; - while (*dst++ !=3D '\0'); - --dst; - while (n--) - if ((*dst++ =3D *src++) =3D=3D '\0') - return ret; - *dst =3D '\0'; - return ret; + CHAR *end =3D dst + STRLEN (dst); + n =3D STRNLEN (src, n); + end[n] =3D 0; + MEMCPY (end, src, n); + return dst; } =20 +IMPL (STRNCAT, 2) +IMPL (generic_strncat, 0) + static void do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t n) { diff --git a/benchtests/bench-strncpy.c b/benchtests/bench-strncpy.c index 79953759bfbd7201b9e3a846b59666375cb76348..e32a1519cd95af5456277e76581= 3eb78211a3a2a 100644 --- a/benchtests/bench-strncpy.c +++ b/benchtests/bench-strncpy.c @@ -33,47 +33,19 @@ # define TEST_NAME "wcsncpy" # endif /* WIDE */ # include "bench-string.h" -# ifndef WIDE -# define SIMPLE_STRNCPY simple_strncpy -# define STUPID_STRNCPY stupid_strncpy -# else -# define SIMPLE_STRNCPY simple_wcsncpy -# define STUPID_STRNCPY stupid_wcsncpy -# endif /* WIDE */ - -CHAR *SIMPLE_STRNCPY (CHAR *, const CHAR *, size_t); -CHAR *STUPID_STRNCPY (CHAR *, const CHAR *, size_t); - -IMPL (STUPID_STRNCPY, 0) -IMPL (SIMPLE_STRNCPY, 0) -IMPL (STRNCPY, 1) =20 CHAR * -SIMPLE_STRNCPY (CHAR *dst, const CHAR *src, size_t n) +generic_strncpy (CHAR *dst, const CHAR *src, size_t n) { - CHAR *ret =3D dst; - while (n--) - if ((*dst++ =3D *src++) =3D=3D '\0') - { - while (n--) - *dst++ =3D '\0'; - return ret; - } - return ret; + size_t nc =3D STRNLEN (src, n); + if (nc !=3D n) + MEMSET (dst + nc, 0, n - nc); + return MEMCPY (dst, src, nc); } =20 -CHAR * -STUPID_STRNCPY (CHAR *dst, const CHAR *src, size_t n) -{ - size_t nc =3D STRNLEN (src, n); - size_t i; +IMPL (STRNCPY, 1) +IMPL (generic_strncpy, 0) =20 - for (i =3D 0; i < nc; ++i) - dst[i] =3D src[i]; - for (; i < n; ++i) - dst[i] =3D '\0'; - return dst; -} #endif /* !STRNCPY_RESULT */ =20 typedef CHAR *(*proto_t) (CHAR *, const CHAR *, size_t); diff --git a/benchtests/bench-strnlen.c b/benchtests/bench-strnlen.c index 8a7641669a36603e3943b5ca3b9cb0f648dd18f0..8a0fabfcf6c4223dceab3a8eb58= 1851c6ab6be5d 100644 --- a/benchtests/bench-strnlen.c +++ b/benchtests/bench-strnlen.c @@ -28,27 +28,24 @@ =20 #ifndef WIDE # define MIDDLE_CHAR 127 -# define SIMPLE_STRNLEN simple_strnlen #else # define MIDDLE_CHAR 1121 -# define SIMPLE_STRNLEN simple_wcsnlen #endif /* WIDE */ =20 typedef size_t (*proto_t) (const CHAR *, size_t); -size_t SIMPLE_STRNLEN (const CHAR *, size_t); - -IMPL (SIMPLE_STRNLEN, 0) -IMPL (STRNLEN, 1) +size_t generic_strnlen (const CHAR *, size_t); =20 size_t -SIMPLE_STRNLEN (const CHAR *s, size_t maxlen) +memchr_strnlen (const CHAR *s, size_t maxlen) { - size_t i; - - for (i =3D 0; i < maxlen && s[i]; ++i); - return i; + const CHAR *s1 =3D MEMCHR (s, 0, maxlen); + return (s1 =3D=3D NULL) ? maxlen : s1 - s; } =20 +IMPL (STRNLEN, 1) +IMPL (memchr_strnlen, 0) +IMPL (generic_strnlen, 0) + static void do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len) { @@ -146,3 +143,13 @@ test_main (void) } =20 #include + +#define libc_hidden_def(X) +#ifndef WIDE +# undef STRNLEN +# define STRNLEN generic_strnlen +# include +#else +# define WCSNLEN generic_strnlen +# include +#endif