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>
Subject: [PATCH v9 21/22] string: Hook up the default implementation on test-memchr
Date: Tue, 17 Jan 2023 17:00:13 -0300 [thread overview]
Message-ID: <20230117200014.1299923-22-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230117200014.1299923-1-adhemerval.zanella@linaro.org>
And remove SIMPLE_MEMCHR, which is not used anywhere.
---
string/test-memchr.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/string/test-memchr.c b/string/test-memchr.c
index 862094ef0b..94121b9fe8 100644
--- a/string/test-memchr.c
+++ b/string/test-memchr.c
@@ -30,7 +30,6 @@
# define MEMCHR memchr
# define CHAR char
# define UCHAR unsigned char
-# define SIMPLE_MEMCHR simple_memchr
# define BIG_CHAR CHAR_MAX
# define SMALL_CHAR 127
#else
@@ -38,7 +37,6 @@
# define MEMCHR wmemchr
# define CHAR wchar_t
# define UCHAR wchar_t
-# define SIMPLE_MEMCHR simple_wmemchr
# define BIG_CHAR WCHAR_MAX
# define SMALL_CHAR 1273
#endif /* WIDE */
@@ -47,15 +45,26 @@ typedef CHAR *(*proto_t) (const CHAR *, int, size_t);
IMPL (MEMCHR, 1)
-/* Naive implementation to verify results. */
-CHAR *
-SIMPLE_MEMCHR (const CHAR *s, int c, size_t n)
-{
- while (n--)
- if (*s++ == (CHAR) c)
- return (CHAR *) s - 1;
- return NULL;
-}
+/* Also check the generic implementation. */
+#undef MEMCHR
+#undef weak_alias
+#define weak_alias(a, b)
+#undef libc_hidden_builtin_def
+#define libc_hidden_builtin_def(a)
+#undef libc_hidden_def
+#define libc_hidden_def(a)
+#undef libc_hidden_weak
+#define libc_hidden_weak(a)
+#ifndef WIDE
+# define MEMCHR __memchr_default
+# include "string/memchr.c"
+# define MEMCHR_DEFAULT MEMCHR
+#else
+# define WCSCHR __memchr_default
+# include "wcsmbs/wcschr.c"
+# define MEMCHR_DEFAULT WCSCHR
+#endif
+IMPL (MEMCHR_DEFAULT, 1)
static void
do_one_test (impl_t *impl, const CHAR *s, int c, size_t n, CHAR *exp_res)
--
2.34.1
next prev parent reply other threads:[~2023-01-17 20:01 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 ` [PATCH v9 02/22] Parameterize OP_T_THRES " Adhemerval Zanella
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 ` Adhemerval Zanella [this message]
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-22-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--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).