From: Richard Henderson <richard.henderson@linaro.org>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org,
Noah Goldstein <goldstein.w.n@gmail.com>,
Jeff Law <jeffreyalaw@gmail.com>, Xi Ruoyao <xry111@xry111.site>
Subject: Re: [PATCH v11 23/29] string: Hook up the default implementation on test-strchr
Date: Wed, 1 Feb 2023 07:55:22 -1000 [thread overview]
Message-ID: <1f5f468a-da3b-d924-02d1-672382abfcf5@linaro.org> (raw)
In-Reply-To: <20230201170406.303978-24-adhemerval.zanella@linaro.org>
On 2/1/23 07:04, Adhemerval Zanella wrote:
> Also remove the simple_STRCHR, which can be easily replaced.
> ---
> string/test-strchr.c | 53 +++++++++++++++++++++++++++++++-------------
> 1 file changed, 38 insertions(+), 15 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
>
> diff --git a/string/test-strchr.c b/string/test-strchr.c
> index 323c844d21..933fc0bbba 100644
> --- a/string/test-strchr.c
> +++ b/string/test-strchr.c
> @@ -35,7 +35,6 @@
> #ifndef WIDE
> # ifdef USE_FOR_STRCHRNUL
> # define STRCHR strchrnul
> -# define simple_STRCHR simple_STRCHRNUL
> # else
> # define STRCHR strchr
> # endif /* !USE_FOR_STRCHRNUL */
> @@ -50,7 +49,6 @@
> # include <wchar.h>
> # ifdef USE_FOR_STRCHRNUL
> # define STRCHR wcschrnul
> -# define simple_STRCHR simple_WCSCHRNUL
> # else
> # define STRCHR wcschr
> # endif /* !USE_FOR_STRCHRNUL */
> @@ -72,20 +70,41 @@
>
> typedef CHAR *(*proto_t) (const CHAR *, int);
>
> -/* Naive implementation to verify results. */
> -CHAR *
> -simple_STRCHR (const CHAR *s, int c)
> -{
> - size_t n = STRLEN (s) + 1;
> -
> - while (n--)
> - if (*s++ == (CHAR) c)
> - return (CHAR *) s - 1;
> - return NULLRET ((CHAR *) s - 1);
> -}
> -
> IMPL (STRCHR, 1)
>
> +/* Also check the generic implementation. */
> +#undef STRCHR
> +#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 STRCHRNUL __strchrnul_default
> +# include "string/strchrnul.c"
> +# ifndef USE_FOR_STRCHRNUL
> +# define STRCHR __strchr_default
> +# include "string/strchr.c"
> +# define STRCHR_DEFAULT STRCHR
> +# else
> +# define STRCHR_DEFAULT STRCHRNUL
> +# endif
> +#else
> +# ifndef USE_FOR_STRCHRNUL
> +# define WCSCHR __wcschr_default
> +# include "wcsmbs/wcschr.c"
> +# define STRCHR_DEFAULT WCSCHR
> +# else
> +# define WCSCHRNUL __wcschrnul_default
> +# include "wcsmbs/wcschrnul.c"
> +# define STRCHR_DEFAULT WCSCHRNUL
> +# endif
> +#endif
> +IMPL (STRCHR_DEFAULT, 1)
> +
> static int
> check_result (impl_t *impl, const CHAR *s, int c, const CHAR *exp_res)
> {
> @@ -219,7 +238,11 @@ check1 (void)
> {
> CHAR s[] __attribute__((aligned(16))) = L ("\xff");
> CHAR c = L ('\xfe');
> - CHAR *exp_result = simple_STRCHR (s, c);
> +#ifndef USE_FOR_STRCHRNUL
> + CHAR *exp_result = NULL;
> +#else
> + CHAR *exp_result = s + STRLEN (s);
> +#endif
>
> FOR_EACH_IMPL (impl, 0)
> check_result (impl, s, c, exp_result);
next prev parent reply other threads:[~2023-02-01 17:55 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 ` [PATCH v11 06/29] string: Improve generic strchr Adhemerval Zanella
2023-02-01 19:44 ` 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 [this message]
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=1f5f468a-da3b-d924-02d1-672382abfcf5@linaro.org \
--to=richard.henderson@linaro.org \
--cc=adhemerval.zanella@linaro.org \
--cc=goldstein.w.n@gmail.com \
--cc=jeffreyalaw@gmail.com \
--cc=libc-alpha@sourceware.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).