From patchwork Tue Feb 3 15:05:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zihong Yao X-Patchwork-Id: 129498 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 421584BA23EF for ; Tue, 3 Feb 2026 15:18:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 421584BA23EF 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 8073E4BA2E0C for ; Tue, 3 Feb 2026 15:14:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8073E4BA2E0C 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 8073E4BA2E0C 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=1770131700; cv=none; b=nLLRkMbMYT6FF4tvoOHTtXlFMHI5cQPrnt6oKnl9T3aYa9E+ukQR9qAmq/rr4adVHlqtdxxtmrxU9czIQE7H+bYxgyywrtQypeE9cUytI4QWEx7efGqrYe6sivuJFINNEc7Q+IUE8XgeP1vactYfzQpNSJr6IFJ56A9CqL+93P0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770131700; c=relaxed/simple; bh=mwa6Cl/MO4vNOB0+xp+kddbaQNK7w9EONsn8Ax8/gmc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=JwbH7gEGlAD+vUPc8BvpVS8Pc5M4y+Jd0attz5ojbSc/MMEDHxqXBq+RDNmZWCrMhak2O6B8Qt4KU6qL8c2aFvodk8HiE00YSYEEzEm5vTMMKopu0VtijP5oYaE8jJP6l3G6JHug/wGcL8XTmbm7m6LB5+wftZKcuKajsLoVVco= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8073E4BA2E0C Received: from Mobilestation.localdomain (unknown [183.6.59.140]) by APP-01 (Coremail) with SMTP id qwCowADHbmriEIJpZ2EVBw--.24930S10; Tue, 03 Feb 2026 23:14:51 +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 , Jerry Shih Subject: [PATCH v5 08/18] riscv: Add RVV stpncpy for multiarch and non-multiarch Date: Tue, 3 Feb 2026 23:05:32 +0800 Message-ID: <20260203151406.27450-9-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--.24930S10 X-Coremail-Antispam: 1UD129KBjvJXoWfGw1ftr4DGrWrCF4xJr15twb_yoWDWw47pF s5CF17GFs7Jrs7GryxKF4Yg3W3JrWrJrn8Kr1Y9w4Utw4jqr1xGFsF9rsaga4xJrWru3yU uF4DWFWUuF1rA3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmv14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26r1j6r4UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_ Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6x IIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_ Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8c xan2IY04v7MxkF7I0En4kS14v26r1q6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCj c4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4 CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4U MIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJV WUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUv cSsGvfC2KfnxnUUI43ZEXa7VUbPC7UUUUUU== X-Originating-IP: [183.6.59.140] X-CM-SenderInfo: p2lk00vjoszunw6l223fol2u1dvotugofq/ X-Spam-Status: No, score=-11.4 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, URIBL_BLOCKED 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: Jerry Shih Signed-off-by: Yao Zihong --- sysdeps/riscv/multiarch/stpncpy-generic.c | 28 ++++++ sysdeps/riscv/multiarch/stpncpy-vector.S | 28 ++++++ sysdeps/riscv/rvv/stpncpy.S | 97 +++++++++++++++++++ .../unix/sysv/linux/riscv/multiarch/Makefile | 3 + .../linux/riscv/multiarch/ifunc-impl-list.c | 5 + .../unix/sysv/linux/riscv/multiarch/stpncpy.c | 57 +++++++++++ 6 files changed, 218 insertions(+) create mode 100644 sysdeps/riscv/multiarch/stpncpy-generic.c create mode 100644 sysdeps/riscv/multiarch/stpncpy-vector.S create mode 100644 sysdeps/riscv/rvv/stpncpy.S create mode 100644 sysdeps/unix/sysv/linux/riscv/multiarch/stpncpy.c diff --git a/sysdeps/riscv/multiarch/stpncpy-generic.c b/sysdeps/riscv/multiarch/stpncpy-generic.c new file mode 100644 index 0000000000..4be8080d88 --- /dev/null +++ b/sysdeps/riscv/multiarch/stpncpy-generic.c @@ -0,0 +1,28 @@ +/* Re-include the default stpncpy 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 STPNCPY __stpncpy_generic +# undef libc_hidden_def +# define libc_hidden_def(name) +# undef weak_alias +# define weak_alias(x, x2) +# include +#endif diff --git a/sysdeps/riscv/multiarch/stpncpy-vector.S b/sysdeps/riscv/multiarch/stpncpy-vector.S new file mode 100644 index 0000000000..e84d28a1e4 --- /dev/null +++ b/sysdeps/riscv/multiarch/stpncpy-vector.S @@ -0,0 +1,28 @@ +/* Re-include the RISC-V RVV based stpncpy 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 STPNCPY __stpncpy_vector +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(name) +# 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/stpncpy.S b/sysdeps/riscv/rvv/stpncpy.S new file mode 100644 index 0000000000..57406685b0 --- /dev/null +++ b/sysdeps/riscv/rvv/stpncpy.S @@ -0,0 +1,97 @@ +/* RISC-V RVV based stpncpy. + 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 STPNCPY +# ifdef weak_alias +# define STPNCPY __stpncpy +weak_alias (__stpncpy, stpncpy) +# else +# define STPNCPY stpncpy +# endif +#endif + +#define dst a0 +#define src a1 +#define length a2 +#define dst_ptr a3 +#define active_elem_pos a4 +#define cur_vl a5 +#define ivl a6 +#define temp a1 + +#define ELEM_LMUL_SETTING m1 +#define vmask1 v0 +#define vmask2 v1 +#define ZERO_FILL_ELEM_LMUL_SETTING m8 +#define vstr1 v8 +#define vstr2 v16 + +ENTRY (STPNCPY) +.option push +.option arch, +v + mv dst_ptr, dst + /* Copy src to dst_ptr. */ +L(stpcpy_loop): + vsetvli zero, length, e8, ELEM_LMUL_SETTING, ta, ma + vle8ff.v vstr1, (src) + vmseq.vx vmask2, vstr1, zero + csrr cur_vl, vl + vfirst.m active_elem_pos, vmask2 + vmsif.m vmask1, vmask2 + add src, src, cur_vl + sub length, length, cur_vl + vse8.v vstr1, (dst_ptr), vmask1.t + add dst_ptr, dst_ptr, cur_vl + bgez active_elem_pos, L(fill_zero) + bnez length, L(stpcpy_loop) + mv dst, dst_ptr + ret + + /* Fill the tail zero. */ +L(fill_zero): + /* We already copy the `\0` to dst. But we use `vfirst.m` to + get the `index` of `\0` position. We need to adjust `-1` + to get the correct remaining length for zero filling. */ + sub temp, cur_vl, active_elem_pos + addi temp, temp, -1 + sub dst, dst_ptr, cur_vl + add dst, dst, active_elem_pos + add length, length, temp + /* Have an earily return for `strlen(src) + 1 == count` case. */ + bnez length, L(do_fill_zero) + ret + +L(do_fill_zero): + sub dst_ptr, dst_ptr, temp + vsetvli zero, length, e8, ZERO_FILL_ELEM_LMUL_SETTING, ta, ma + vmv.v.x vstr2, zero +L(fill_zero_loop): + vsetvli ivl, length, e8, ZERO_FILL_ELEM_LMUL_SETTING, ta, ma + vse8.v vstr2, (dst_ptr) + sub length, length, ivl + add dst_ptr, dst_ptr, ivl + bnez length, L(fill_zero_loop) + ret +.option pop +END (STPNCPY) +#ifdef weak_alias +libc_hidden_def (__stpncpy) +#endif diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile index 190e853e6e..38d96e8b11 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile @@ -25,6 +25,9 @@ sysdep_routines += \ memset \ memset-generic \ memset-vector \ + stpncpy \ + stpncpy-generic \ + stpncpy-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 53e76705df..ed3176d1cc 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c @@ -85,5 +85,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __memrchr_vector) IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_generic)) + IFUNC_IMPL (i, name, stpncpy, + IFUNC_IMPL_ADD (array, i, stpncpy, rvv_enabled, + __stpncpy_vector) + IFUNC_IMPL_ADD (array, i, stpncpy, 1, __stpncpy_generic)) + return 0; } diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/stpncpy.c b/sysdeps/unix/sysv/linux/riscv/multiarch/stpncpy.c new file mode 100644 index 0000000000..e451391f1a --- /dev/null +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/stpncpy.c @@ -0,0 +1,57 @@ +/* Multiple versions of stpncpy. + 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 stpncpy so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +# undef stpncpy +# define stpncpy __redirect_stpncpy +# include +# include +# include +# include +# include + +extern __typeof (__redirect_stpncpy) __libc_stpncpy; + +extern __typeof (__redirect_stpncpy) __stpncpy_generic attribute_hidden; +extern __typeof (__redirect_stpncpy) __stpncpy_vector attribute_hidden; + +static inline __typeof (__redirect_stpncpy) * +select_stpncpy_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 __stpncpy_vector; + return __stpncpy_generic; +} + +riscv_libc_ifunc (__libc_stpncpy, select_stpncpy_ifunc); + +# undef stpncpy +weak_alias (__libc_stpncpy, stpncpy); +libc_hidden_def (__stpncpy); +# ifdef SHARED +__hidden_ver1 (stpncpy, __GI_stpncpy, __redirect_stpncpy) + __attribute__ ((visibility ("hidden"))) __attribute_copy__ (stpncpy); +# endif +#else +# include +#endif