S390: Refactor wcsnlen ifunc handling.

The ifunc handling for wcsnlen is adjusted in order to omit ifunc
if the minimum architecture level already supports newer CPUs by default.
Unfortunately the c ifunc variant can't be omitted at all as it is used
by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
Glibc internal calls will use the "newer" ifunc variant.

ChangeLog:

	* sysdeps/s390/multiarch/Makefile
	(sysdep_routines): Remove wcsnlen variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add wcsnlen variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for wcsnlen.
	* sysdeps/s390/multiarch/wcsnlen-c.c: Move to ...
	* sysdeps/s390/wcsnlen-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcsnlen-vx.S: Move to ...
	* sysdeps/s390/wcsnlen-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcsnlen.c: Move to ...
	* sysdeps/s390/wcsnlen.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-wcsnlen.h: New file.

5 files changed, 14 insertions, 208 deletions

diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 421d40d020..ce2e7ce5f4 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcsnlen wcsnlen-vx wcsnlen-c \
-		   wcscpy wcscpy-vx wcscpy-c \
+sysdep_routines += wcscpy wcscpy-vx wcscpy-c \
 		   wcpcpy wcpcpy-vx wcpcpy-c \
 		   wcsncpy wcsncpy-vx wcsncpy-c \
 		   wcpncpy wcpncpy-vx wcpncpy-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index 7bf5f14c01..c199fd0e0b 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -47,6 +47,7 @@
 #include <ifunc-memccpy.h>
 #include <ifunc-memrchr.h>
 #include <ifunc-wcslen.h>
+#include <ifunc-wcsnlen.h>
 
 /* Maximum number of IFUNC implementations.  */
 #define MAX_IFUNC	3
@@ -437,6 +438,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 		)
 #endif /* HAVE_WCSLEN_IFUNC  */
 
+#if HAVE_WCSNLEN_IFUNC
+    IFUNC_IMPL (i, name, wcsnlen,
+# if HAVE_WCSNLEN_Z13
+		IFUNC_IMPL_ADD (array, i, wcsnlen,
+				dl_hwcap & HWCAP_S390_VX, WCSNLEN_Z13)
+# endif
+# if HAVE_WCSNLEN_C
+		IFUNC_IMPL_ADD (array, i, wcsnlen, 1, WCSNLEN_C)
+# endif
+		)
+#endif /* HAVE_WCSNLEN_IFUNC  */
+
 #ifdef HAVE_S390_VX_ASM_SUPPORT
 
 # define IFUNC_VX_IMPL(FUNC)						\
@@ -445,8 +458,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __##FUNC##_vx)				\
 	      IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
 
-  IFUNC_VX_IMPL (wcsnlen);
-
   IFUNC_VX_IMPL (wcscpy);
 
   IFUNC_VX_IMPL (wcpcpy);
