From patchwork Mon Apr 22 07:44:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 88837 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B2637384AB5A for ; Mon, 22 Apr 2024 07:49:04 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by sourceware.org (Postfix) with ESMTPS id 3DD0A385841E for ; Mon, 22 Apr 2024 07:44:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3DD0A385841E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3DD0A385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::12c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713771862; cv=none; b=d59M/7rMQaebCkTOJronT2od7WWUvaXHSrub398kW699/25pYLPFFmUcAOOcz35IQn6UNEoYemDw3PNQkewjEcuB/IGYdudR43+cFJM3Bew9XnuliqNPHmXelVmQUl7XIKC8TMIhpCZvkbHrNsHDYmDiUdh5C54J2K/WLxReIm8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713771862; c=relaxed/simple; bh=/cPzskJE/LqKLibOoBbZ5MWFdhzcIvd5h28O+OV0nWQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=DSXnCRC8ASMDuYm2Nll3+s6+8jLHaOJ9G2bYEnjHJnO9gjAjaQDFzgartCYXxinq+Q5bSeUZZzaDtnhGLnXBh2S1UshqsVLjL8gExtwLqflS5PqwBDa8IyZMvxS7AqPw3HS1Vb7Ku6jDbw0882+88pLsWXsUZYOH000b2RiztGA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-51abd9fcbf6so4821868e87.1 for ; Mon, 22 Apr 2024 00:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1713771857; x=1714376657; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y342bLmBlIfMG7iqwFmizSjgI+HyOrcl6/JLOiOi8kA=; b=ESIpGK5vIerwctYnqAd+zh7OO3YzSAIjzAbNO+rCmKoWEifD9wk9/TF6F8ks0S0GOJ HbmHtb1JQcWbm96beClsBgnwMiAge8oOlnGvHe8dSdLG8km9dbUIq5kWI1UhLOUsguIz 0x+/hsFybwiPvpoyMIyWs0gzMF29157sT50bXe/V/K9h8WiG4n35YnYWGDJWfrsbs/oL USJv2fTYh0GXbp561WeL6vVPvKYDC7BPE03SndADJXo9AZ4T0vz0HVdYLZxvuLaaQ6+i CLwDok0cUBm5sIOjpQrMykuVDV4b4H/+AJqGKOujjB5u0cloF8kQFTwnF9l6kU9dLOhb k8dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713771857; x=1714376657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y342bLmBlIfMG7iqwFmizSjgI+HyOrcl6/JLOiOi8kA=; b=R9nXI3aBmxFFaXDvIYh7KGhO1qCOdsQbDXNSZCrcfoVDoSO8eNcS2bGkp0ynPb5l/D X6AP/F6w1gRkJsrW9Wh8v1zq2M5nny0K+LIIsaW2Al66kK4T0xC0pJXzjxfrGrlRq9i8 BbrQI28BMebUOK2yx2hv4S/vNyk8uJl5+0gjEBbXd8uRnpzaORyGEBboQLsCO4KNT7FM ijTP+b4c/UD1NKPa8Pe8PPZvdvR1b3sqcqFhJ9ASNZVgI9GA0IaRpQ82LeSPxfQB8bi8 Am5wFYJ3TWEH4WjGO9nO4UEoAXlJJ921j0ZdQmZg/qo/iKvZr7a/tyoDx/YyCn6uHiTY yKMw== X-Gm-Message-State: AOJu0YxZMrMLLUapTuF7Rs1W4+9k/PMKWMSMp5GVq1XbjPtZZQhq220v P6l29J6+cz5zMWO9VVf9AUeu3EBylAkMwtK8VpU6UYIvJXhQmZATKHB26fotfyUVs6pw3SMElGP ZObw= X-Google-Smtp-Source: AGHT+IE8mwhYJh6MLFfp1n39O2i0M2Y/3wfbY8Ivul/6ihkl9loJl3NFNgOtR5GY6vFLgz9JnLss5Q== X-Received: by 2002:a19:e00f:0:b0:51a:bd7c:2194 with SMTP id x15-20020a19e00f000000b0051abd7c2194mr6287470lfg.23.1713771857128; Mon, 22 Apr 2024 00:44:17 -0700 (PDT) Received: from beast.fritz.box (static.239.130.217.95.clients.your-server.de. [95.217.130.239]) by smtp.gmail.com with ESMTPSA id v24-20020a197418000000b0051920234d6dsm1656756lfe.273.2024.04.22.00.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 00:44:16 -0700 (PDT) From: =?utf-8?q?Christoph_M=C3=BCllner?= To: libc-alpha@sourceware.org, Adhemerval Zanella , Palmer Dabbelt , Darius Rad , Andrew Waterman , Philipp Tomsich , Evan Green , DJ Delorie , Vineet Gupta , Kito Cheng , Jeff Law Cc: =?utf-8?q?Christoph_M=C3=BCllner?= Subject: [PATCH 4/7] RISC-V: Add Zbb optimized strchrnul as ifunc Date: Mon, 22 Apr 2024 09:44:00 +0200 Message-ID: <20240422074403.2399529-5-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240422074403.2399529-1-christoph.muellner@vrull.eu> References: <20240422074403.2399529-1-christoph.muellner@vrull.eu> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_MANYTO, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.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 When building with Zbb enabled, strchrnul benefits from using orc.b in find_zero_all(). This patch changes the build system such, that a non-Zbb version as well as a Zbb version of this routine is built. Further, a ifunc resolver is provided that selects the right routine based on the outcome of extension probing via hwprobe(). Signed-off-by: Christoph Müllner --- sysdeps/riscv/multiarch/strchrnul-generic.c | 26 ++++++++ sysdeps/riscv/multiarch/strchrnul-zbb.c | 30 +++++++++ .../unix/sysv/linux/riscv/multiarch/Makefile | 3 + .../linux/riscv/multiarch/ifunc-impl-list.c | 4 ++ .../sysv/linux/riscv/multiarch/strchrnul.c | 61 +++++++++++++++++++ 5 files changed, 124 insertions(+) create mode 100644 sysdeps/riscv/multiarch/strchrnul-generic.c create mode 100644 sysdeps/riscv/multiarch/strchrnul-zbb.c create mode 100644 sysdeps/unix/sysv/linux/riscv/multiarch/strchrnul.c diff --git a/sysdeps/riscv/multiarch/strchrnul-generic.c b/sysdeps/riscv/multiarch/strchrnul-generic.c new file mode 100644 index 0000000000..0b64273ebf --- /dev/null +++ b/sysdeps/riscv/multiarch/strchrnul-generic.c @@ -0,0 +1,26 @@ +/* Re-include the default strchrnul implementation. + Copyright (C) 2024 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 STRCHRNUL __strchrnul_generic +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(x) +#endif +#include diff --git a/sysdeps/riscv/multiarch/strchrnul-zbb.c b/sysdeps/riscv/multiarch/strchrnul-zbb.c new file mode 100644 index 0000000000..f12fba7709 --- /dev/null +++ b/sysdeps/riscv/multiarch/strchrnul-zbb.c @@ -0,0 +1,30 @@ +/* Re-include the default strchrnul implementation for Zbb. + Copyright (C) 2024 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 STRCHRNUL __strchrnul_zbb +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(x) +#endif +/* Convince preprocessor to have Zbb instructions. */ +#ifndef __riscv_zbb +# define __riscv_zbb +#endif +#include diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile index d36d0bd6dd..242c2527d2 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile @@ -9,6 +9,9 @@ sysdep_routines += \ memrchr \ memrchr-generic \ memrchr-zbb \ + strchrnul \ + strchrnul-generic \ + strchrnul-zbb \ # 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 f4ec58b9d8..97cc821a56 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c @@ -64,5 +64,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, memrchr, has_zbb, __memrchr_zbb) IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_generic)) + IFUNC_IMPL (i, name, strchrnul, + IFUNC_IMPL_ADD (array, i, strchrnul, has_zbb, __strchrnul_zbb) + IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_generic)) + return 0; } diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/strchrnul.c b/sysdeps/unix/sysv/linux/riscv/multiarch/strchrnul.c new file mode 100644 index 0000000000..c3f245678e --- /dev/null +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/strchrnul.c @@ -0,0 +1,61 @@ +/* Multiple versions of strchrnul. + All versions must be listed in ifunc-impl-list.c. + Copyright (C) 2017-2024 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 strchrnul so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +# undef strchrnul +# undef __strchrnul +# define strchrnul __redirect_strchrnul +# define __strchrnul __redirect_strchrnul +# include +# include +# include +# include +# include + +extern __typeof (__redirect_strchrnul) __libc_strchrnul; + +extern __typeof (__redirect_strchrnul) __strchrnul_generic attribute_hidden; +extern __typeof (__redirect_strchrnul) __strchrnul_zbb attribute_hidden; + +static inline __typeof (__redirect_strchrnul) * +select_strchrnul_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_EXT_ZBB)) + return __strchrnul_zbb; + + return __strchrnul_generic; +} + +riscv_libc_ifunc (__libc_strchrnul, select_strchrnul_ifunc); + +# undef strchrnul +# undef __strchrnul +strong_alias (__libc_strchrnul, __strchrnul); +weak_alias (__strchrnul, strchrnul) +# ifdef SHARED +__hidden_ver1 (strchrnul, __GI___strchrnul, __redirect_strchrnul) + __attribute__ ((visibility ("hidden"))) __attribute_copy__ (strchrnul); +# endif +#else +# include +#endif