S390: Refactor strcmp ifunc handling.

The ifunc handling for strcmp is adjusted in order to omit ifunc
variants if those will never be used as the minimum architecture level
already supports newer CPUs by default.
Glibc internal calls will then also use the "newer" ifunc variant.

Note: The fallback s390-32/s390-64 ifunc variants with clst instruction
are now moved to the unified strcmp-z900.S file which can be used for
31/64bit. The s390-32/s390-64 files multiarch/strcmp.c and strcmp.S
are deleted.

ChangeLog:

	* sysdeps/s390/multiarch/Makefile
	(sysdep_routines): Remove strcmp variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add strcmp variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for strcmp.
	* sysdeps/s390/multiarch/strcmp-vx.S: Move to ...
	* sysdeps/s390/strcmp-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strcmp.c: Move to ...
	* sysdeps/s390/strcmp.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-strcmp.h: New file.
	* sysdeps/s390/s390-64/strcmp.S: Move to ...
	* sysdeps/s390/strcmp-z900.S: ... here and adjust to be usable
	for 31/64bit and ifunc handling.
	* sysdeps/s390/s390-32/multiarch/strcmp.c: Delete file.
	* sysdeps/s390/s390-64/multiarch/strcmp.c: Likewise.
	* sysdeps/s390/s390-32/strcmp.S: Likewise.

4 files changed, 14 insertions, 148 deletions

diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 24be3eac51..97421a4996 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),string)
-sysdep_routines += strcmp strcmp-vx \
-		   strncmp strncmp-vx strncmp-c \
+sysdep_routines += strncmp strncmp-vx strncmp-c \
 		   strchr strchr-vx strchr-c \
 		   strchrnul strchrnul-vx strchrnul-c \
 		   strrchr strrchr-vx strrchr-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index 3abcaf08e0..44637c431b 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -34,6 +34,7 @@
 #include <ifunc-stpncpy.h>
 #include <ifunc-strcat.h>
 #include <ifunc-strncat.h>
+#include <ifunc-strcmp.h>
 
 /* Maximum number of IFUNC implementations.  */
 #define MAX_IFUNC	3
@@ -268,6 +269,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 		)
 #endif /* HAVE_STRNCAT_IFUNC  */
 
+#if HAVE_STRCMP_IFUNC
+    IFUNC_IMPL (i, name, strcmp,
+# if HAVE_STRCMP_Z13
+		IFUNC_IMPL_ADD (array, i, strcmp,
+				dl_hwcap & HWCAP_S390_VX, STRCMP_Z13)
+# endif
+# if HAVE_STRCMP_Z900_G5
+		IFUNC_IMPL_ADD (array, i, strcmp, 1, STRCMP_Z900_G5)
+# endif
+		)
+#endif /* HAVE_STRCMP_IFUNC  */
+
 #ifdef HAVE_S390_VX_ASM_SUPPORT
 
 # define IFUNC_VX_IMPL(FUNC)						\
@@ -292,7 +305,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 
   IFUNC_VX_IMPL (wcsncat);
 
-  IFUNC_VX_IMPL (strcmp);
   IFUNC_VX_IMPL (wcscmp);
 
   IFUNC_VX_IMPL (strncmp);
diff --git a/sysdeps/s390/multiarch/strcmp-vx.S b/sysdeps/s390/multiarch/strcmp-vx.S
deleted file mode 100644
index bcaeb564d4..0000000000
--- a/sysdeps/s390/multiarch/strcmp-vx.S
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of strcmp.
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-
-# include "sysdep.h"
-# include "asm-syntax.h"
-
-	.text
-
-/* int strcmp (const char *s1, const char *s2)
-   Compare two strings
-
-   Register usage:
-   -r1=loaded byte count s1
-   -r2=s1
-   -r3=s2
-   -r4=loaded byte coutn s2, tmp
-   -r5=current_len
-   -v16=part of s1
-   -v17=part of s2
-   -v18=index of unequal
-*/
-ENTRY(__strcmp_vx)
-	.machine "z13"
-	.machinemode "zarch_nohighgprs"
-
-	lghi	%r5,0		/* current_len = 0.  */
-
-.Lloop:
-	vlbb	%v16,0(%r5,%r2),6 /* Load s1 to block boundary.  */
-	vlbb	%v17,0(%r5,%r3),6 /* Load s2 to block boundary.  */
-	lcbb	%r1,0(%r5,%r2),6 /* Get loaded byte count of s1.  */
-	jo	.Llt16_1	/* Jump away if vr is not fully loaded.  */
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2	/* Jump away if vr is not fully loaded.  */
-	/* Both vrs are fully loaded.  */
-	aghi	%r5,16
-	vfenezbs %v18,%v16,%v17	/* Compare not equal with zero search.  */
-	jno	.Lfound
-
-	vlbb	%v16,0(%r5,%r2),6
-	vlbb	%v17,0(%r5,%r3),6
-	lcbb	%r1,0(%r5,%r2),6
-	jo	.Llt16_1
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2
-	aghi	%r5,16
-	vfenezbs %v18,%v16,%v17
-	jno	.Lfound
-
-	vlbb	%v16,0(%r5,%r2),6
-	vlbb	%v17,0(%r5,%r3),6
-	lcbb	%r1,0(%r5,%r2),6
-	jo	.Llt16_1
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2
-	aghi	%r5,16
-	vfenezbs %v18,%v16,%v17
-	jno	.Lfound
-
-	vlbb	%v16,0(%r5,%r2),6
-	vlbb	%v17,0(%r5,%r3),6
-	lcbb	%r1,0(%r5,%r2),6
-	jo	.Llt16_1
-	lcbb	%r4,0(%r5,%r3),6
-	jo	.Llt16_2
-	aghi	%r5,16
-	vfenezbs %v18,%v16,%v17
-	jno	.Lfound
-	j	.Lloop
-
-.Llt16_1:
-	lcbb	%r4,0(%r5,%r3),6 /* Get loaded byte count of s2.  */
-.Llt16_2:
-	clr	%r1,%r4
-	locrh	%r1,%r4		/* Get minimum of bytes loaded in s1/2.  */
-	algfr	%r5,%r1		/* Add smallest loaded bytes to current_len.  */
-	vfenezbs %v18,%v16,%v17	/* Compare not equal with zero search.  */
-	vlgvb	%r4,%v18,7	/* Get not equal index or 16 if all equal.  */
-	clrjl	%r4,%r1,.Lfound /* Jump away if miscompare is within loaded
-				    bytes.  */
-	j	.Lloop
-
-.Lfound:
-	je	.Lend_equal
-	lghi	%r2,1
-	lghi	%r1,-1
-	locgrl	%r2,%r1
-	br	%r14
-.Lend_equal:
-	lghi	%r2,0
-	br	%r14
-END(__strcmp_vx)
-
-# define strcmp __strcmp_c
-# undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(name) strong_alias(__strcmp_c, __GI_strcmp)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
-
-#include <strcmp.S>
diff --git a/sysdeps/s390/multiarch/strcmp.c b/sysdeps/s390/multiarch/strcmp.c
deleted file mode 100644
index 7c8b17b304..0000000000
--- a/sysdeps/s390/multiarch/strcmp.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Multiple versions of strcmp.
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define strcmp __redirect_strcmp
-/* Omit the strcmp inline definitions because it would redefine strcmp.  */
-# define __NO_STRING_INLINES
-# include <string.h>
-# include <ifunc-resolve.h>
-# undef strcmp
-
-s390_vx_libc_ifunc2_redirected (__redirect_strcmp, __strcmp, strcmp)
-
-#endif