From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 505BD383943F for ; Fri, 24 Jun 2022 17:07:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 505BD383943F Received: by mail-pg1-x531.google.com with SMTP id g186so2988391pgc.1 for ; Fri, 24 Jun 2022 10:07:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qPeOEerXuYadnYDcgd8tMB8D4MvUL8sFgQvS2ix+yOc=; b=YOetM54qcR9sktE8HkKd+RalX8nkrDNgHLv92MVfbK2tf/T/SdSAaX/K209cXg/01u /RdvxsJA/O+lstkIad3v4S32lB+jfwuFmWukdvRQ3/Z0J25hRKp/dewXOUS5YcK7LFvM H5FqDW1N8UKcGsTghbdwWdRboI0fftR8n1t2Yg/gPBNr39M3z4+gUwiNL47qB80HEdmp brK16++A6N6CFU/zl1YLrhg8x+KwPprMH7Lqsyj2xIRyLMC1gV2BkByvCiSlItykO71S seOV39IhhXzl/o4LQM7FBshUK93p2+S++SHtmzz0M/uX7KVQxAU04VgoA7S+uVVCCQw7 ZhbQ== X-Gm-Message-State: AJIora/0Vr94XmnZVTZQS1FGTKIVBJJvW/OeSULW6PCzTYIxzApYZcPw kYnL8IzCULWorhzQyZZ9sFM3OOXG3K4ZXOUxE/w= X-Google-Smtp-Source: AGRyM1uIXua7VZMiSzZ0q5ZVl0JOZNTLx43cUn+keHW1DnFYMZL3Vg2EAgwwxaxOQrhN22PnpsR5wpyp+6qdKB8nnWA= X-Received: by 2002:aa7:80ce:0:b0:51c:70fc:8f5d with SMTP id a14-20020aa780ce000000b0051c70fc8f5dmr148039pfn.1.1656090450236; Fri, 24 Jun 2022 10:07:30 -0700 (PDT) MIME-Version: 1.0 References: <20220624164216.2129400-1-goldstein.w.n@gmail.com> <20220624164216.2129400-2-goldstein.w.n@gmail.com> In-Reply-To: <20220624164216.2129400-2-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Fri, 24 Jun 2022 10:06:54 -0700 Message-ID: Subject: Re: [PATCH v2] x86: Rename strstr_sse2 to strstr_generic as it uses string/strstr.c To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3024.6 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-List-Received-Date: Fri, 24 Jun 2022 17:07:32 -0000 On Fri, Jun 24, 2022 at 9:42 AM Noah Goldstein wrote: > > 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 ()); > -- > 2.34.1 > LGTM. Thanks. -- H.J.