diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2019-03-22 11:14:09 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2019-03-22 11:14:09 +0100 |
| commit | 421749d693c4147017bc55f5ac3227c3a6e4bf31 (patch) | |
| tree | 54c7b37b16907efbe5459e720c38b5f9e56fa088 /sysdeps/s390/ifunc-memmem.h | |
| parent | 6f47401bd5fc71209219779a0426170a9a7395b0 (diff) | |
| download | glibc-421749d693c4147017bc55f5ac3227c3a6e4bf31.tar.gz glibc-421749d693c4147017bc55f5ac3227c3a6e4bf31.tar.xz glibc-421749d693c4147017bc55f5ac3227c3a6e4bf31.zip | |
S390: Add arch13 memmem ifunc variant.
This patch introduces the new arch13 ifunc variant for memmem. For needles longer than 9 bytes it is relying on the common-code implementation. For shorter needles it is using the new vstrs instruction which is able to search a substring within a vector register. ChangeLog: * sysdeps/s390/Makefile (sysdep_routines): Add memmem-arch13. * sysdeps/s390/ifunc-memmem.h (HAVE_MEMMEM_ARCH13, MEMMEM_ARCH13, MEMMEM_Z13_ONLY_USED_AS_FALLBACK, HAVE_MEMMEM_IFUNC_AND_ARCH13_SUPPORT): New defines. * sysdeps/s390/memmem-arch13.S: New file. * sysdeps/s390/memmem-vx.c: Omit GI symbol for z13 memmem ifunc variant if it is only used as fallback. * sysdeps/s390/memmem.c (memmem): Add arch13 variant in ifunc selector. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc variant for arch13 memmem.
Diffstat (limited to 'sysdeps/s390/ifunc-memmem.h')
| -rw-r--r-- | sysdeps/s390/ifunc-memmem.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/sysdeps/s390/ifunc-memmem.h b/sysdeps/s390/ifunc-memmem.h index 5494c19e4c..6f2fb2b0ab 100644 --- a/sysdeps/s390/ifunc-memmem.h +++ b/sysdeps/s390/ifunc-memmem.h @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #if defined USE_MULTIARCH && IS_IN (libc) \ - && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT + && ! defined HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT # define HAVE_MEMMEM_IFUNC 1 #else # define HAVE_MEMMEM_IFUNC 0 @@ -29,14 +29,32 @@ # define HAVE_MEMMEM_IFUNC_AND_VX_SUPPORT 0 #endif -#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +#ifdef HAVE_S390_ARCH13_ASM_SUPPORT +# define HAVE_MEMMEM_IFUNC_AND_ARCH13_SUPPORT HAVE_MEMMEM_IFUNC +#else +# define HAVE_MEMMEM_IFUNC_AND_ARCH13_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT +# define MEMMEM_DEFAULT MEMMEM_ARCH13 +# define HAVE_MEMMEM_C 0 +# define HAVE_MEMMEM_Z13 1 +# define MEMMEM_Z13_ONLY_USED_AS_FALLBACK 1 +# define HAVE_MEMMEM_ARCH13 1 +#elif defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT # define MEMMEM_DEFAULT MEMMEM_Z13 # define HAVE_MEMMEM_C 0 # define HAVE_MEMMEM_Z13 1 +# define HAVE_MEMMEM_ARCH13 HAVE_MEMMEM_IFUNC_AND_ARCH13_SUPPORT #else # define MEMMEM_DEFAULT MEMMEM_C # define HAVE_MEMMEM_C 1 # define HAVE_MEMMEM_Z13 HAVE_MEMMEM_IFUNC_AND_VX_SUPPORT +# define HAVE_MEMMEM_ARCH13 HAVE_MEMMEM_IFUNC_AND_ARCH13_SUPPORT +#endif + +#ifndef MEMMEM_Z13_ONLY_USED_AS_FALLBACK +# define MEMMEM_Z13_ONLY_USED_AS_FALLBACK 0 #endif #if HAVE_MEMMEM_C @@ -50,3 +68,9 @@ #else # define MEMMEM_Z13 NULL #endif + +#if HAVE_MEMMEM_ARCH13 +# define MEMMEM_ARCH13 __memmem_arch13 +#else +# define MEMMEM_ARCH13 NULL +#endif |