From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org,
Richard Henderson <richard.henderson@linaro.org>,
Jeff Law <jeffreyalaw@gmail.com>, Xi Ruoyao <xry111@xry111.site>,
Noah Goldstein <goldstein.w.n@gmail.com>
Subject: [PATCH v12 16/31] hppa: Add string-fza.h, string-fzc.h, and string-fzi.h
Date: Thu, 2 Feb 2023 15:11:34 -0300 [thread overview]
Message-ID: <20230202181149.2181553-17-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230202181149.2181553-1-adhemerval.zanella@linaro.org>
From: Richard Henderson <richard.henderson@linaro.org>
Use UXOR,SBZ to test for a zero byte within a word. While we can
get semi-decent code out of asm-goto, we would do slightly better
with a compiler builtin.
For index_zero et al, sequential testing of bytes is less expensive than
any tricks that involve a count-leading-zeros insn that we don't have.
Checked on hppa-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
sysdeps/hppa/string-fzb.h | 63 +++++++++++++++++++
sysdeps/hppa/string-fzc.h | 124 ++++++++++++++++++++++++++++++++++++++
sysdeps/hppa/string-fzi.h | 63 +++++++++++++++++++
3 files changed, 250 insertions(+)
create mode 100644 sysdeps/hppa/string-fzb.h
create mode 100644 sysdeps/hppa/string-fzc.h
create mode 100644 sysdeps/hppa/string-fzi.h
diff --git a/sysdeps/hppa/string-fzb.h b/sysdeps/hppa/string-fzb.h
new file mode 100644
index 0000000000..d6b234a271
--- /dev/null
+++ b/sysdeps/hppa/string-fzb.h
@@ -0,0 +1,63 @@
+/* Zero byte detection, boolean. HPPA version.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STRING_FZB_H
+#define _STRING_FZB_H 1
+
+#include <sys/cdefs.h>
+#include <string-optype.h>
+
+_Static_assert (sizeof (op_t) == 4, "64-bit not supported");
+
+/* Determine if any byte within X is zero. This is a pure boolean test. */
+static __always_inline _Bool
+has_zero (op_t x)
+{
+ /* It's more useful to expose a control transfer to the compiler
+ than to expose a proper boolean result. */
+ asm goto ("uxor,sbz %%r0,%0,%%r0\n\t"
+ "b,n %l1" : : "r"(x) : : nbz);
+ return 1;
+ nbz:
+ return 0;
+}
+
+/* Likewise, but for byte equality between X1 and X2. */
+static __always_inline _Bool
+has_eq (op_t x1, op_t x2)
+{
+ asm goto ("uxor,sbz %0,%1,%%r0\n\t"
+ "b,n %l2" : : "r"(x1), "r"(x2) : : nbz);
+ return 1;
+ nbz:
+ return 0;
+}
+
+/* Likewise, but for zeros in X1 and equal bytes between X1 and X2. */
+static __always_inline _Bool
+has_zero_eq (op_t x1, op_t x2)
+{
+ asm goto ("uxor,sbz %%r0,%0,%%r0\n\t"
+ "uxor,nbz %0,%1,%%r0\n\t"
+ "b,n %l2" : : "r"(x1), "r"(x2) : : sbz);
+ return 0;
+ sbz:
+ return 1;
+}
+
+#endif /* _STRING_FZB_H */
diff --git a/sysdeps/hppa/string-fzc.h b/sysdeps/hppa/string-fzc.h
new file mode 100644
index 0000000000..c4e2e11550
--- /dev/null
+++ b/sysdeps/hppa/string-fzc.h
@@ -0,0 +1,124 @@
+/* string-fzc.h -- zero byte detection with indexes. HPPA version.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STRING_FZC_H
+#define _STRING_FZC_H 1
+
+#include <string-optype.h>
+
+_Static_assert (sizeof (op_t) == 4, "64-bit not supported");
+
+/* Given a word X that is known to contain a zero byte, return the
+ index of the first such within the long in memory order. */
+static __always_inline unsigned int
+index_first_zero (op_t x)
+{
+ unsigned int ret;
+
+ /* Since we have no clz insn, direct tests of the bytes is faster
+ than loading up the constants to do the masking. */
+ asm ("extrw,u,<> %1,23,8,%%r0\n\t"
+ "ldi 2,%0\n\t"
+ "extrw,u,<> %1,15,8,%%r0\n\t"
+ "ldi 1,%0\n\t"
+ "extrw,u,<> %1,7,8,%%r0\n\t"
+ "ldi 0,%0"
+ : "=r"(ret) : "r"(x), "0"(3));
+
+ return ret;
+}
+
+/* Similarly, but perform the search for byte equality between X1 and X2. */
+static __always_inline unsigned int
+index_first_eq (op_t x1, op_t x2)
+{
+ return index_first_zero (x1 ^ x2);
+}
+
+/* Similarly, but perform the search for zero within X1 or
+ equality between X1 and X2. */
+static __always_inline unsigned int
+index_first_zero_eq (op_t x1, op_t x2)
+{
+ unsigned int ret;
+
+ /* Since we have no clz insn, direct tests of the bytes is faster
+ than loading up the constants to do the masking. */
+ asm ("extrw,u,= %1,23,8,%%r0\n\t"
+ "extrw,u,<> %2,23,8,%%r0\n\t"
+ "ldi 2,%0\n\t"
+ "extrw,u,= %1,15,8,%%r0\n\t"
+ "extrw,u,<> %2,15,8,%%r0\n\t"
+ "ldi 1,%0\n\t"
+ "extrw,u,= %1,7,8,%%r0\n\t"
+ "extrw,u,<> %2,7,8,%%r0\n\t"
+ "ldi 0,%0"
+ : "=r"(ret) : "r"(x1), "r"(x1 ^ x2), "0"(3));
+
+ return ret;
+}
+
+/* Similarly, but perform the search for zero within X1 or
+ inequality between X1 and X2. */
+static __always_inline unsigned int
+index_first_zero_ne (op_t x1, op_t x2)
+{
+ unsigned int ret;
+
+ /* Since we have no clz insn, direct tests of the bytes is faster
+ than loading up the constants to do the masking. */
+ asm ("extrw,u,<> %2,23,8,%%r0\n\t"
+ "extrw,u,<> %1,23,8,%%r0\n\t"
+ "ldi 2,%0\n\t"
+ "extrw,u,<> %2,15,8,%%r0\n\t"
+ "extrw,u,<> %1,15,8,%%r0\n\t"
+ "ldi 1,%0\n\t"
+ "extrw,u,<> %2,7,8,%%r0\n\t"
+ "extrw,u,<> %1,7,8,%%r0\n\t"
+ "ldi 0,%0"
+ : "=r"(ret) : "r"(x1), "r"(x1 ^ x2), "0"(3));
+
+ return ret;
+}
+
+/* Similarly, but search for the last zero within X. */
+static __always_inline unsigned int
+index_last_zero (op_t x)
+{
+ unsigned int ret;
+
+ /* Since we have no ctz insn, direct tests of the bytes is faster
+ than loading up the constants to do the masking. */
+ asm ("extrw,u,<> %1,15,8,%%r0\n\t"
+ "ldi 1,%0\n\t"
+ "extrw,u,<> %1,23,8,%%r0\n\t"
+ "ldi 2,%0\n\t"
+ "extrw,u,<> %1,31,8,%%r0\n\t"
+ "ldi 3,%0"
+ : "=r"(ret) : "r"(x), "0"(0));
+
+ return ret;
+}
+
+static __always_inline unsigned int
+index_last_eq (op_t x1, op_t x2)
+{
+ return index_last_zero (x1 ^ x2);
+}
+
+#endif /* _STRING_FZC_H */
diff --git a/sysdeps/hppa/string-fzi.h b/sysdeps/hppa/string-fzi.h
new file mode 100644
index 0000000000..08cdace416
--- /dev/null
+++ b/sysdeps/hppa/string-fzi.h
@@ -0,0 +1,63 @@
+/* string-fzi.h -- zero byte indexes. HPPA version.
+ Copyright (C) 2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _STRING_FZI_H
+#define _STRING_FZI_H 1
+
+#include <string-optype.h>
+#include <string-fza.h>
+
+_Static_assert (sizeof (op_t) == 4, "64-bit not supported");
+
+static __always_inline unsigned int
+index_first (find_t c)
+{
+ unsigned int ret;
+
+ /* Since we have no clz insn, direct tests of the bytes is faster
+ than loading up the constants to do the masking. */
+ asm ("extrw,u,= %1,23,8,%%r0\n\t"
+ "ldi 2,%0\n\t"
+ "extrw,u,= %1,15,8,%%r0\n\t"
+ "ldi 1,%0\n\t"
+ "extrw,u,= %1,7,8,%%r0\n\t"
+ "ldi 0,%0"
+ : "=r"(ret) : "r"(c), "0"(3));
+
+ return ret;
+}
+
+static __always_inline unsigned int
+index_last (find_t c)
+{
+ unsigned int ret;
+
+ /* Since we have no ctz insn, direct tests of the bytes is faster
+ than loading up the constants to do the masking. */
+ asm ("extrw,u,= %1,15,8,%%r0\n\t"
+ "ldi 1,%0\n\t"
+ "extrw,u,= %1,23,8,%%r0\n\t"
+ "ldi 2,%0\n\t"
+ "extrw,u,= %1,31,8,%%r0\n\t"
+ "ldi 3,%0"
+ : "=r"(ret) : "r"(c), "0"(0));
+
+ return ret;
+}
+
+#endif /* _STRING_FZI_H */
--
2.34.1
next prev parent reply other threads:[~2023-02-02 18:12 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 18:11 [PATCH v12 00/31] Improve generic string routines Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 01/31] Parameterize op_t from memcopy.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 02/31] Parameterize OP_T_THRES " Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 03/31] Add string vectorized find and detection functions Adhemerval Zanella
2023-02-03 0:24 ` Richard Henderson
2023-02-03 12:39 ` Adhemerval Zanella Netto
2023-02-03 13:40 ` Adhemerval Zanella Netto
2023-02-04 2:54 ` Richard Henderson
2023-02-02 18:11 ` [PATCH v12 04/31] string: Improve generic strlen Adhemerval Zanella
2023-02-03 23:23 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 05/31] string: Improve generic strchrnul Adhemerval Zanella
2023-02-03 23:23 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 06/31] string: Improve generic strchr Adhemerval Zanella
2023-02-03 23:24 ` Noah Goldstein
2023-02-04 2:58 ` Richard Henderson
2023-02-06 13:07 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 07/31] string: Improve generic strcmp Adhemerval Zanella
2023-02-03 23:25 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 08/31] string: Improve generic strncmp Adhemerval Zanella
2023-02-03 0:34 ` Richard Henderson
2023-02-21 9:28 ` Szabolcs Nagy
2023-02-21 12:24 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 09/31] string: Improve generic stpcpy Adhemerval Zanella
2023-02-03 23:26 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 10/31] string: Improve generic strcpy Adhemerval Zanella
2023-02-03 23:26 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 11/31] string: Improve generic memchr Adhemerval Zanella
2023-02-03 23:26 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 12/31] string: Improve generic strnlen with memchr Adhemerval Zanella
2023-02-03 23:27 ` Noah Goldstein
2023-02-02 18:11 ` [PATCH v12 13/31] string: Improve generic memrchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 14/31] string: Improve generic strrchr with memrchr and strlen Adhemerval Zanella
2023-02-04 3:06 ` Richard Henderson
2023-02-06 14:01 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 15/31] hppa: Add memcopy.h Adhemerval Zanella
2023-02-02 18:11 ` Adhemerval Zanella [this message]
2023-02-02 18:11 ` [PATCH v12 17/31] alpha: Add string-fza, string-fzb.h, string-fzi.h, and string-shift.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 18/31] arm: Add string-fza.h Adhemerval Zanella
2023-02-20 13:24 ` Szabolcs Nagy
2023-02-20 13:45 ` Szabolcs Nagy
2023-02-20 14:01 ` Adhemerval Zanella Netto
2023-02-20 16:12 ` Szabolcs Nagy
2023-02-02 18:11 ` [PATCH v12 19/31] powerpc: " Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 20/31] sh: Add string-fzb.h Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 21/31] riscv: Add string-fza.h and string-fzi.h Adhemerval Zanella
2023-02-03 19:47 ` Noah Goldstein
2023-02-06 16:14 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 22/31] string: Hook up the default implementation on test-strlen Adhemerval Zanella
2023-02-03 23:30 ` Noah Goldstein
2023-02-06 17:36 ` Adhemerval Zanella Netto
2023-02-02 18:11 ` [PATCH v12 23/31] string: Hook up the default implementation on test-strnlen Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 24/31] string: Hook up the default implementation on test-strchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 25/31] string: Hook up the default implementation on test-strcmp Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 26/31] string: Hook up the default implementation on test-strncmp Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 27/31] string: Hook up the default implementation on test-stpcpy Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 28/31] string: Hook up the default implementation on test-strcpy Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 29/31] string: Hook up the default implementation on test-memchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 30/31] string: Hook up the default implementation on test-memrchr Adhemerval Zanella
2023-02-02 18:11 ` [PATCH v12 31/31] string: Hook up the default implementation on test-strrchr Adhemerval Zanella
2023-02-03 1:55 ` Richard Henderson
2023-02-02 18:17 ` [PATCH v12 00/31] Improve generic string routines Adhemerval Zanella Netto
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=20230202181149.2181553-17-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).