From patchwork Wed Mar 23 21:57:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1608831 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=Alf+KPJr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KP2Tf2wrPz9sFh for ; Thu, 24 Mar 2022 09:05:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 468DA3888838 for ; Wed, 23 Mar 2022 22:05:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 468DA3888838 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1648073108; bh=6/adslIi4yqoOq0wJQwkQ8LowgRI8irkOSdQutPZjG4=; 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=Alf+KPJrUQ7mYzWnPkMPZi8NDZzNJiaiTF8J/ouWxaPydW3hkbkT0spU0pwNG/j+q 5GH5nQigHIA9fjqHodbvy5Qt7OpL8pvc0ZaU8qpLnN4VMmV3vJxKbvPHDTW5N8o6Hq 0/Qu/netP9ZTmJhnnA9dNlxSgeMHUuUhJp1m1Tvs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id 08C8F38845A9 for ; Wed, 23 Mar 2022 22:00:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 08C8F38845A9 Received: by mail-io1-xd2a.google.com with SMTP id z7so3422268iom.1 for ; Wed, 23 Mar 2022 15:00: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=6/adslIi4yqoOq0wJQwkQ8LowgRI8irkOSdQutPZjG4=; b=BFvmc0qr/OszzpQIC2Cx5qBbZFXj59QpmOJaTDDexZU/em39g4bo230pFHhqpizWGT IPjvJ9bAmMwh4Nu7lBkW+9JVw7IzCqtI3FY2QW9yTMbAfJHx5Kb3cqBA/tzKgZdj3hBV uV16D8UvZtHWeOekOGbPSavNQXg9dekSpR+pJA8tY4IWG9bGewGjouYdNfwQ/KvgqviU Ma6J5xAIB+8DAmNyj24MvD81A6H18Y07cuWMZq7NszC81cazOQEL1S1xPFfN8rzZnosV w6KA9FDH4OD03MZxoUTujYJIzl4sTYG54Xdckfe5jXtErmTlMm7UE6guQOTRWj33S7lO ildw== X-Gm-Message-State: AOAM533y0nq95YMWlCHUV7C72qioL6fldNRJB7JN9UhewMLpuNvwsuz9 GBrph+ciut/0Z379vTd7U0Ni7NIxxqo= X-Google-Smtp-Source: ABdhPJz1UKRkxbybQq4zfvsr1UT5JxxzZcV424BxW6oHtOeSgJPwBWEmUeuUAgpOnBQKTk+j2/Zlow== X-Received: by 2002:a02:ceb2:0:b0:314:f9b9:d420 with SMTP id z18-20020a02ceb2000000b00314f9b9d420mr1059469jaq.177.1648072845193; Wed, 23 Mar 2022 15:00:45 -0700 (PDT) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id c22-20020a5ea816000000b00649d360663asm529227ioa.40.2022.03.23.15.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 15:00:44 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1 10/23] x86: Remove strpbrk-sse2.S and use the generic implementation Date: Wed, 23 Mar 2022 16:57:27 -0500 Message-Id: <20220323215734.3927131-10-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220323215734.3927131-1-goldstein.w.n@gmail.com> References: <20220323215734.3927131-1-goldstein.w.n@gmail.com> 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, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 generic implementation is faster (see strcspn commit). All string/memory tests pass. Reviewed-by: H.J. Lu --- .../x86_64/multiarch/{strpbrk-sse2.S => strpbrk-sse2.c} | 9 ++++----- sysdeps/x86_64/strpbrk.S | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) rename sysdeps/x86_64/multiarch/{strpbrk-sse2.S => strpbrk-sse2.c} (84%) delete mode 100644 sysdeps/x86_64/strpbrk.S diff --git a/sysdeps/x86_64/multiarch/strpbrk-sse2.S b/sysdeps/x86_64/multiarch/strpbrk-sse2.c similarity index 84% rename from sysdeps/x86_64/multiarch/strpbrk-sse2.S rename to sysdeps/x86_64/multiarch/strpbrk-sse2.c index d537b6c27b..d03214c4fb 100644 --- a/sysdeps/x86_64/multiarch/strpbrk-sse2.S +++ b/sysdeps/x86_64/multiarch/strpbrk-sse2.c @@ -1,4 +1,4 @@ -/* strpbrk optimized with SSE2. +/* strpbrk. Copyright (C) 2017-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -19,11 +19,10 @@ #if IS_IN (libc) # include -# define strcspn __strpbrk_sse2 +# define STRPBRK __strpbrk_sse2 # undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(strpbrk) +# define libc_hidden_builtin_def(STRPBRK) #endif -#define USE_AS_STRPBRK -#include +#include diff --git a/sysdeps/x86_64/strpbrk.S b/sysdeps/x86_64/strpbrk.S deleted file mode 100644 index 21888a5b92..0000000000 --- a/sysdeps/x86_64/strpbrk.S +++ /dev/null @@ -1,3 +0,0 @@ -#define strcspn strpbrk -#define USE_AS_STRPBRK -#include