From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org,
Richard Henderson <richard.henderson@linaro.org>,
Noah Goldstein <goldstein.w.n@gmail.com>,
Jeff Law <jeffreyalaw@gmail.com>, Xi Ruoyao <xry111@xry111.site>
Subject: [PATCH v11 06/29] string: Improve generic strchr
Date: Wed, 1 Feb 2023 14:03:43 -0300 [thread overview]
Message-ID: <20230201170406.303978-7-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230201170406.303978-1-adhemerval.zanella@linaro.org>
New algorithm now calls strchrnul.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc-linux-gnu,
and powerpc64-linux-gnu by removing the arch-specific assembly
implementation and disabling multi-arch (it covers both LE and BE
for 64 and 32 bits).
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
string/strchr.c | 159 ++--------------------------------------
sysdeps/s390/strchr-c.c | 11 +--
2 files changed, 14 insertions(+), 156 deletions(-)
diff --git a/string/strchr.c b/string/strchr.c
index 1572b8b42e..30c3eb10f2 100644
--- a/string/strchr.c
+++ b/string/strchr.c
@@ -21,165 +21,22 @@
<https://www.gnu.org/licenses/>. */
#include <string.h>
-#include <stdlib.h>
#undef strchr
+#undef index
-#ifndef STRCHR
-# define STRCHR strchr
+#ifdef STRCHR
+# define strchr STRCHR
#endif
/* Find the first occurrence of C in S. */
char *
-STRCHR (const char *s, int c_in)
+strchr (const char *s, 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)
- return (void *) char_ptr;
- else if (*char_ptr == '\0')
- return NULL;
-
- /* 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.
-
- 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.
-
- 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!
-
- So it ignores everything except 128's, when they're aligned
- properly.
-
- 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)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (sizeof (longword) > 4)
- {
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- if (*++cp == c)
- return (char *) cp;
- else if (*cp == '\0')
- return NULL;
- }
- }
- }
-
- return NULL;
+ char *r = __strchrnul (s, c_in);
+ return (*(unsigned char *)r == (unsigned char)c_in) ? r : NULL;
}
-
-#ifdef weak_alias
-# undef index
+#ifndef STRCHR
weak_alias (strchr, index)
-#endif
libc_hidden_builtin_def (strchr)
+#endif
diff --git a/sysdeps/s390/strchr-c.c b/sysdeps/s390/strchr-c.c
index c00f2cceea..90822ae0f4 100644
--- a/sysdeps/s390/strchr-c.c
+++ b/sysdeps/s390/strchr-c.c
@@ -21,13 +21,14 @@
#if HAVE_STRCHR_C
# if HAVE_STRCHR_IFUNC
# define STRCHR STRCHR_C
-# undef weak_alias
+# endif
+
+# include <string/strchr.c>
+
+# if HAVE_STRCHR_IFUNC
# if defined SHARED && IS_IN (libc)
-# undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(name) \
- __hidden_ver1 (__strchr_c, __GI_strchr, __strchr_c);
+__hidden_ver1 (__strchr_c, __GI_strchr, __strchr_c);
# endif
# endif
-# include <string/strchr.c>
#endif
--
2.34.1
next prev parent reply other threads:[~2023-02-01 17:04 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 17:03 [PATCH v11 00/29] Improve generic string routines Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 01/29] Parameterize op_t from memcopy.h Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 02/29] Parameterize OP_T_THRES " Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 03/29] Add string vectorized find and detection functions Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 04/29] string: Improve generic strlen Adhemerval Zanella
2023-02-01 19:51 ` Noah Goldstein
2023-02-01 17:03 ` [PATCH v11 05/29] string: Improve generic strnlen with memchr Adhemerval Zanella
2023-02-01 19:36 ` Noah Goldstein
2023-02-01 19:57 ` Adhemerval Zanella Netto
2023-02-01 19:39 ` Noah Goldstein
2023-02-01 20:02 ` Adhemerval Zanella Netto
2023-02-01 17:03 ` Adhemerval Zanella [this message]
2023-02-01 19:44 ` [PATCH v11 06/29] string: Improve generic strchr Noah Goldstein
2023-02-01 20:03 ` Adhemerval Zanella Netto
2023-02-01 17:03 ` [PATCH v11 07/29] string: Improve generic strchrnul Adhemerval Zanella
2023-02-01 19:49 ` Noah Goldstein
2023-02-01 17:03 ` [PATCH v11 08/29] string: Improve generic strcmp Adhemerval Zanella
2023-02-01 17:34 ` Richard Henderson
2023-02-02 11:57 ` Adhemerval Zanella Netto
2023-02-01 17:03 ` [PATCH v11 09/29] string: Improve generic strncmp Adhemerval Zanella
2023-02-01 19:42 ` Noah Goldstein
2023-02-02 12:01 ` Adhemerval Zanella Netto
2023-02-01 17:03 ` [PATCH v11 10/29] string: Improve generic stpcpy Adhemerval Zanella
2023-02-01 17:29 ` Xi Ruoyao
2023-02-02 13:32 ` Adhemerval Zanella Netto
2023-02-01 17:37 ` Richard Henderson
2023-02-01 19:47 ` Noah Goldstein
2023-02-01 20:26 ` Richard Henderson
2023-02-01 17:03 ` [PATCH v11 11/29] string: Improve generic strcpy Adhemerval Zanella
2023-02-01 17:38 ` Richard Henderson
2023-02-01 17:03 ` [PATCH v11 12/29] string: Improve generic memchr Adhemerval Zanella
2023-02-01 19:49 ` Noah Goldstein
2023-02-01 17:03 ` [PATCH v11 13/29] string: Improve generic memrchr Adhemerval Zanella
2023-02-01 19:50 ` Noah Goldstein
2023-02-01 17:03 ` [PATCH v11 14/29] hppa: Add memcopy.h Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 15/29] hppa: Add string-fza.h, string-fzc.h, and string-fzi.h Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 16/29] alpha: Add string-fza, string-fzb.h, string-fzi.h, and string-shift.h Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 17/29] arm: Add string-fza.h Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 18/29] powerpc: " Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 19/29] sh: Add string-fzb.h Adhemerval Zanella
2023-02-01 17:03 ` [PATCH v11 20/29] riscv: Add string-fza.h and string-fzi.h Adhemerval Zanella
2023-02-01 17:53 ` Richard Henderson
2023-02-02 12:30 ` Adhemerval Zanella Netto
2023-02-02 16:24 ` Richard Henderson
2023-02-04 16:31 ` Jeff Law
2023-02-05 17:33 ` Richard Henderson
2023-02-01 18:08 ` Noah Goldstein
2023-02-01 17:03 ` [PATCH v11 21/29] string: Hook up the default implementation on test-strlen Adhemerval Zanella
2023-02-01 17:54 ` Richard Henderson
2023-02-01 17:03 ` [PATCH v11 22/29] string: Hook up the default implementation on test-strnlen Adhemerval Zanella
2023-02-01 17:54 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 23/29] string: Hook up the default implementation on test-strchr Adhemerval Zanella
2023-02-01 17:55 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 24/29] string: Hook up the default implementation on test-strcmp Adhemerval Zanella
2023-02-01 17:55 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 25/29] string: Hook up the default implementation on test-strncmp Adhemerval Zanella
2023-02-01 17:56 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 26/29] string: Hook up the default implementation on test-stpcpy Adhemerval Zanella
2023-02-01 17:56 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 27/29] string: Hook up the default implementation on test-strcpy Adhemerval Zanella
2023-02-01 17:56 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 28/29] string: Hook up the default implementation on test-memchr Adhemerval Zanella
2023-02-01 17:57 ` Richard Henderson
2023-02-01 17:04 ` [PATCH v11 29/29] string: Hook up the default implementation on test-memrchr Adhemerval Zanella
2023-02-01 17:57 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230201170406.303978-7-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=goldstein.w.n@gmail.com \
--cc=jeffreyalaw@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=richard.henderson@linaro.org \
--cc=xry111@xry111.site \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).