diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2019-03-22 11:14:08 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2019-03-22 11:14:08 +0100 |
| commit | 6f47401bd5fc71209219779a0426170a9a7395b0 (patch) | |
| tree | 2051a4e99c19afffe4e58521aca5bded7c913a73 /sysdeps/s390/ifunc-strstr.h | |
| parent | 96fbb9a328232e42814334d6e29a9a9c7995c01d (diff) | |
| download | glibc-6f47401bd5fc71209219779a0426170a9a7395b0.tar.gz glibc-6f47401bd5fc71209219779a0426170a9a7395b0.tar.xz glibc-6f47401bd5fc71209219779a0426170a9a7395b0.zip | |
S390: Add arch13 strstr ifunc variant.
This patch introduces the new arch13 ifunc variant for strstr. For needles longer than 9 charachters 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 strstr-arch13. * sysdeps/s390/ifunc-strstr.h (HAVE_STRSTR_ARCH13, STRSTR_ARCH13, STRSTR_Z13_ONLY_USED_AS_FALLBACK, HAVE_STRSTR_IFUNC_AND_ARCH13_SUPPORT): New defines. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc variant for arch13 strstr. * sysdeps/s390/strstr-arch13.S: New file. * sysdeps/s390/strstr-vx.c: Omit GI symbol for z13 strstr ifunc variant if it is only used as fallback. * sysdeps/s390/strstr.c (strstr): Add arch13 variant in ifunc selector.
Diffstat (limited to 'sysdeps/s390/ifunc-strstr.h')
| -rw-r--r-- | sysdeps/s390/ifunc-strstr.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/sysdeps/s390/ifunc-strstr.h b/sysdeps/s390/ifunc-strstr.h index 2f67606213..2d50d07077 100644 --- a/sysdeps/s390/ifunc-strstr.h +++ b/sysdeps/s390/ifunc-strstr.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_STRSTR_IFUNC 1 #else # define HAVE_STRSTR_IFUNC 0 @@ -29,14 +29,32 @@ # define HAVE_STRSTR_IFUNC_AND_VX_SUPPORT 0 #endif -#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +#ifdef HAVE_S390_ARCH13_ASM_SUPPORT +# define HAVE_STRSTR_IFUNC_AND_ARCH13_SUPPORT HAVE_STRSTR_IFUNC +#else +# define HAVE_STRSTR_IFUNC_AND_ARCH13_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_ARCH13_ZARCH_ASM_SUPPORT +# define STRSTR_DEFAULT STRSTR_ARCH13 +# define HAVE_STRSTR_C 0 +# define HAVE_STRSTR_Z13 1 +# define STRSTR_Z13_ONLY_USED_AS_FALLBACK 1 +# define HAVE_STRSTR_ARCH13 1 +#elif defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT # define STRSTR_DEFAULT STRSTR_Z13 # define HAVE_STRSTR_C 0 # define HAVE_STRSTR_Z13 1 +# define HAVE_STRSTR_ARCH13 HAVE_STRSTR_IFUNC_AND_ARCH13_SUPPORT #else # define STRSTR_DEFAULT STRSTR_C # define HAVE_STRSTR_C 1 # define HAVE_STRSTR_Z13 HAVE_STRSTR_IFUNC_AND_VX_SUPPORT +# define HAVE_STRSTR_ARCH13 HAVE_STRSTR_IFUNC_AND_ARCH13_SUPPORT +#endif + +#ifndef STRSTR_Z13_ONLY_USED_AS_FALLBACK +# define STRSTR_Z13_ONLY_USED_AS_FALLBACK 0 #endif #if HAVE_STRSTR_C @@ -50,3 +68,9 @@ #else # define STRSTR_Z13 NULL #endif + +#if HAVE_STRSTR_ARCH13 +# define STRSTR_ARCH13 __strstr_arch13 +#else +# define STRSTR_ARCH13 NULL +#endif |