From patchwork Fri Jun 24 16:42:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1648091 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=eHGg9y/I; 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 4LV3176bQ4z9s0r for ; Sat, 25 Jun 2022 02:46:35 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BB7D3383DBB0 for ; Fri, 24 Jun 2022 16:46:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB7D3383DBB0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1656089193; bh=/pE4FKBqRrHK7mxXFetajZu8vkocWFNz9o81Q2XAJME=; 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=eHGg9y/ItEmUnw0l//mZGOiZ8wGTUOWw2t9y0lO/P3x9YrsGCHdBkJAWanNZdWm6n GAaLr4oFSz6kJsiCXhJ7rLHmSLUtaXz0LCRi4i76g7Vkj1t4TD58m9XO6ebM52PI4k RMbb6mauNUdFzVCRA0x5V8t+v94/H7w324MDWhEU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id CA5DA383D810 for ; Fri, 24 Jun 2022 16:42:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA5DA383D810 Received: by mail-pl1-x62e.google.com with SMTP id d5so2549062plo.12 for ; Fri, 24 Jun 2022 09:42:20 -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=/pE4FKBqRrHK7mxXFetajZu8vkocWFNz9o81Q2XAJME=; b=MeA1i+V8JdmrE93N29HCyNhn0ITijIcU0UP+eVjjgINy7D4uRZaLzYDs8yR4gVczIu Vs2Nj/DMTE10gS9K/4c+V/Q/wmCrKfO7/7GJbm8nnltIuzn7DREt2T2h1SiMDEj1y6VB K+AQrBV4hiLmJY4lGxBZ5m2opaHkBNm9S1jPL2SR/y5XnbFFf6ivjaePkC6HAJdIh5PH bTkFkJytyxqjf9OjrVuEfIg/95CvExzodu2mhGMzABMiTcQE03IE912Y6BTzlVeRQ6lm WDleu1NBFJRPM6nH0Yw1sDV2/vJejN8PgKXdPXx/t8oN+jiJqw5yNFnuaUUtoiUBexyE VEag== X-Gm-Message-State: AJIora8RYAqVNP5v3Y72TYC5eKAlKPgwn7wFoUpncF3QAFpa5npMzFhU y0CrjCP0ugyljxFckoT0cWT/bsnuLYY= X-Google-Smtp-Source: AGRyM1sm4OeYZbmrPRIXZWNmBhJDe5+Mi8vIwn/5VQmr6P09UvJP3o+J3C5chdrdXqwTsiZ7O04hUw== X-Received: by 2002:a17:90a:c402:b0:1e6:8254:3478 with SMTP id i2-20020a17090ac40200b001e682543478mr4885109pjt.101.1656088939693; Fri, 24 Jun 2022 09:42:19 -0700 (PDT) Received: from noah-tgl.. ([192.55.60.37]) by smtp.gmail.com with ESMTPSA id q18-20020a63e952000000b00408b8d98c23sm1840326pgj.78.2022.06.24.09.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jun 2022 09:42:19 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2] x86: Rename strstr_sse2 to strstr_generic as it uses string/strstr.c Date: Fri, 24 Jun 2022 09:42:13 -0700 Message-Id: <20220624164216.2129400-2-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220624164216.2129400-1-goldstein.w.n@gmail.com> References: <20220624164216.2129400-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, 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" This is in accordance with other files in the multiarch directory. --- sysdeps/x86_64/multiarch/ifunc-impl-list.c | 2 +- sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S | 2 +- sysdeps/x86_64/multiarch/strstr.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c index bf52cf96d0..0d28319905 100644 --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c @@ -627,7 +627,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, && CPU_FEATURE_USABLE (BMI2)), __strstr_avx512) IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2_unaligned) - IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2)) + IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_generic)) /* Support sysdeps/x86_64/multiarch/wcschr.c. */ IFUNC_IMPL (i, name, wcschr, diff --git a/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S index 3d12ffdf1e..c6aa8f45a6 100644 --- a/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S +++ b/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S @@ -267,7 +267,7 @@ L(next_pair3): .p2align 4 L(switch_strstr): movq %rdi, %rdi - jmp __strstr_sse2 + jmp __strstr_generic .p2align 4 L(cross_page): diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c index 2fb8b169b6..2b83199245 100644 --- a/sysdeps/x86_64/multiarch/strstr.c +++ b/sysdeps/x86_64/multiarch/strstr.c @@ -24,17 +24,17 @@ #include #undef strstr -#define STRSTR __strstr_sse2 +#define STRSTR __strstr_generic #ifdef SHARED # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2); + __hidden_ver1 (__strstr_generic, __GI_strstr, __strstr_generic); #endif #include "string/strstr.c" extern __typeof (__redirect_strstr) __strstr_sse2_unaligned attribute_hidden; -extern __typeof (__redirect_strstr) __strstr_sse2 attribute_hidden; +extern __typeof (__redirect_strstr) __strstr_generic attribute_hidden; extern __typeof (__redirect_strstr) __strstr_avx512 attribute_hidden; #include "init-arch.h" @@ -58,7 +58,7 @@ IFUNC_SELECTOR (void) if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Load)) return __strstr_sse2_unaligned; - return __strstr_sse2; + return __strstr_generic; } libc_ifunc_redirected (__redirect_strstr, __libc_strstr, IFUNC_SELECTOR ());