From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7852) id 0EE203858C33; Thu, 29 Sep 2022 02:34:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0EE203858C33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664418894; bh=Imp+8bnMGLCO/dDeP9ITaLCP7co1VfL9WZ/KeVPDZRI=; h=From:To:Subject:Date:From; b=D0yIeca4BVXaiynPxRQIVU91gmuB0K5O1V3/eb1qzyPjOsgydXDpHTGcw15xhiB5z DB4/GPMyZOtVs08DQp5H3728mIQfpDyTZcN+8XJ60Lp+hYjxdlitRuck5ijW9gbY3n nkBFpHhu2HhYvtXGCdjWA+YFw5zkmtenzx1VBJwo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sunil Pandey To: glibc-cvs@sourceware.org Subject: [glibc/release/2.30/master] x86-64: Require BMI2 for avx2 functions [BZ #29611] X-Act-Checkin: glibc X-Git-Author: Sunil K Pandey X-Git-Refname: refs/heads/release/2.30/master X-Git-Oldrev: 286c89f8c7af058e5b788f634321eee99d9b1f04 X-Git-Newrev: 59216172e3b477cbb8c52d0b2caf205b17d893ce Message-Id: <20220929023454.0EE203858C33@sourceware.org> Date: Thu, 29 Sep 2022 02:34:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=59216172e3b477cbb8c52d0b2caf205b17d893ce commit 59216172e3b477cbb8c52d0b2caf205b17d893ce Author: Sunil K Pandey Date: Wed Sep 28 15:53:49 2022 -0700 x86-64: Require BMI2 for avx2 functions [BZ #29611] This patch fixes BZ #29611 Diff: --- sysdeps/x86_64/multiarch/ifunc-impl-list.c | 38 ++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c index 33d54db1e0..f9934776b0 100644 --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c @@ -41,10 +41,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/memchr.c. */ IFUNC_IMPL (i, name, memchr, IFUNC_IMPL_ADD (array, i, memchr, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __memchr_avx2) IFUNC_IMPL_ADD (array, i, memchr, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __memchr_avx2_rtm) IFUNC_IMPL_ADD (array, i, memchr, @@ -166,15 +168,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/memrchr.c. */ IFUNC_IMPL (i, name, memrchr, IFUNC_IMPL_ADD (array, i, memrchr, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __memrchr_avx2) IFUNC_IMPL_ADD (array, i, memrchr, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __memrchr_avx2_rtm) IFUNC_IMPL_ADD (array, i, memrchr, (HAS_ARCH_FEATURE (AVX512VL_Usable) - && HAS_ARCH_FEATURE (AVX512BW_Usable)), + && HAS_ARCH_FEATURE (AVX512BW_Usable) + && HAS_CPU_FEATURE (BMI2)), __memrchr_evex) IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_sse2)) @@ -269,10 +274,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/rawmemchr.c. */ IFUNC_IMPL (i, name, rawmemchr, IFUNC_IMPL_ADD (array, i, rawmemchr, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __rawmemchr_avx2) IFUNC_IMPL_ADD (array, i, rawmemchr, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __rawmemchr_avx2_rtm) IFUNC_IMPL_ADD (array, i, rawmemchr, @@ -437,15 +444,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/strrchr.c. */ IFUNC_IMPL (i, name, strrchr, IFUNC_IMPL_ADD (array, i, strrchr, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __strrchr_avx2) IFUNC_IMPL_ADD (array, i, strrchr, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __strrchr_avx2_rtm) IFUNC_IMPL_ADD (array, i, strrchr, (HAS_ARCH_FEATURE (AVX512VL_Usable) - && HAS_ARCH_FEATURE (AVX512BW_Usable)), + && HAS_ARCH_FEATURE (AVX512BW_Usable) + && HAS_CPU_FEATURE (BMI2)), __strrchr_evex) IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_sse2)) @@ -596,10 +606,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/wcsrchr.c. */ IFUNC_IMPL (i, name, wcsrchr, IFUNC_IMPL_ADD (array, i, wcsrchr, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __wcsrchr_avx2) IFUNC_IMPL_ADD (array, i, wcsrchr, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __wcsrchr_avx2_rtm) IFUNC_IMPL_ADD (array, i, wcsrchr, @@ -612,10 +624,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/wcscmp.c. */ IFUNC_IMPL (i, name, wcscmp, IFUNC_IMPL_ADD (array, i, wcscmp, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __wcscmp_avx2) IFUNC_IMPL_ADD (array, i, wcscmp, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __wcscmp_avx2_rtm) IFUNC_IMPL_ADD (array, i, wcscmp, @@ -628,10 +642,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/wcsncmp.c. */ IFUNC_IMPL (i, name, wcsncmp, IFUNC_IMPL_ADD (array, i, wcsncmp, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __wcsncmp_avx2) IFUNC_IMPL_ADD (array, i, wcsncmp, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __wcsncmp_avx2_rtm) IFUNC_IMPL_ADD (array, i, wcsncmp, @@ -692,10 +708,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, /* Support sysdeps/x86_64/multiarch/wmemchr.c. */ IFUNC_IMPL (i, name, wmemchr, IFUNC_IMPL_ADD (array, i, wmemchr, - HAS_ARCH_FEATURE (AVX2_Usable), + (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2)), __wmemchr_avx2) IFUNC_IMPL_ADD (array, i, wmemchr, (HAS_ARCH_FEATURE (AVX2_Usable) + && HAS_CPU_FEATURE (BMI2) && HAS_CPU_FEATURE (RTM)), __wmemchr_avx2_rtm) IFUNC_IMPL_ADD (array, i, wmemchr,