|
 |
6ca6e8 |
commit 94b9c1b6409e34f3f0b2339f77d7ee78087422eb
|
|
|
6ca6e8 |
Author: Aurelien Jarno <aurelien@aurel32.net>
|
|
|
6ca6e8 |
Date: Mon Oct 3 23:16:46 2022 +0200
|
|
|
6ca6e8 |
|
|
|
6ca6e8 |
x86-64: Require BMI2 for AVX2 (raw|w)memchr implementations
|
|
|
6ca6e8 |
|
|
|
6ca6e8 |
The AVX2 memchr, rawmemchr and wmemchr implementations use the 'bzhi'
|
|
|
6ca6e8 |
and 'sarx' instructions, which belongs to the BMI2 CPU feature.
|
|
|
6ca6e8 |
|
|
|
6ca6e8 |
Fixes: acfd088a1963 ("x86: Optimize memchr-avx2.S")
|
|
|
6ca6e8 |
Partially resolves: BZ #29611
|
|
|
6ca6e8 |
|
|
|
6ca6e8 |
Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>
|
|
|
6ca6e8 |
(cherry picked from commit e3e7fab7fe5186d18ca2046d99ba321c27db30ad)
|
|
|
6ca6e8 |
|
|
|
6ca6e8 |
diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c
|
|
|
6ca6e8 |
index e76a991dc671c1a9..81640cf00664e3ed 100644
|
|
|
6ca6e8 |
--- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c
|
|
|
6ca6e8 |
+++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c
|
|
|
6ca6e8 |
@@ -41,10 +41,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
6ca6e8 |
/* Support sysdeps/x86_64/multiarch/memchr.c. */
|
|
|
6ca6e8 |
IFUNC_IMPL (i, name, memchr,
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, memchr,
|
|
|
6ca6e8 |
- CPU_FEATURE_USABLE (AVX2),
|
|
|
6ca6e8 |
+ (CPU_FEATURE_USABLE (AVX2)
|
|
|
6ca6e8 |
+ && CPU_FEATURE_USABLE (BMI2)),
|
|
|
6ca6e8 |
__memchr_avx2)
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, memchr,
|
|
|
6ca6e8 |
(CPU_FEATURE_USABLE (AVX2)
|
|
|
6ca6e8 |
+ && CPU_FEATURE_USABLE (BMI2)
|
|
|
6ca6e8 |
&& CPU_FEATURE_USABLE (RTM)),
|
|
|
6ca6e8 |
__memchr_avx2_rtm)
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, memchr,
|
|
|
6ca6e8 |
@@ -283,10 +285,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
6ca6e8 |
/* Support sysdeps/x86_64/multiarch/rawmemchr.c. */
|
|
|
6ca6e8 |
IFUNC_IMPL (i, name, rawmemchr,
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, rawmemchr,
|
|
|
6ca6e8 |
- CPU_FEATURE_USABLE (AVX2),
|
|
|
6ca6e8 |
+ (CPU_FEATURE_USABLE (AVX2)
|
|
|
6ca6e8 |
+ && CPU_FEATURE_USABLE (BMI2)),
|
|
|
6ca6e8 |
__rawmemchr_avx2)
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, rawmemchr,
|
|
|
6ca6e8 |
(CPU_FEATURE_USABLE (AVX2)
|
|
|
6ca6e8 |
+ && CPU_FEATURE_USABLE (BMI2)
|
|
|
6ca6e8 |
&& CPU_FEATURE_USABLE (RTM)),
|
|
|
6ca6e8 |
__rawmemchr_avx2_rtm)
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, rawmemchr,
|
|
|
6ca6e8 |
@@ -787,10 +791,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
6ca6e8 |
/* Support sysdeps/x86_64/multiarch/wmemchr.c. */
|
|
|
6ca6e8 |
IFUNC_IMPL (i, name, wmemchr,
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, wmemchr,
|
|
|
6ca6e8 |
- CPU_FEATURE_USABLE (AVX2),
|
|
|
6ca6e8 |
+ (CPU_FEATURE_USABLE (AVX2)
|
|
|
6ca6e8 |
+ && CPU_FEATURE_USABLE (BMI2)),
|
|
|
6ca6e8 |
__wmemchr_avx2)
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, wmemchr,
|
|
|
6ca6e8 |
(CPU_FEATURE_USABLE (AVX2)
|
|
|
6ca6e8 |
+ && CPU_FEATURE_USABLE (BMI2)
|
|
|
6ca6e8 |
&& CPU_FEATURE_USABLE (RTM)),
|
|
|
6ca6e8 |
__wmemchr_avx2_rtm)
|
|
|
6ca6e8 |
IFUNC_IMPL_ADD (array, i, wmemchr,
|