qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc64le: Fix ifunc selection for memset, memmove, bzero and bcopy 

The hwcap2 check for the aforementioned functions should check for
both PPC_FEATURE2_ARCH_3_1 and PPC_FEATURE2_HAS_ISEL but was
mistakenly checking for any one of them, enabling isa 3.1 version of
the functions in incompatible processors, like POWER8.

Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
This commit is contained in:
Raoni Fassina Firmino 2021-05-03 16:59:35 -03:00 committed by Tulio Magno Quites Machado Filho
parent 310be3cc09
commit 17a73a6d8b
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysdeps/powerpc/powerpc64/multiarch/bcopy.c
View File

@ -28,10 +28,10 @@ extern __typeof (bcopy) __bcopy_power10 attribute_hidden;
libc_ifunc (bcopy, libc_ifunc (bcopy,
#ifdef __LITTLE_ENDIAN__ #ifdef __LITTLE_ENDIAN__
hwcap2 & (PPC_FEATURE2_ARCH_3_1 | (hwcap2 & PPC_FEATURE2_ARCH_3_1
PPC_FEATURE2_HAS_ISEL) && hwcap2 & PPC_FEATURE2_HAS_ISEL
&& (hwcap & PPC_FEATURE_HAS_VSX) && hwcap & PPC_FEATURE_HAS_VSX)
? __bcopy_power10 : ? __bcopy_power10 :
#endif #endif
(hwcap & PPC_FEATURE_HAS_VSX) (hwcap & PPC_FEATURE_HAS_VSX)
? __bcopy_power7 ? __bcopy_power7

3
sysdeps/powerpc/powerpc64/multiarch/bzero.c
View File

@ -33,7 +33,8 @@ extern __typeof (bzero) __bzero_power10 attribute_hidden;
libc_ifunc (__bzero, libc_ifunc (__bzero,
# ifdef __LITTLE_ENDIAN__ # ifdef __LITTLE_ENDIAN__
(hwcap2 & (PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_HAS_ISEL) (hwcap2 & PPC_FEATURE2_ARCH_3_1
&& hwcap2 & PPC_FEATURE2_HAS_ISEL
&& hwcap & PPC_FEATURE_HAS_VSX) && hwcap & PPC_FEATURE_HAS_VSX)
? __bzero_power10 : ? __bzero_power10 :
# endif # endif

20
sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
View File

@ -75,9 +75,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL (i, name, memmove, IFUNC_IMPL (i, name, memmove,
#ifdef __LITTLE_ENDIAN__ #ifdef __LITTLE_ENDIAN__
IFUNC_IMPL_ADD (array, i, memmove, IFUNC_IMPL_ADD (array, i, memmove,
hwcap2 & (PPC_FEATURE2_ARCH_3_1 | hwcap2 & PPC_FEATURE2_ARCH_3_1
PPC_FEATURE2_HAS_ISEL) && hwcap2 & PPC_FEATURE2_HAS_ISEL
&& (hwcap & PPC_FEATURE_HAS_VSX), && hwcap & PPC_FEATURE_HAS_VSX,
__memmove_power10) __memmove_power10)
#endif #endif
IFUNC_IMPL_ADD (array, i, memmove, hwcap & PPC_FEATURE_HAS_VSX, IFUNC_IMPL_ADD (array, i, memmove, hwcap & PPC_FEATURE_HAS_VSX,
@ -88,8 +88,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL (i, name, memset, IFUNC_IMPL (i, name, memset,
#ifdef __LITTLE_ENDIAN__ #ifdef __LITTLE_ENDIAN__
IFUNC_IMPL_ADD (array, i, memset, IFUNC_IMPL_ADD (array, i, memset,
hwcap2 & (PPC_FEATURE2_ARCH_3_1 | hwcap2 & PPC_FEATURE2_ARCH_3_1
PPC_FEATURE2_HAS_ISEL) && hwcap2 & PPC_FEATURE2_HAS_ISEL
&& hwcap & PPC_FEATURE_HAS_VSX, && hwcap & PPC_FEATURE_HAS_VSX,
__memset_power10) __memset_power10)
#endif #endif
@ -196,8 +196,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL (i, name, bzero, IFUNC_IMPL (i, name, bzero,
#ifdef __LITTLE_ENDIAN__ #ifdef __LITTLE_ENDIAN__
IFUNC_IMPL_ADD (array, i, bzero, IFUNC_IMPL_ADD (array, i, bzero,
hwcap2 & (PPC_FEATURE2_ARCH_3_1 | hwcap2 & PPC_FEATURE2_ARCH_3_1
PPC_FEATURE2_HAS_ISEL) && hwcap2 & PPC_FEATURE2_HAS_ISEL
&& hwcap & PPC_FEATURE_HAS_VSX, && hwcap & PPC_FEATURE_HAS_VSX,
__bzero_power10) __bzero_power10)
#endif #endif
@ -215,9 +215,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL (i, name, bcopy, IFUNC_IMPL (i, name, bcopy,
#ifdef __LITTLE_ENDIAN__ #ifdef __LITTLE_ENDIAN__
IFUNC_IMPL_ADD (array, i, bcopy, IFUNC_IMPL_ADD (array, i, bcopy,
hwcap2 & (PPC_FEATURE2_ARCH_3_1 | hwcap2 & PPC_FEATURE2_ARCH_3_1
PPC_FEATURE2_HAS_ISEL) && hwcap2 & PPC_FEATURE2_HAS_ISEL
&& (hwcap & PPC_FEATURE_HAS_VSX), && hwcap & PPC_FEATURE_HAS_VSX,
__bcopy_power10) __bcopy_power10)
#endif #endif
IFUNC_IMPL_ADD (array, i, bcopy, hwcap & PPC_FEATURE_HAS_VSX, IFUNC_IMPL_ADD (array, i, bcopy, hwcap & PPC_FEATURE_HAS_VSX,

8
sysdeps/powerpc/powerpc64/multiarch/memmove.c
View File

@ -36,10 +36,10 @@ extern __typeof (__redirect_memmove) __memmove_power10 attribute_hidden;
libc_ifunc (__libc_memmove, libc_ifunc (__libc_memmove,
#ifdef __LITTLE_ENDIAN__ #ifdef __LITTLE_ENDIAN__
hwcap2 & (PPC_FEATURE2_ARCH_3_1 | (hwcap2 & PPC_FEATURE2_ARCH_3_1
PPC_FEATURE2_HAS_ISEL) && hwcap2 & PPC_FEATURE2_HAS_ISEL
&& (hwcap & PPC_FEATURE_HAS_VSX) && hwcap & PPC_FEATURE_HAS_VSX)
? __memmove_power10 : ? __memmove_power10 :
#endif #endif
(hwcap & PPC_FEATURE_HAS_VSX) (hwcap & PPC_FEATURE_HAS_VSX)
? __memmove_power7 ? __memmove_power7

3
sysdeps/powerpc/powerpc64/multiarch/memset.c
View File

@ -41,7 +41,8 @@ extern __typeof (__redirect_memset) __memset_power10 attribute_hidden;
ifunc symbol properly. */ ifunc symbol properly. */
libc_ifunc (__libc_memset, libc_ifunc (__libc_memset,
# ifdef __LITTLE_ENDIAN__ # ifdef __LITTLE_ENDIAN__
(hwcap2 & (PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_HAS_ISEL) (hwcap2 & PPC_FEATURE2_ARCH_3_1
&& hwcap2 & PPC_FEATURE2_HAS_ISEL
&& hwcap & PPC_FEATURE_HAS_VSX) && hwcap & PPC_FEATURE_HAS_VSX)
? __memset_power10 : ? __memset_power10 :
# endif # endif