From 6f47401bd5fc71209219779a0426170a9a7395b0 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 22 Mar 2019 11:14:08 +0100 Subject: 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. --- sysdeps/s390/strstr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sysdeps/s390/strstr.c') diff --git a/sysdeps/s390/strstr.c b/sysdeps/s390/strstr.c index 045c380cd1..599d20d0d0 100644 --- a/sysdeps/s390/strstr.c +++ b/sysdeps/s390/strstr.c @@ -32,8 +32,14 @@ extern __typeof (__redirect_strstr) STRSTR_C attribute_hidden; extern __typeof (__redirect_strstr) STRSTR_Z13 attribute_hidden; # endif +# if HAVE_STRSTR_ARCH13 +extern __typeof (__redirect_strstr) STRSTR_ARCH13 attribute_hidden; +# endif + s390_libc_ifunc_expr (__redirect_strstr, strstr, - (HAVE_STRSTR_Z13 && (hwcap & HWCAP_S390_VX)) + (HAVE_STRSTR_ARCH13 && (hwcap & HWCAP_S390_VXRS_EXT2)) + ? STRSTR_ARCH13 + : (HAVE_STRSTR_Z13 && (hwcap & HWCAP_S390_VX)) ? STRSTR_Z13 : STRSTR_DEFAULT ) -- cgit 1.4.1