From patchwork Thu Jun 30 03:10:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1650445 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=feREKDOl; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LYNdH65Ybz9s0r for ; Thu, 30 Jun 2022 13:10:59 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C43B53843883 for ; Thu, 30 Jun 2022 03:10:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C43B53843883 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1656558657; bh=Q4fk77oyZWIjqm5nEjoWrrIuWbIh6DKLCepp2WSZ3N0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=feREKDOldlZd2LKOGFt6D/04z+CZY/RRvfrsTAGnIG/3T3PM+n0dkKrzc7zcTY0eD KaAC/+20U93qPxd6y7NfK7BrWBRlPaiJwRL5bPfJEzMS6CHVkUku85Psj9yOqXYY20 3/KyK4+q3rsGVuR+Pr73SIcGaDn7Q7QzEShjwmHU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 05755386C59A for ; Thu, 30 Jun 2022 03:10:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 05755386C59A Received: by mail-pf1-x42a.google.com with SMTP id d17so16836365pfq.9 for ; Wed, 29 Jun 2022 20:10:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q4fk77oyZWIjqm5nEjoWrrIuWbIh6DKLCepp2WSZ3N0=; b=owbUd9QfFqNX8pljVF5rF0p5Pnp+0Pq6dJVhueE2x2lBxKLvv3aKMlbc61QRQqRV2+ YVChFZ2akIlLjEg0lOgJbqTsP3sl9xyqx4EDpZGZ9T1Hn2UUoKNcbHHWjtMHjof/vkQU 8AiTLEkNmOhf+Jx5hGH8G9qr2leJXA18lVbJEV9bB/naLVRc8MX7zpZlHuVhRPBwpdqK MZy7kETUsFVa7Px/s9yTvci6O3hO0tC5ujom6KfgV/KRJUD3KUbhq4MrLq5YAfsx52h6 oceH7l0n8/X7VkIGyE7I7WGWaEg1mntuyTxQCEBZxNAQzoFNV1Ykf/4qG2t20mtjjdR1 3XOA== X-Gm-Message-State: AJIora8VBlO+F3MS/BjfdyioZIw5M+sA/UzqdC/2NTM1wgsLiEydpZ1u zrHDHV5s7nZgQmPsLRDla6uRs/ISmRw= X-Google-Smtp-Source: AGRyM1vQfyiWiiCDQp1z6mLAjR8tlMRlMtdsq6ktVETBn4WFUbCX9rkgNNV8L6F/sC7f376FeaVvRQ== X-Received: by 2002:a63:6a49:0:b0:3fd:df6d:5ba3 with SMTP id f70-20020a636a49000000b003fddf6d5ba3mr5637089pgc.385.1656558641918; Wed, 29 Jun 2022 20:10:41 -0700 (PDT) Received: from noah-tgl.. ([2600:1010:b00a:11cb:54c6:67b8:c3a4:f835]) by smtp.gmail.com with ESMTPSA id a15-20020a17090a688f00b001eef3f30c74sm453501pjd.48.2022.06.29.20.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 20:10:41 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v5 1/2] x86: Add comment explaining no Slow_SSE4_2 check in ifunc-sse4_2 Date: Wed, 29 Jun 2022 20:10:38 -0700 Message-Id: <20220630031039.3693951-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220628152717.17838-1-goldstein.w.n@gmail.com> References: <20220628152717.17838-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Just for clarities sake and so that if a future implementation is added we remember to add the check. --- sysdeps/x86_64/multiarch/ifunc-sse4_2.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h index ee36525bcf..4eb9cca7f0 100644 --- a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h +++ b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h @@ -27,6 +27,10 @@ IFUNC_SELECTOR (void) { const struct cpu_features* cpu_features = __get_cpu_features (); + /* This function uses slow sse4.2 instructions (pcmpstri) but since + there is no other optimized implementation keep using. If an + optimized fallback is added add a X86_ISA_CPU_FEATURE_ARCH_P + (cpu_features, Slow_SSE4_2) check. */ if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2)) return OPTIMIZE (sse42); From patchwork Thu Jun 30 03:10:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1650446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=ESfBHqZV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LYNdN2Nw7z9s0r for ; Thu, 30 Jun 2022 13:11:04 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 356343842ADF for ; Thu, 30 Jun 2022 03:11:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 356343842ADF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1656558662; bh=8K6SfVN28Plpf+jFmELsfSRFmL44nGXxxNYlSpMbEPc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ESfBHqZV51ZVD/atH9DuBP15J8Yaof8S7cdhcElJx2o8WvLMiEbi0jYxOz95z99Tr soQp/8ZIIRjhTVzFklpeCpeS6r1PLPBttN3HGjRcxK1/AXPVILzC6IypnyeVE/7zBd v1hNDawEIxWIMc+Ls2aiiU1Q19tuGFLs9DG/urYw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 561DB386C5BB for ; Thu, 30 Jun 2022 03:10:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 561DB386C5BB Received: by mail-pf1-x435.google.com with SMTP id t21so16886363pfq.1 for ; Wed, 29 Jun 2022 20:10:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8K6SfVN28Plpf+jFmELsfSRFmL44nGXxxNYlSpMbEPc=; b=HJXOrOxRJRW7xKeP1XCV6zCismAgroLCmw6aiPovS293Nesm4Yk5JqdAiLpZS5zI81 TmRpt5xFzeA+2pyX1yfwvGSF98AmWYJ6LrLTXg4ZvrjhssrboKJkINsl4QQj1TArmfAW 8Rj4Vatrm35j9O2/IBxH1XYfM9LYIt9nBCsYoOsRRvnB1gPqrjdVFLG3ZSR9n3ZaWWiU PpcgkVu3PvDjtM2nI1r4fv1kiAEfM9Cm2XB9bGuHOtZIAyggAVw+jUxmtLmEsJa3QdY/ DITxlb2uEVeqNUpqeVVuikHw7FVhoi0SCf65QMyLxpg7mLw1otqjjw1Fpfva1Lvd2ZwQ 0Dbg== X-Gm-Message-State: AJIora/0kmwJVvRfDCOl4OXkpuG44y3HVqKU28m789TdTCE0atX1wyLp LqsACE+38/DE0ce5PIM/qa9aohS3CIU= X-Google-Smtp-Source: AGRyM1t819huuIfnNu2VQbKeJ+WyzbOcc0AzVKNm+ztYxtC0lYFWkIbL/9V61X2ZEpqtMk5i14MvPw== X-Received: by 2002:a05:6a00:1893:b0:525:5110:e1f7 with SMTP id x19-20020a056a00189300b005255110e1f7mr12123419pfh.2.1656558642976; Wed, 29 Jun 2022 20:10:42 -0700 (PDT) Received: from noah-tgl.. ([2600:1010:b00a:11cb:54c6:67b8:c3a4:f835]) by smtp.gmail.com with ESMTPSA id a15-20020a17090a688f00b001eef3f30c74sm453501pjd.48.2022.06.29.20.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 20:10:42 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v5 2/2] x86: Add support for building str{c|p}{brk|spn} with explicit ISA level Date: Wed, 29 Jun 2022 20:10:39 -0700 Message-Id: <20220630031039.3693951-2-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220630031039.3693951-1-goldstein.w.n@gmail.com> References: <20220628152717.17838-1-goldstein.w.n@gmail.com> <20220630031039.3693951-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" The changes for these functions are different than the others because the best implementation (sse4_2) requires the generic implementation as a fallback to be built as well. Changes are: 1. Add non-multiarch functions for str{c|p}{brk|spn}.c to statically select the best implementation based on the configured ISA build level. 2. Add stubs for str{c|p}{brk|spn}-generic and varshift.c to in the sysdeps/x86_64 directory so that the the sse4 implementation will have all of its dependencies for the non-multiarch / rtld build when ISA level >= 2. 3. Add new multiarch/rtld-strcspn.c that just include the non-multiarch strcspn.c which will in turn select the best implementation based on the compiled ISA level. 4. Refactor the ifunc selector and ifunc implementation list to use the ISA level aware wrapper macros that allow functions below the compiled ISA level (with a guranteed replacement) to be skipped. Tested with and without multiarch on x86_64 for ISA levels: {generic, x86-64-v2, x86-64-v3, x86-64-v4} And m32 with and without multiarch. --- sysdeps/x86_64/Makefile | 9 +++++++- sysdeps/x86_64/multiarch/ifunc-impl-list.c | 6 +++++ sysdeps/x86_64/multiarch/ifunc-sse4_2.h | 2 +- sysdeps/x86_64/multiarch/rtld-strcspn.c | 18 +++++++++++++++ sysdeps/x86_64/multiarch/strcspn-generic.c | 6 +++-- sysdeps/x86_64/multiarch/strcspn-sse4.c | 8 ++++--- sysdeps/x86_64/multiarch/strpbrk-generic.c | 5 +++- sysdeps/x86_64/multiarch/strpbrk-sse4.c | 6 ++++- sysdeps/x86_64/multiarch/strspn-generic.c | 7 ++++-- sysdeps/x86_64/multiarch/strspn-sse4.c | 5 +++- sysdeps/x86_64/strcspn-generic.c | 25 ++++++++++++++++++++ sysdeps/x86_64/strcspn.c | 27 ++++++++++++++++++++++ sysdeps/x86_64/strpbrk-generic.c | 25 ++++++++++++++++++++ sysdeps/x86_64/strpbrk.c | 27 ++++++++++++++++++++++ sysdeps/x86_64/strspn-generic.c | 26 +++++++++++++++++++++ sysdeps/x86_64/strspn.c | 27 ++++++++++++++++++++++ sysdeps/x86_64/varshift.c | 26 +++++++++++++++++++++ 17 files changed, 243 insertions(+), 12 deletions(-) create mode 100644 sysdeps/x86_64/multiarch/rtld-strcspn.c create mode 100644 sysdeps/x86_64/strcspn-generic.c create mode 100644 sysdeps/x86_64/strcspn.c create mode 100644 sysdeps/x86_64/strpbrk-generic.c create mode 100644 sysdeps/x86_64/strpbrk.c create mode 100644 sysdeps/x86_64/strspn-generic.c create mode 100644 sysdeps/x86_64/strspn.c create mode 100644 sysdeps/x86_64/varshift.c diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 79365aff2a..e597a4855f 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -14,7 +14,14 @@ sysdep_noprof += _mcount endif ifeq ($(subdir),string) -sysdep_routines += strcasecmp_l-nonascii strncase_l-nonascii +sysdep_routines += \ + strcasecmp_l-nonascii \ + strcspn-generic \ + strncase_l-nonascii \ + strpbrk-generic \ + strspn-generic \ + varshift \ +# sysdep_routines gen-as-const-headers += locale-defines.sym tests += \ tst-rsi-strlen diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c index 9e07283f86..b84acfead2 100644 --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c @@ -533,6 +533,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/strcspn.c. */ IFUNC_IMPL (i, name, strcspn, + /* All implementations of strcspn are built at all ISA + levels. */ IFUNC_IMPL_ADD (array, i, strcspn, CPU_FEATURE_USABLE (SSE4_2), __strcspn_sse42) IFUNC_IMPL_ADD (array, i, strcspn, 1, __strcspn_generic)) @@ -609,6 +611,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/strpbrk.c. */ IFUNC_IMPL (i, name, strpbrk, + /* All implementations of strpbrk are built at all ISA + levels. */ IFUNC_IMPL_ADD (array, i, strpbrk, CPU_FEATURE_USABLE (SSE4_2), __strpbrk_sse42) IFUNC_IMPL_ADD (array, i, strpbrk, 1, __strpbrk_generic)) @@ -616,6 +620,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/strspn.c. */ IFUNC_IMPL (i, name, strspn, + /* All implementations of strspn are built at all ISA + levels. */ IFUNC_IMPL_ADD (array, i, strspn, CPU_FEATURE_USABLE (SSE4_2), __strspn_sse42) IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_generic)) diff --git a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h index 4eb9cca7f0..f8943c8210 100644 --- a/sysdeps/x86_64/multiarch/ifunc-sse4_2.h +++ b/sysdeps/x86_64/multiarch/ifunc-sse4_2.h @@ -31,7 +31,7 @@ IFUNC_SELECTOR (void) there is no other optimized implementation keep using. If an optimized fallback is added add a X86_ISA_CPU_FEATURE_ARCH_P (cpu_features, Slow_SSE4_2) check. */ - if (CPU_FEATURE_USABLE_P (cpu_features, SSE4_2)) + if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, SSE4_2)) return OPTIMIZE (sse42); return OPTIMIZE (generic); diff --git a/sysdeps/x86_64/multiarch/rtld-strcspn.c b/sysdeps/x86_64/multiarch/rtld-strcspn.c new file mode 100644 index 0000000000..99e3c59e00 --- /dev/null +++ b/sysdeps/x86_64/multiarch/rtld-strcspn.c @@ -0,0 +1,18 @@ +/* Copyright (C) 2022 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 "../strcspn.c" diff --git a/sysdeps/x86_64/multiarch/strcspn-generic.c b/sysdeps/x86_64/multiarch/strcspn-generic.c index 423de2e2b2..86cda7b037 100644 --- a/sysdeps/x86_64/multiarch/strcspn-generic.c +++ b/sysdeps/x86_64/multiarch/strcspn-generic.c @@ -16,8 +16,10 @@ License along with the GNU C Library; if not, see . */ -#if IS_IN (libc) - +/* We always need to build this implementation as strcspn-sse4 needs + to be able to fallback to it. */ +#include +#if IS_IN (libc) || MINIMUM_X86_ISA_LEVEL >= 2 # include # define STRCSPN __strcspn_generic diff --git a/sysdeps/x86_64/multiarch/strcspn-sse4.c b/sysdeps/x86_64/multiarch/strcspn-sse4.c index d11e87ab6c..ff88dfdb55 100644 --- a/sysdeps/x86_64/multiarch/strcspn-sse4.c +++ b/sysdeps/x86_64/multiarch/strcspn-sse4.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see . */ -#if IS_IN (libc) +#if IS_IN (libc) || MINIMUM_X86_ISA_LEVEL >= 2 # include # include @@ -54,9 +54,11 @@ when either CFlag or ZFlag is 1. If CFlag == 1, ECX has the offset X for case 1. */ +# ifndef STRCSPN +# define STRCSPN __strcspn_sse42 +# endif # ifndef STRCSPN_GENERIC # define STRCSPN_GENERIC __strcspn_generic -# define STRCSPN_SSE42 __strcspn_sse42 # endif # ifdef USE_AS_STRPBRK @@ -80,7 +82,7 @@ char * size_t # endif __attribute__ ((section (".text.sse4.2"))) -STRCSPN_SSE42 (const char *s, const char *a) +STRCSPN (const char *s, const char *a) { if (*a == 0) RETURN (NULL, strlen (s)); diff --git a/sysdeps/x86_64/multiarch/strpbrk-generic.c b/sysdeps/x86_64/multiarch/strpbrk-generic.c index d31acfe495..058f635774 100644 --- a/sysdeps/x86_64/multiarch/strpbrk-generic.c +++ b/sysdeps/x86_64/multiarch/strpbrk-generic.c @@ -16,8 +16,11 @@ License along with the GNU C Library; if not, see . */ -#if IS_IN (libc) +/* We always need to build this implementation as strpbrk-sse4 needs + to be able to fallback to it. */ +#include +#if IS_IN (libc) || MINIMUM_X86_ISA_LEVEL >= 2 # include # define STRPBRK __strpbrk_generic diff --git a/sysdeps/x86_64/multiarch/strpbrk-sse4.c b/sysdeps/x86_64/multiarch/strpbrk-sse4.c index bf74d660d5..0adb577955 100644 --- a/sysdeps/x86_64/multiarch/strpbrk-sse4.c +++ b/sysdeps/x86_64/multiarch/strpbrk-sse4.c @@ -16,7 +16,11 @@ License along with the GNU C Library; if not, see . */ +#ifndef STRPBRK +# define STRPBRK __strpbrk_sse42 +#endif + #define USE_AS_STRPBRK #define STRCSPN_GENERIC __strpbrk_generic -#define STRCSPN_SSE42 __strpbrk_sse42 +#define STRCSPN STRPBRK #include "strcspn-sse4.c" diff --git a/sysdeps/x86_64/multiarch/strspn-generic.c b/sysdeps/x86_64/multiarch/strspn-generic.c index 6b50c36432..0f485ab4da 100644 --- a/sysdeps/x86_64/multiarch/strspn-generic.c +++ b/sysdeps/x86_64/multiarch/strspn-generic.c @@ -16,13 +16,16 @@ License along with the GNU C Library; if not, see . */ -#if IS_IN (libc) - +/* We always need to build this implementation as strspn-sse4 needs to + be able to fallback to it. */ +#include +#if IS_IN (libc) || MINIMUM_X86_ISA_LEVEL >= 2 # include # define STRSPN __strspn_generic # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(STRSPN) + #endif #include diff --git a/sysdeps/x86_64/multiarch/strspn-sse4.c b/sysdeps/x86_64/multiarch/strspn-sse4.c index d044916688..4d50507a0d 100644 --- a/sysdeps/x86_64/multiarch/strspn-sse4.c +++ b/sysdeps/x86_64/multiarch/strspn-sse4.c @@ -53,10 +53,13 @@ extern size_t __strspn_generic (const char *, const char *) attribute_hidden; +#ifndef STRSPN +# define STRSPN __strspn_sse42 +#endif size_t __attribute__ ((section (".text.sse4.2"))) -__strspn_sse42 (const char *s, const char *a) +STRSPN (const char *s, const char *a) { if (*a == 0) return 0; diff --git a/sysdeps/x86_64/strcspn-generic.c b/sysdeps/x86_64/strcspn-generic.c new file mode 100644 index 0000000000..51fd70b63d --- /dev/null +++ b/sysdeps/x86_64/strcspn-generic.c @@ -0,0 +1,25 @@ +/* Hook for build strcspn-generic for non-multiarch build. Needed for + the ISA level >= 2 because strcspn-sse4 has a dependency on + strcspn-generic. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL >= 2 +# include "multiarch/strcspn-generic.c" +#endif diff --git a/sysdeps/x86_64/strcspn.c b/sysdeps/x86_64/strcspn.c new file mode 100644 index 0000000000..cd54eed869 --- /dev/null +++ b/sysdeps/x86_64/strcspn.c @@ -0,0 +1,27 @@ +/* strcspn hook for non-multiarch and RTLD build. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL == 1 +#include +#else +#define STRCSPN strcspn +#include "multiarch/strcspn-sse4.c" +libc_hidden_builtin_def (strcspn) +#endif diff --git a/sysdeps/x86_64/strpbrk-generic.c b/sysdeps/x86_64/strpbrk-generic.c new file mode 100644 index 0000000000..a7d8b11216 --- /dev/null +++ b/sysdeps/x86_64/strpbrk-generic.c @@ -0,0 +1,25 @@ +/* Hook for build strpbrk-generic for non-multiarch build. Needed for + the ISA level >= 2 because strpbrk-sse4 has a dependency on + strpbrk-generic. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL >= 2 +# include "multiarch/strpbrk-generic.c" +#endif diff --git a/sysdeps/x86_64/strpbrk.c b/sysdeps/x86_64/strpbrk.c new file mode 100644 index 0000000000..e7ea1b334a --- /dev/null +++ b/sysdeps/x86_64/strpbrk.c @@ -0,0 +1,27 @@ +/* strpbrk hook for non-multiarch and RTLD build. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL == 1 +#include +#else +#define STRPBRK strpbrk +#include "multiarch/strpbrk-sse4.c" +libc_hidden_builtin_def (strpbrk) +#endif diff --git a/sysdeps/x86_64/strspn-generic.c b/sysdeps/x86_64/strspn-generic.c new file mode 100644 index 0000000000..1a2a576e49 --- /dev/null +++ b/sysdeps/x86_64/strspn-generic.c @@ -0,0 +1,26 @@ +/* Hook for build strspn-generic for non-multiarch build. Needed for + the ISA level >= 2 because strspn-sse4 has a dependency on + strspn-generic. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL >= 2 +# include "multiarch/strspn-generic.c" +#endif diff --git a/sysdeps/x86_64/strspn.c b/sysdeps/x86_64/strspn.c new file mode 100644 index 0000000000..7b9ede26d9 --- /dev/null +++ b/sysdeps/x86_64/strspn.c @@ -0,0 +1,27 @@ +/* strspn hook for non-multiarch and RTLD build. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL == 1 +#include +#else +#define STRSPN strspn +#include "multiarch/strspn-sse4.c" +libc_hidden_builtin_def (strspn) +#endif diff --git a/sysdeps/x86_64/varshift.c b/sysdeps/x86_64/varshift.c new file mode 100644 index 0000000000..8f9eb13547 --- /dev/null +++ b/sysdeps/x86_64/varshift.c @@ -0,0 +1,26 @@ +/* Hook for build varshift for non-multiarch build. Needed for the + ISA level >= 2 because strspn-sse4, strcspn-sse4, and strpbrk-sse4 + all have a dependency on varshift.c. + Copyright (C) 2022 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 MINIMUM_X86_ISA_LEVEL >= 2 +# include "multiarch/varshift.c" +#endif