diff --git a/sysdeps/s390/multiarch/wcsnlen-c.c b/sysdeps/s390/multiarch/wcsnlen-c.c
deleted file mode 100644
index 8f43f5104f..0000000000
--- a/sysdeps/s390/multiarch/wcsnlen-c.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Default wcsnlen implementation for S/390.
-   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 WCSNLEN  __wcsnlen_c
-
-# include <wchar.h>
-extern __typeof (__wcsnlen) __wcsnlen_c;
-# include <wcsmbs/wcsnlen.c>
-#endif
diff --git a/sysdeps/s390/multiarch/wcsnlen-vx.S b/sysdeps/s390/multiarch/wcsnlen-vx.S
deleted file mode 100644
index 420f29fbc0..0000000000
--- a/sysdeps/s390/multiarch/wcsnlen-vx.S
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of wcsnlen.
-   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
-
-/* size_t wcsnlen (const wchar_t *s, size_t maxlen)
-   Returns the number of characters in s or at most maxlen.
-
-   Register usage:
-   -r1=tmp
-   -r2=address of string
-   -r3=maxlen (number of characters to be read)
-   -r4=tmp
-   -r5=current_len and return_value
-   -v16=part of s
-*/
-ENTRY(__wcsnlen_vx)
-
-	.machine "z13"
-	.machinemode "zarch_nohighgprs"
-
-# if !defined __s390x__
-	llgfr	%r3,%r3
-# endif /* !defined __s390x__ */
-
-	clgfi	%r3,0		/* if maxlen == 0, return 0.  */
-	locgre	%r2,%r3
-	ber	%r14
-
-	vlbb	%v16,0(%r2),6	/* Load s until next 4k-byte boundary.  */
-	lcbb	%r1,0(%r2),6	/* Get bytes to 4k-byte boundary or 16.  */
-	llgfr	%r1,%r1		/* Convert 32bit to 64bit.  */
-
-	tmll	%r2,3		/* Test if s is 4-byte aligned?  */
-	jne	.Lfallback	/* And use common-code variant if not.  */
-
-	/* Check range of maxlen and convert to byte-count.  */
-# ifdef __s390x__
-	tmhh	%r3,49152	/* Test bit 0 or 1 of maxlen.  */
-	lghi	%r4,-4		/* Max byte-count is 18446744073709551612.  */
-# else
-	tmlh	%r3,49152	/* Test bit 0 or 1 of maxlen.  */
-	llilf	%r4,4294967292	/* Max byte-count is 4294967292.  */
-# endif /* !__s390x__ */
-	sllg	%r3,%r3,2	/* Convert character-count to byte-count.  */
-	locgrne	%r3,%r4		/* Use max byte-count, if bit 0/1 was one.  */
-
-	vfenezf	%v16,%v16,%v16	/* Find element not equal with zero search.  */
-	clgr	%r1,%r3
-	locgrh	%r1,%r3		/* loaded_byte_count
-				   = min (loaded_byte_count, maxlen)  */
-
-	vlgvb	%r5,%v16,7	/* Load zero index or 16 if not found.  */
-	clrjl	%r5,%r1,.Lend	/* Found zero within loaded bytes -> return.  */
-
-	clgr	%r1,%r3		/* If loaded_byte_count == maxlen -> end.  */
-	locgre	%r5,%r3
-	je	.Lend
-
-	/* Align s to 16 byte.  */
-	risbgn	%r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15.  */
-	lghi	%r5,16		/* current_len = 16.  */
-	slr	%r5,%r4		/* Compute bytes to 16bytes boundary.  */
-
-	lgr	%r1,%r5		/* If %r5 + 64 < maxlen? -> loop64.  */
-	aghi	%r1,64
-	clgrjl	%r1,%r3,.Lloop64
-
-	/* Find zero in max 64byte with aligned s.  */
-.Llt64:
-	vl	%v16,0(%r5,%r2)	/* Load s.  */
-	vfenezfs %v16,%v16,%v16	/* Find element not equal with zero search.  */
-	je	.Lfound		/* Jump away if zero was found.  */
-	aghi	%r5,16
-	clgrjhe	%r5,%r3,.Lfound /* If current_len >= maxlen -> end.  */
-	vl	%v16,0(%r5,%r2)
-	vfenezfs %v16,%v16,%v16
-	je	.Lfound
-	aghi	%r5,16
-	clgrjhe	%r5,%r3,.Lfound
-	vl	%v16,0(%r5,%r2)
-	vfenezfs %v16,%v16,%v16
-	je	.Lfound
-	aghi	%r5,16
-	clgrjhe	%r5,%r3,.Lfound
-	vl	%v16,0(%r5,%r2)
-	vfenezfs %v16,%v16,%v16
-	j	.Lfound
-
-.Lfound48:
-	aghi	%r5,16
-.Lfound32:
-	aghi	%r5,16
-.Lfound16:
-	aghi	%r5,16
-.Lfound:
-	vlgvb	%r4,%v16,7	/* Load byte index of zero or 16 if no zero.  */
-	algr	%r5,%r4
-
-	clgr	%r5,%r3
-	locgrh	%r5,%r3		/* Return min (current_len, maxlen).  */
-.Lend:
-	srlg	%r2,%r5,2	/* Convert byte-count to character-count.  */
-	br	%r14
-
-	/* Find zero in 16byte aligned loop.  */
-.Lloop64:
-	vl	%v16,0(%r5,%r2)	/* Load s.  */
-	vfenezfs %v16,%v16,%v16	/* Find element not equal with zero search.  */
-	je	.Lfound		/* Jump away if zero was found.  */
-	vl	%v16,16(%r5,%r2)
-	vfenezfs %v16,%v16,%v16
-	je	.Lfound16
-	vl	%v16,32(%r5,%r2)
-	vfenezfs %v16,%v16,%v16
-	je	.Lfound32
-	vl	%v16,48(%r5,%r2)
-	vfenezfs %v16,%v16,%v16
-	je	.Lfound48
-
-	aghi	%r5,64
-	lgr	%r1,%r5		/* If %r5 + 64 < maxlen? -> loop64.  */
-	aghi	%r1,64
-	clgrjl	%r1,%r3,.Lloop64
-
-	j	.Llt64
-
-.Lfallback:
-	jg	__wcsnlen_c
-END(__wcsnlen_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wcsnlen.c b/sysdeps/s390/multiarch/wcsnlen.c
deleted file mode 100644
index 5234074b1f..0000000000
--- a/sysdeps/s390/multiarch/wcsnlen.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Multiple versions of wcsnlen.
-   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 <wchar.h>
-# include <ifunc-resolve.h>
-
-s390_vx_libc_ifunc (__wcsnlen)
-weak_alias (__wcsnlen, wcsnlen)
-
-#else
-# include <wcsmbs/wcsnlen.c>
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */