From patchwork Tue Feb 3 15:05:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zihong Yao X-Patchwork-Id: 129495 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 4395B4BA23F9 for ; Tue, 3 Feb 2026 15:18:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4395B4BA23F9 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) by sourceware.org (Postfix) with ESMTPS id BE13B4BA23E8 for ; Tue, 3 Feb 2026 15:15:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE13B4BA23E8 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BE13B4BA23E8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770131705; cv=none; b=SNO4nbSYUSW+AL3Beh7YGhqghqHv7BD0fW30V8ABhN8sjleXrm5DUZfmF3cF5A+hbRIynmmFy6yVwFDXAqQfWAdmO6oDz3NjVKOCQOSyiVSY8AoVeQWGYQaCXaNajDtwNFSk5ksCQ5gKzdtVa/IWXiwGvIsJ55Llr57AMorHEN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770131705; c=relaxed/simple; bh=ce4wMNmbZ3Lx49jiKmTg9ttPE+ZJtBybitZf45bYlLI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=jHC7pzflTBHxO1mAeuSb3LgXXJCOzTY3+HljGAIjX4BQm8eRgIXAE26mjueI0EcxGTrpfcQqE8jBI2iReeIGWLq37ZKiIE2Ifu0MkoJ2RpQMyhTgWFrSzSRGTV1tiZOjnkLOx9vydhHc4A06WRBTIL5L0NJVO4YY6c7fMiOZiWE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE13B4BA23E8 Received: from Mobilestation.localdomain (unknown [183.6.59.140]) by APP-01 (Coremail) with SMTP id qwCowADHbmriEIJpZ2EVBw--.24930S19; Tue, 03 Feb 2026 23:14:57 +0800 (CST) From: Yao Zihong To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, andrew@sifive.com, schwab@linux-m68k.org, bergner@tenstorrent.com, jlaw@ventanamicro.com, zhangyin2018@iscas.ac.cn, enh@google.com, zihongyao@outlook.com, Yao Zihong , Hau Hsu , Nick Knight Subject: [PATCH v5 17/18] riscv: Add RVV strnlen for multiarch and non-multiarch Date: Tue, 3 Feb 2026 23:05:41 +0800 Message-ID: <20260203151406.27450-18-zihong.plct@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260203151406.27450-1-zihong.plct@isrc.iscas.ac.cn> References: <20260203151406.27450-1-zihong.plct@isrc.iscas.ac.cn> MIME-Version: 1.0 X-CM-TRANSID: qwCowADHbmriEIJpZ2EVBw--.24930S19 X-Coremail-Antispam: 1UD129KBjvJXoW3JF17GF1UZrW7Kr13tw4fKrg_yoWfZrW3pF Z5ua4UCFs5Jr1xKryIgw10v3WrGrWfJrn8Kr909w4UJrWUXrWxXFsFvwsYgFyxJrWru3yD ZFnrWFyUCF48AaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmv14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_ Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6x IIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_ Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8c xan2IY04v7MxkF7I0En4kS14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCj c4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4 CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryU MIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJV WUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUv cSsGvfC2KfnxnUUI43ZEXa7VUbPC7UUUUUU== X-Originating-IP: [183.6.59.140] X-CM-SenderInfo: p2lk00vjoszunw6l223fol2u1dvotugofq/ X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Co-authored-by: Hau Hsu Co-authored-by: Nick Knight Signed-off-by: Yao Zihong --- sysdeps/riscv/multiarch/strnlen-generic.c | 24 ++++++++ sysdeps/riscv/multiarch/strnlen-vector.S | 26 ++++++++ sysdeps/riscv/rvv/strnlen.S | 61 +++++++++++++++++++ .../unix/sysv/linux/riscv/multiarch/Makefile | 3 + .../linux/riscv/multiarch/ifunc-impl-list.c | 5 ++ .../unix/sysv/linux/riscv/multiarch/strnlen.c | 56 +++++++++++++++++ 6 files changed, 175 insertions(+) create mode 100644 sysdeps/riscv/multiarch/strnlen-generic.c create mode 100644 sysdeps/riscv/multiarch/strnlen-vector.S create mode 100644 sysdeps/riscv/rvv/strnlen.S create mode 100644 sysdeps/unix/sysv/linux/riscv/multiarch/strnlen.c diff --git a/sysdeps/riscv/multiarch/strnlen-generic.c b/sysdeps/riscv/multiarch/strnlen-generic.c new file mode 100644 index 0000000000..171b267b58 --- /dev/null +++ b/sysdeps/riscv/multiarch/strnlen-generic.c @@ -0,0 +1,24 @@ +/* Re-include the default strnlen implementation. + Copyright (C) 2026 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 + . */ + +#include + +#if IS_IN(libc) +# define STRNLEN __strnlen_generic +# include +#endif diff --git a/sysdeps/riscv/multiarch/strnlen-vector.S b/sysdeps/riscv/multiarch/strnlen-vector.S new file mode 100644 index 0000000000..8571af14ad --- /dev/null +++ b/sysdeps/riscv/multiarch/strnlen-vector.S @@ -0,0 +1,26 @@ +/* Re-include the RISC-V RVV based strnlen implementation. + Copyright (C) 2026 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 + . */ + +#if IS_IN(libc) +# define STRNLEN __strnlen_vector +# undef libc_hidden_def +# define libc_hidden_def(name) +# undef weak_alias +# define weak_alias(name, alias) +# include +#endif diff --git a/sysdeps/riscv/rvv/strnlen.S b/sysdeps/riscv/rvv/strnlen.S new file mode 100644 index 0000000000..0e114f8cd7 --- /dev/null +++ b/sysdeps/riscv/rvv/strnlen.S @@ -0,0 +1,61 @@ +/* RISC-V RVV based strnlen. + Copyright (C) 2026 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 + . */ + +#include +#include + +#ifndef STRNLEN +# define STRNLEN __strnlen +#endif + +#define str a0 +#define copy_str a2 +#define ret_value a0 +#define max_len a1 +#define cur_vl a3 +#define end_offset a4 + +#define ELEM_LMUL_SETTING m1 +#define vstr v0 +#define vmask_end v8 + +ENTRY (STRNLEN) +.option push +.option arch, +v + mv copy_str, str + mv ret_value, max_len +L(strnlen_vector_loop): + beqz max_len, L(end_strnlen_vector_loop) + vsetvli zero, max_len, e8, ELEM_LMUL_SETTING, ta, ma + vle8ff.v vstr, (copy_str) + vmseq.vi vmask_end, vstr, 0 + vfirst.m end_offset, vmask_end /* first occurence of \0 */ + csrr cur_vl, vl + add copy_str, copy_str, cur_vl + sub max_len, max_len, cur_vl + bltz end_offset, L(strnlen_vector_loop) + add max_len, max_len, cur_vl + sub ret_value, ret_value, max_len + add ret_value, ret_value, end_offset +L(end_strnlen_vector_loop): + ret +.option pop +END (STRNLEN) +weak_alias (STRNLEN, strnlen) +libc_hidden_def (STRNLEN) +libc_hidden_def (strnlen) diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile index df33147de9..4e10723636 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile @@ -52,6 +52,9 @@ sysdep_routines += \ strncpy \ strncpy-generic \ strncpy-vector \ + strnlen \ + strnlen-generic \ + strnlen-vector \ # sysdep_routines CFLAGS-memcpy_noalignment.c += -mno-strict-align diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c b/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c index 26444cc99d..dba3d852fd 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c @@ -130,5 +130,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __strncpy_vector) IFUNC_IMPL_ADD (array, i, strncpy, 1, __strncpy_generic)) + IFUNC_IMPL (i, name, strnlen, + IFUNC_IMPL_ADD (array, i, strnlen, rvv_enabled, + __strnlen_vector) + IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_generic)) + return 0; } diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/strnlen.c b/sysdeps/unix/sysv/linux/riscv/multiarch/strnlen.c new file mode 100644 index 0000000000..6e570e6e4a --- /dev/null +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/strnlen.c @@ -0,0 +1,56 @@ +/* Multiple versions of strnlen. + All versions must be listed in ifunc-impl-list.c. + Copyright (C) 2026 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 + . */ + +#if IS_IN (libc) +/* Redefine strnlen so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +# define strnlen __redirect_strnlen +# define __strnlen __redirect___strnlen +# include +# include +# undef __strnlen +# undef strnlen +# include +# include +# include + +extern __typeof (__redirect_strnlen) __strnlen_generic attribute_hidden; +extern __typeof (__redirect_strnlen) __strnlen_vector attribute_hidden; + +static inline __typeof (__redirect_strnlen) * +select_strnlen_ifunc (uint64_t dl_hwcap, __riscv_hwprobe_t hwprobe_func) +{ + unsigned long long int v; + if (__riscv_hwprobe_one (hwprobe_func, RISCV_HWPROBE_KEY_IMA_EXT_0, &v) == 0 + && (v & RISCV_HWPROBE_IMA_V) == RISCV_HWPROBE_IMA_V) + return __strnlen_vector; + return __strnlen_generic; +} + +riscv_libc_ifunc_redirected (__redirect_strnlen, __strnlen, select_strnlen_ifunc); +weak_alias (__strnlen, strnlen); +# ifdef SHARED +__hidden_ver1 (__strnlen, __GI___strnlen, __redirect___strnlen) + __attribute__((visibility ("hidden"))) __attribute_copy__ (strnlen); +__hidden_ver1 (__strnlen, __GI_strnlen, __redirect_strnlen) + __attribute__((weak, visibility ("hidden"))) __attribute_copy__ (strnlen); +# endif +#else +# include +#endif