From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) by sourceware.org (Postfix) with ESMTPS id 7CE2E3858431 for ; Wed, 1 Feb 2023 19:49:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7CE2E3858431 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-50e7a0f0cc8so198651947b3.2 for ; Wed, 01 Feb 2023 11:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=oimLiM4c9cvgFjdT2FnAcsnWNLtV4gKAX9wB4nhCaPo=; b=MXLO+9sHoN0u0WNAOprT2uc6EuHcbSdrjtrByd1IXA1EjDZgNEitEaaYvmQWTwS+91 vNk+UnymdXiPjk7RIcZNhMv7XDdC7w0WVxfEcVSn3zTD2ilMdc5H1RV4xykM190hRO+f xNs0Weo2gZZTpyfZOvnHHPRzDN98tT7OzZDT4Hg4W/1LaoyY61IM11VSk5iPooxfzrJH T0I4jbv1Scft96pxtx5HuD/M9t4geDgO7Rvn4I4V8y4QU9lxR1Hoyclp+A7ZgjUK/HwP 8v6wERUpZ8CDyBjkfQv6emOe951omfBleMFIlWqe8RXLYf6TqPw6/WlJJ2dsjjT/MCYR p3oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oimLiM4c9cvgFjdT2FnAcsnWNLtV4gKAX9wB4nhCaPo=; b=loIYlgfnVvS2F5PwiJEQvnMpOmNgpufoG8yyXB8fetsPMZ14kEgFg455k51YOXb83X MSI+tfRBGQAduzbzRLiis0+BC/xU++PSFyWl9gzmmSsIXeXqZs59x8SQHihEWMt2lUjT EfdW6vwv9Sm2pVF4n24V/sxEqCUmTxFPLgvI9OrDPMN7zV312rpWxm7E8YjBQhp8lQ9P hTMIDX7ByO1sF2iHxrxsXs7r05Uu+3pPeuTUxodUClUfpFFFBdaPc5QLpEudvAM9JJxI ctAiW7qGwXXFlgZCEaJjOek5iw/PudW0GZpH0vKVv909AgrS75w0X+miKlq8UJgo8ocp qgYg== X-Gm-Message-State: AO0yUKUERq/cIOZ5PzfE1X/UeEbwvPzqUHXxJTltKHiZoTpMeyya1DiI bVooFQFMCF0hpCtxf/AEduh1cvTM38okixMGA+vXFod3XXU= X-Google-Smtp-Source: AK7set9bUVk8X4O4k0M3EU+ywtWktHHZoPa9wb9oYyyMc+huwm9ahwsDAr0jY6aMBNgDl0jqOJLGkOW6xg1TySMLLYU= X-Received: by 2002:a05:690c:d1f:b0:45d:f0c4:cf4f with SMTP id cn31-20020a05690c0d1f00b0045df0c4cf4fmr404574ywb.251.1675280998738; Wed, 01 Feb 2023 11:49:58 -0800 (PST) MIME-Version: 1.0 References: <20230201170406.303978-1-adhemerval.zanella@linaro.org> <20230201170406.303978-8-adhemerval.zanella@linaro.org> In-Reply-To: <20230201170406.303978-8-adhemerval.zanella@linaro.org> From: Noah Goldstein Date: Wed, 1 Feb 2023 13:49:46 -0600 Message-ID: Subject: Re: [PATCH v11 07/29] string: Improve generic strchrnul To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Richard Henderson , Jeff Law , Xi Ruoyao Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Feb 1, 2023 at 11:04 AM Adhemerval Zanella wrote: > > New algorithm read the first aligned address and mask off the unwanted > bytes (this strategy is similar to arch-specific implementations used > on powerpc, sparc, and sh). > > The loop now read word-aligned address and check using the has_zero_eq > function. > > Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64-linux-gnu, > and powerpc-linux-gnu by removing the arch-specific assembly > implementation and disabling multi-arch (it covers both LE and BE > for 64 and 32 bits). > > Co-authored-by: Richard Henderson > --- > string/strchrnul.c | 155 +++--------------- > .../power4/multiarch/strchrnul-ppc32.c | 4 - > sysdeps/s390/strchrnul-c.c | 2 - > 3 files changed, 22 insertions(+), 139 deletions(-) > > diff --git a/string/strchrnul.c b/string/strchrnul.c > index fa2db4b417..e7887fa285 100644 > --- a/string/strchrnul.c > +++ b/string/strchrnul.c > @@ -1,10 +1,5 @@ > /* Copyright (C) 1991-2023 Free Software Foundation, Inc. > This file is part of the GNU C Library. > - Based on strlen implementation by Torbjorn Granlund (tege@sics.se), > - with help from Dan Sahlin (dan@sics.se) and > - bug fix and commentary by Jim Blandy (jimb@ai.mit.edu); > - adaptation to strchr suggested by Dick Karpinski (dick@cca.ucsf.edu), > - and implemented by Roland McGrath (roland@ai.mit.edu). > > The GNU C Library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > @@ -20,147 +15,41 @@ > License along with the GNU C Library; if not, see > . */ > > +#include > +#include > +#include > +#include > +#include > #include > -#include > -#include > > #undef __strchrnul > #undef strchrnul > > -#ifndef STRCHRNUL > -# define STRCHRNUL __strchrnul > +#ifdef STRCHRNUL > +# define __strchrnul STRCHRNUL > #endif > > /* Find the first occurrence of C in S or the final NUL byte. */ > char * > -STRCHRNUL (const char *s, int c_in) > +__strchrnul (const char *str, int c_in) > { > - const unsigned char *char_ptr; > - const unsigned long int *longword_ptr; > - unsigned long int longword, magic_bits, charmask; > - unsigned char c; > - > - c = (unsigned char) c_in; > - > - /* Handle the first few characters by reading one character at a time. > - Do this until CHAR_PTR is aligned on a longword boundary. */ > - for (char_ptr = (const unsigned char *) s; > - ((unsigned long int) char_ptr & (sizeof (longword) - 1)) != 0; > - ++char_ptr) > - if (*char_ptr == c || *char_ptr == '\0') > - return (void *) char_ptr; > - > - /* All these elucidatory comments refer to 4-byte longwords, > - but the theory applies equally well to 8-byte longwords. */ > - > - longword_ptr = (unsigned long int *) char_ptr; > - > - /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits > - the "holes." Note that there is a hole just to the left of > - each byte, with an extra at the end: > - > - bits: 01111110 11111110 11111110 11111111 > - bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD > - > - The 1-bits make sure that carries propagate to the next 0-bit. > - The 0-bits provide holes for carries to fall into. */ > - magic_bits = -1; > - magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; > - > - /* Set up a longword, each of whose bytes is C. */ > - charmask = c | (c << 8); > - charmask |= charmask << 16; > - if (sizeof (longword) > 4) > - /* Do the shift in two steps to avoid a warning if long has 32 bits. */ > - charmask |= (charmask << 16) << 16; > - if (sizeof (longword) > 8) > - abort (); > - > - /* Instead of the traditional loop which tests each character, > - we will test a longword at a time. The tricky part is testing > - if *any of the four* bytes in the longword in question are zero. */ > - for (;;) > - { > - /* We tentatively exit the loop if adding MAGIC_BITS to > - LONGWORD fails to change any of the hole bits of LONGWORD. > - > - 1) Is this safe? Will it catch all the zero bytes? > - Suppose there is a byte with all zeros. Any carry bits > - propagating from its left will fall into the hole at its > - least significant bit and stop. Since there will be no > - carry from its most significant bit, the LSB of the > - byte to the left will be unchanged, and the zero will be > - detected. > + /* Align pointer to sizeof op_t. */ > + uintptr_t s_int = (uintptr_t) str; > + const op_t *word_ptr = (const op_t *) PTR_ALIGN_DOWN (str, sizeof (op_t)); > > - 2) Is this worthwhile? Will it ignore everything except > - zero bytes? Suppose every byte of LONGWORD has a bit set > - somewhere. There will be a carry into bit 8. If bit 8 > - is set, this will carry into bit 16. If bit 8 is clear, > - one of bits 9-15 must be set, so there will be a carry > - into bit 16. Similarly, there will be a carry into bit > - 24. If one of bits 24-30 is set, there will be a carry > - into bit 31, so all of the hole bits will be changed. > + op_t repeated_c = repeat_bytes (c_in); > > - The one misfire occurs when bits 24-30 are clear and bit > - 31 is set; in this case, the hole at bit 31 is not > - changed. If we had access to the processor carry flag, > - we could close this loophole by putting the fourth hole > - at bit 32! > + op_t word = *word_ptr; > + find_t mask = shift_find (find_zero_eq_all (word, repeated_c), s_int); > + if (mask != 0) > + return (char *) str + index_first (mask); > > - So it ignores everything except 128's, when they're aligned > - properly. > + do > + word = *++word_ptr; > + while (! has_zero_eq (word, repeated_c)); > > - 3) But wait! Aren't we looking for C as well as zero? > - Good point. So what we do is XOR LONGWORD with a longword, > - each of whose bytes is C. This turns each byte that is C > - into a zero. */ > - > - longword = *longword_ptr++; > - > - /* Add MAGIC_BITS to LONGWORD. */ > - if ((((longword + magic_bits) > - > - /* Set those bits that were unchanged by the addition. */ > - ^ ~longword) > - > - /* Look at only the hole bits. If any of the hole bits > - are unchanged, most likely one of the bytes was a > - zero. */ > - & ~magic_bits) != 0 > - > - /* That caught zeroes. Now test for C. */ > - || ((((longword ^ charmask) + magic_bits) ^ ~(longword ^ charmask)) > - & ~magic_bits) != 0) > - { > - /* Which of the bytes was C or zero? > - If none of them were, it was a misfire; continue the search. */ > - > - const unsigned char *cp = (const unsigned char *) (longword_ptr - 1); > - > - if (*cp == c || *cp == '\0') > - return (char *) cp; > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - if (sizeof (longword) > 4) > - { > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - if (*++cp == c || *cp == '\0') > - return (char *) cp; > - } > - } > - } > - > - /* This should never happen. */ > - return NULL; > + return (char *) word_ptr + index_first_zero_eq (word, repeated_c); > } > - > +#ifndef STRCHRNUL > weak_alias (__strchrnul, strchrnul) > +#endif > diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c > index 88ce5dfffa..da03ac7c04 100644 > --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c > +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c > @@ -19,10 +19,6 @@ > #include > > #define STRCHRNUL __strchrnul_ppc > - > -#undef weak_alias > -#define weak_alias(a,b ) > - > extern __typeof (strchrnul) __strchrnul_ppc attribute_hidden; > > #include > diff --git a/sysdeps/s390/strchrnul-c.c b/sysdeps/s390/strchrnul-c.c > index e1248d1dbf..ff6aa38d4f 100644 > --- a/sysdeps/s390/strchrnul-c.c > +++ b/sysdeps/s390/strchrnul-c.c > @@ -22,8 +22,6 @@ > # if HAVE_STRCHRNUL_IFUNC > # define STRCHRNUL STRCHRNUL_C > # define __strchrnul STRCHRNUL > -# undef weak_alias > -# define weak_alias(name, alias) > # endif > > # include > -- > 2.34.1 > LGTM. Reviewed-by: Noah Goldstein