public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Noah Goldstein <goldstein.w.n@gmail.com>
Cc: libc-alpha@sourceware.org,
	Richard Henderson <richard.henderson@linaro.org>,
	Jeff Law <jeffreyalaw@gmail.com>, Xi Ruoyao <xry111@xry111.site>
Subject: Re: [PATCH v12 21/31] riscv: Add string-fza.h and string-fzi.h
Date: Mon, 6 Feb 2023 13:14:19 -0300	[thread overview]
Message-ID: <50335aba-eba2-f904-43b2-90df9eb45f08@linaro.org> (raw)
In-Reply-To: <CAFUsyfKwKYbQrEhVXOYxYnJhgzHuh4opSuXYyC6wZx3o-5KEVQ@mail.gmail.com>



On 03/02/23 16:47, Noah Goldstein wrote:
> On Thu, Feb 2, 2023 at 12:12 PM Adhemerval Zanella
> <adhemerval.zanella@linaro.org> wrote:
>>
>> It uses the bitmanip extension to optimize index_fist and index_last
>> with clz/ctz (using generic implementation that routes to compiler
>> builtin) and orc.b to check null bytes.
>>
>> Checked the string test on riscv64 user mode.
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>  sysdeps/riscv/string-fza.h | 70 ++++++++++++++++++++++++++++++++++
>>  sysdeps/riscv/string-fzi.h | 77 ++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 147 insertions(+)
>>  create mode 100644 sysdeps/riscv/string-fza.h
>>  create mode 100644 sysdeps/riscv/string-fzi.h
>>
>> diff --git a/sysdeps/riscv/string-fza.h b/sysdeps/riscv/string-fza.h
>> new file mode 100644
>> index 0000000000..9c7a6efba2
>> --- /dev/null
>> +++ b/sysdeps/riscv/string-fza.h
>> @@ -0,0 +1,70 @@
>> +/* Zero byte detection; basics.  RISCV 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 _RISCV_STRING_FZA_H
>> +#define _RISCV_STRING_FZA_H 1
>> +
>> +#ifdef __riscv_zbb
>> +/* With bitmap extension we can use orc.b to find all zero bytes.  */
>> +# include <string-misc.h>
>> +# include <string-optype.h>
>> +
>> +/* The functions return a byte mask.  */
>> +typedef op_t find_t;
>> +
>> +/* This function returns 0xff for each byte that is zero in X.  */
>> +static __always_inline find_t
>> +find_zero_all (op_t x)
>> +{
>> +  find_t r;
>> +  asm ("orc.b %0, %1" : "=r" (r) : "r" (x));
>> +  return ~r;
>> +}
>> +
>> +/* This function returns 0xff for each byte that is equal between X1 and
>> +   X2.  */
>> +static __always_inline find_t
>> +find_eq_all (op_t x1, op_t x2)
>> +{
>> +  return find_zero_all (x1 ^ x2);
>> +}
>> +
>> +/* Identify zero bytes in X1 or equality between X1 and X2.  */
>> +static __always_inline find_t
>> +find_zero_eq_all (op_t x1, op_t x2)
>> +{
>> +  return find_zero_all (x1) | find_eq_all (x1, x2);
>> +}
>> +
>> +/* Identify zero bytes in X1 or inequality between X1 and X2.  */
>> +static __always_inline find_t
>> +find_zero_ne_all (op_t x1, op_t x2)
>> +{
>> +  return find_zero_all (x1) | ~find_eq_all (x1, x2);
>> +}
>> +
>> +/* Define the "inexact" versions in terms of the exact versions.  */
>> +# define find_zero_low         find_zero_all
>> +# define find_eq_low           find_eq_all
>> +# define find_zero_eq_low      find_zero_eq_all
>> +# define find_zero_ne_low      find_zero_ne_all
>> +#else
>> +#include <sysdeps/generic/string-fza.h>
>> +#endif
>> +
>> +#endif /* _RISCV_STRING_FZA_H  */
>> diff --git a/sysdeps/riscv/string-fzi.h b/sysdeps/riscv/string-fzi.h
>> new file mode 100644
>> index 0000000000..3cde113afb
>> --- /dev/null
>> +++ b/sysdeps/riscv/string-fzi.h
>> @@ -0,0 +1,77 @@
>> +/* Zero byte detection; indexes.  RISCV 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_RISCV_FZI_H
>> +#define _STRING_RISCV_FZI_H 1
>> +
>> +#ifdef __riscv_zbb
>> +# include <sysdeps/generic/string-fzi.h>
>> +#else
>> +/* Without bitmap clz/ctz extensions, it is faster to direct test the bits
>> +   instead of calling compiler auxiliary functions.  */
>> +# include <string-optype.h>
>> +
>> +static __always_inline unsigned int
>> +index_first (find_t c)
>> +{
>> +  if (c & 0x80U)
>> +    return 0;
>> +  if (c & 0x8000U)
>> +    return 1;
>> +  if (c & 0x800000U)
>> +    return 2;
>> +
>> +  if (sizeof (op_t) == 4)
>> +    return 3;
>> +
>> +  if (c & 0x80000000U)
>> +    return 3;
>> +  if (c & 0x8000000000UL)
>> +    return 4;
>> +  if (c & 0x800000000000UL)
>> +    return 5;
>> +  if (c & 0x80000000000000UL)
>> +    return 6;
>> +  return 7;
>> +}
>> +
>> +static __always_inline unsigned int
>> +index_last (find_t c)
>> +{
>> +  if (sizeof (op_t) == 8)
>> +    {
>> +      if (c & 0x8000000000000000UL)
>> +       return 7;
>> +      if (c & 0x80000000000000UL)
>> +       return 6;
>> +      if (c & 0x800000000000UL)
>> +       return 5;
>> +      if (c & 0x8000000000UL)
>> +       return 4;
>> +    }
>> +  if (c & 0x80000000U)
>> +    return 3;
>> +  if (c & 0x800000U)
>> +    return 2;
>> +  if (c & 0x8000U)
>> +    return 1;
>> +  return 0;
>> +}
>> +#endif
>> +
>> +#endif /* STRING_FZI_H */
>> --
>> 2.34.1
>>
> 
> Has WS error:
> ```
> Applying: riscv: Add string-fza.h and string-fzi.h
> .git/rebase-apply/patch:115: trailing whitespace.
>    instead of calling compiler auxiliary functions.  */
> warning: 1 line adds whitespace errors.
> ```

Thanks, I will fix it before apply.

  reply	other threads:[~2023-02-06 16:14 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 ` [PATCH v12 16/31] hppa: Add string-fza.h, string-fzc.h, and string-fzi.h Adhemerval Zanella
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 [this message]
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=50335aba-eba2-f904-43b2-90df9eb45f08@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).