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>
Cc: Carlos O'Donell <carlos@redhat.com>
Subject: [PATCH v9 02/22] Parameterize OP_T_THRES from memcopy.h
Date: Tue, 17 Jan 2023 16:59:54 -0300 [thread overview]
Message-ID: <20230117200014.1299923-3-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230117200014.1299923-1-adhemerval.zanella@linaro.org>
From: Richard Henderson <richard.henderson@linaro.org>
It moves OP_T_THRES out of memcopy.h to its own header and adjust
each architecture that redefines it.
Checked with a build and check with run-built-tests=no for all major
Linux ABIs.
Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
string/memcmp.c | 3 ---
sysdeps/generic/memcopy.h | 4 +---
sysdeps/generic/string-opthr.h | 25 ++++++++++++++++++++++
sysdeps/i386/memcopy.h | 3 ---
sysdeps/i386/string-opthr.h | 25 ++++++++++++++++++++++
sysdeps/m68k/memcopy.h | 3 ---
sysdeps/powerpc/powerpc32/power4/memcopy.h | 5 -----
7 files changed, 51 insertions(+), 17 deletions(-)
create mode 100644 sysdeps/generic/string-opthr.h
create mode 100644 sysdeps/i386/string-opthr.h
diff --git a/string/memcmp.c b/string/memcmp.c
index ea0fa03e1c..047ca4f98e 100644
--- a/string/memcmp.c
+++ b/string/memcmp.c
@@ -48,9 +48,6 @@
and store. Must be an unsigned type. */
# define OPSIZ (sizeof (op_t))
-/* Threshold value for when to enter the unrolled loops. */
-# define OP_T_THRES 16
-
/* Type to use for unaligned operations. */
typedef unsigned char byte;
diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index b5ffa4d114..e9b3f227b2 100644
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -57,6 +57,7 @@
/* Type to use for aligned memory operations. */
#include <string-optype.h>
+#include <string-opthr.h>
#define OPSIZ (sizeof (op_t))
/* Type to use for unaligned operations. */
@@ -188,9 +189,6 @@ extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t)
#endif
-/* Threshold value for when to enter the unrolled loops. */
-#define OP_T_THRES 16
-
/* Set to 1 if memcpy is safe to use for forward-copying memmove with
overlapping addresses. This is 0 by default because memcpy implementations
are generally not safe for overlapping addresses. */
diff --git a/sysdeps/generic/string-opthr.h b/sysdeps/generic/string-opthr.h
new file mode 100644
index 0000000000..6f10a98edd
--- /dev/null
+++ b/sysdeps/generic/string-opthr.h
@@ -0,0 +1,25 @@
+/* Define a threshold for word access. Generic 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_OPTHR_H
+#define _STRING_OPTHR_H 1
+
+/* Threshold value for when to enter the unrolled loops. */
+#define OP_T_THRES 16
+
+#endif /* string-opthr.h */
diff --git a/sysdeps/i386/memcopy.h b/sysdeps/i386/memcopy.h
index 4f82689b84..1aa7c3a850 100644
--- a/sysdeps/i386/memcopy.h
+++ b/sysdeps/i386/memcopy.h
@@ -18,9 +18,6 @@
#include <sysdeps/generic/memcopy.h>
-#undef OP_T_THRES
-#define OP_T_THRES 8
-
#undef BYTE_COPY_FWD
#define BYTE_COPY_FWD(dst_bp, src_bp, nbytes) \
do { \
diff --git a/sysdeps/i386/string-opthr.h b/sysdeps/i386/string-opthr.h
new file mode 100644
index 0000000000..ed3e4b2ddb
--- /dev/null
+++ b/sysdeps/i386/string-opthr.h
@@ -0,0 +1,25 @@
+/* Define a threshold for word access. i386 version.
+ Copyright (C) 2018 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 I386_STRING_OPTHR_H
+#define I386_STRING_OPTHR_H 1
+
+/* Threshold value for when to enter the unrolled loops. */
+#define OP_T_THRES 8
+
+#endif /* I386_STRING_OPTHR_H */
diff --git a/sysdeps/m68k/memcopy.h b/sysdeps/m68k/memcopy.h
index accd81c1c3..610577071d 100644
--- a/sysdeps/m68k/memcopy.h
+++ b/sysdeps/m68k/memcopy.h
@@ -20,9 +20,6 @@
#if defined(__mc68020__) || defined(mc68020)
-#undef OP_T_THRES
-#define OP_T_THRES 16
-
/* WORD_COPY_FWD and WORD_COPY_BWD are not symmetric on the 68020,
because of its weird instruction overlap characteristics. */
diff --git a/sysdeps/powerpc/powerpc32/power4/memcopy.h b/sysdeps/powerpc/powerpc32/power4/memcopy.h
index 384f33b029..872157e485 100644
--- a/sysdeps/powerpc/powerpc32/power4/memcopy.h
+++ b/sysdeps/powerpc/powerpc32/power4/memcopy.h
@@ -50,11 +50,6 @@
[I fail to understand. I feel stupid. --roland]
*/
-
-/* Threshold value for when to enter the unrolled loops. */
-#undef OP_T_THRES
-#define OP_T_THRES 16
-
/* Copy exactly NBYTES bytes from SRC_BP to DST_BP,
without any assumptions about alignment of the pointers. */
#undef BYTE_COPY_FWD
--
2.34.1
next prev parent reply other threads:[~2023-01-17 20:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 19:59 [PATCH v9 00/22] Improve generic string routines Adhemerval Zanella
2023-01-17 19:59 ` [PATCH v9 01/22] Parameterize op_t from memcopy.h Adhemerval Zanella
2023-01-17 19:59 ` Adhemerval Zanella [this message]
2023-01-17 19:59 ` [PATCH v9 03/22] Add string vectorized find and detection functions Adhemerval Zanella
2023-01-18 1:35 ` Richard Henderson
2023-01-18 1:54 ` Richard Henderson
2023-01-18 12:42 ` Adhemerval Zanella Netto
2023-01-18 19:24 ` Richard Henderson
2023-01-18 19:38 ` Adhemerval Zanella Netto
2023-01-17 19:59 ` [PATCH v9 04/22] string: Improve generic strlen Adhemerval Zanella
2023-01-17 19:59 ` [PATCH v9 05/22] string: Improve generic strnlen Adhemerval Zanella
2023-01-17 19:59 ` [PATCH v9 06/22] string: Improve generic strchr Adhemerval Zanella
2023-01-18 1:42 ` Richard Henderson
2023-01-17 19:59 ` [PATCH v9 07/22] string: Improve generic strchrnul Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 08/22] string: Improve generic strcmp Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 09/22] string: Improve generic memchr Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 10/22] string: Improve generic memrchr Adhemerval Zanella
2023-01-18 2:10 ` Richard Henderson
2023-01-17 20:00 ` [PATCH v9 11/22] hppa: Add memcopy.h Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 12/22] hppa: Add string-fzb.h and string-fzi.h Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 13/22] alpha: " Adhemerval Zanella
2023-01-18 1:58 ` Richard Henderson
2023-01-17 20:00 ` [PATCH v9 14/22] arm: Add string-fza.h Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 15/22] powerpc: " Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 16/22] sh: Add string-fzb.h Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 17/22] string: Hook up the default implementation on test-strlen Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 18/22] string: Hook up the default implementation on test-strnlen Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 19/22] string: Hook up the default implementation on test-strchr Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 20/22] string: Hook up the default implementation on test-strcmp Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 21/22] string: Hook up the default implementation on test-memchr Adhemerval Zanella
2023-01-17 20:00 ` [PATCH v9 22/22] string: Hook up the default implementation on test-memrchr Adhemerval Zanella
2023-01-18 18:51 ` Carlos O'Donell
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=20230117200014.1299923-3-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=carlos@redhat.com \
--cc=goldstein.w.n@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=richard.henderson@linaro.org \
/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).