From patchwork Mon Apr 22 07:44:01 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: 88834 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 BC5F9385841E for ; Mon, 22 Apr 2024 07:46:58 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id B6292384AB5D for ; Mon, 22 Apr 2024 07:44:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B6292384AB5D 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 B6292384AB5D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::133 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713771863; cv=none; b=dx7rKCNAcMZqZ0m2/PCwGQ5K/0uX7k59u81PqpKtXGrNL7sbpEqkl3ZO0s9KZkwHdH6JE/GQ+c2RvDiKJvZMjaVsQEh2LUQTFtaGjFkr3IddU9+ENskoBRUqdH+0ktKT/YSBwGrRa0TOFnGUa9MOxoHReRtLjCuaMCXODqo+4bU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713771863; c=relaxed/simple; bh=2D+xEFtuzCesMXBmkmbHumbJ6Nzbyj9ZtoU5qX2VD/I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Uv4tu/So3mtgjpXfEFF4zUfd+xPcN6qxp8F2wQOUxbOEb4xH2yEa+/Hrqhbkf6LvMM5+jDuPxGVbnqtMsEC+z/D3B6UBYd0prvcFpeP7KGedeULvK5Fzm3AO1x7Q6apSOjXloKW3LFmaK9AuJPp7Qk8z5qAbXPCNSEPDk0DZXq4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-516d2b9cd69so4836885e87.2 for ; Mon, 22 Apr 2024 00:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1713771859; x=1714376659; 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=dJQoK+bL7k2VySwtCV1JxxINqRU9fVYa0Z7Mq3xQHV4=; b=ht+nWX6VVI4rXKOl+Dc0jCY8s0dydcqR6q/+OCdAOpI33nBgdSX9dBw2xv+vYTXnV6 Zc7KLRieaL9SA8lqV/4kwhNkhtTvz2sqHSgb6oeepgmWJbE8p0LUIGdB7k+mQ3I4PXBy lh4chzxbmtAFsFciRHt1eOWdKAb4kEQHPwm/+mVo6pv9Mc9odfr/i98pkQyhnLCcu50+ qXgIHmcJ5stKr/kxSCCqX2T998naF80/zxMKNwLOj9O5aPiTRrYhBiSwvf/O2mxqMy6d IC4PmSLSS7PmzD+0p5uLd1DGX033b/bSBEi1Se44vgQw3qL5bFzdPe/OoaOyJgw2xbqn xBMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713771859; x=1714376659; 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=dJQoK+bL7k2VySwtCV1JxxINqRU9fVYa0Z7Mq3xQHV4=; b=PHn0k0OZxVj9kPp0bZ/3dG/WAfurp6qIsIuCuNMRkFEfyogendc2kUYKfHBhJrm6Ko UoZYPWoVmJD2reNEPykj2nmMXxNDEeMYnpOCpJd6XpTKKwsOLDZsm2qI+8vYtAEEZrZl Ne2DSqVQCF1qFInImW1IOOK9zwlAvZk6sGk2b/3yFlyFex1rbD/een4ROMXgRMAvRJuC TYd5JphPxj4rYo9kAmpKDmwZ92LIbEd54EzooQIT/lHrYyY4kuJeVnH2lyUPBOj0zald KVQDrjg7VYGnNXX7m7ybSBAYDY5NlVN+ZWy7OyULSORdfuDtXwXgn34lbIyJB+AXDb2X 6GEw== X-Gm-Message-State: AOJu0Yxs9U6Ouq5xVPmMFkokp5MOwyC+SLHj8BtF6fKGQgA9KnielrP1 1tfb21lUVSE8l+1U+q9PhEbHMB7a2kHMdcEkv5LqLmmEZE1tVbco5es84d6MVLvtgqjEtCbIQBF pgUw= X-Google-Smtp-Source: AGHT+IEY3OgOcc7Qd+PMuxOErF3H0AG2JNIv/y5NmijMTspF5o8dGTVDGNMTe22U7qa5P0k/4ClcEA== X-Received: by 2002:a05:6512:517:b0:516:a6ff:2467 with SMTP id o23-20020a056512051700b00516a6ff2467mr5805586lfb.0.1713771858797; Mon, 22 Apr 2024 00:44:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 00:44:18 -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 5/7] RISC-V: Add Zbb optimized strcmp as ifunc Date: Mon, 22 Apr 2024 09:44:01 +0200 Message-ID: <20240422074403.2399529-6-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.6 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, strcmp 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/strcmp-generic.c | 26 +++++++++ sysdeps/riscv/multiarch/strcmp-zbb.c | 30 ++++++++++ .../unix/sysv/linux/riscv/multiarch/Makefile | 3 + .../linux/riscv/multiarch/ifunc-impl-list.c | 4 ++ .../unix/sysv/linux/riscv/multiarch/strcmp.c | 57 +++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 sysdeps/riscv/multiarch/strcmp-generic.c create mode 100644 sysdeps/riscv/multiarch/strcmp-zbb.c create mode 100644 sysdeps/unix/sysv/linux/riscv/multiarch/strcmp.c diff --git a/sysdeps/riscv/multiarch/strcmp-generic.c b/sysdeps/riscv/multiarch/strcmp-generic.c new file mode 100644 index 0000000000..5da954d426 --- /dev/null +++ b/sysdeps/riscv/multiarch/strcmp-generic.c @@ -0,0 +1,26 @@ +/* Re-include the default strcmp 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 STRCMP __strcmp_generic +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(x) +#endif +#include diff --git a/sysdeps/riscv/multiarch/strcmp-zbb.c b/sysdeps/riscv/multiarch/strcmp-zbb.c new file mode 100644 index 0000000000..2ccde14f53 --- /dev/null +++ b/sysdeps/riscv/multiarch/strcmp-zbb.c @@ -0,0 +1,30 @@ +/* Re-include the default strcmp 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 STRCMP __strcmp_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 242c2527d2..8aef9f1638 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/Makefile @@ -12,6 +12,9 @@ sysdep_routines += \ strchrnul \ strchrnul-generic \ strchrnul-zbb \ + strcmp \ + strcmp-generic \ + strcmp-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 97cc821a56..f4df7a2b0b 100644 --- a/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/ifunc-impl-list.c @@ -68,5 +68,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, strchrnul, has_zbb, __strchrnul_zbb) IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_generic)) + IFUNC_IMPL (i, name, strcmp, + IFUNC_IMPL_ADD (array, i, strcmp, has_zbb, __strcmp_zbb) + IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_generic)) + return 0; } diff --git a/sysdeps/unix/sysv/linux/riscv/multiarch/strcmp.c b/sysdeps/unix/sysv/linux/riscv/multiarch/strcmp.c new file mode 100644 index 0000000000..47b3277e77 --- /dev/null +++ b/sysdeps/unix/sysv/linux/riscv/multiarch/strcmp.c @@ -0,0 +1,57 @@ +/* Multiple versions of strcmp. + 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 strcmp so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +# undef strcmp +# define strcmp __redirect_strcmp +# include +# include +# include +# include +# include + +extern __typeof (__redirect_strcmp) __libc_strcmp; + +extern __typeof (__redirect_strcmp) __strcmp_generic attribute_hidden; +extern __typeof (__redirect_strcmp) __strcmp_zbb attribute_hidden; + +static inline __typeof (__redirect_strcmp) * +select_strcmp_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 __strcmp_zbb; + + return __strcmp_generic; +} + +riscv_libc_ifunc (__libc_strcmp, select_strcmp_ifunc); + +# undef strcmp +strong_alias (__libc_strcmp, strcmp); +# ifdef SHARED +__hidden_ver1 (strcmp, __GI_strcmp, __redirect_strcmp) + __attribute__ ((visibility ("hidden"))) __attribute_copy__ (strcmp); +# endif +#else +# include +#endif