bdc76f
commit d2a7436c1c6144bbba2eb2a7b25db9b90515f0e6
bdc76f
Author: Stefan Liebler <stli@linux.ibm.com>
bdc76f
Date:   Tue Dec 18 13:57:24 2018 +0100
bdc76f
bdc76f
    S390: Refactor wmemset ifunc handling.
bdc76f
    
bdc76f
    The ifunc handling for wmemset is adjusted in order to omit ifunc
bdc76f
    if the minimum architecture level already supports newer CPUs by default.
bdc76f
    Unfortunately the c ifunc variant can't be omitted at all as it is used
bdc76f
    by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
bdc76f
    Glibc internal calls will use the "newer" ifunc variant.
bdc76f
    
bdc76f
    ChangeLog:
bdc76f
    
bdc76f
            * sysdeps/s390/multiarch/Makefile
bdc76f
            (sysdep_routines): Remove wmemset variants.
bdc76f
            * sysdeps/s390/Makefile (sysdep_routines): Add wmemset variants.
bdc76f
            * sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
            (__libc_ifunc_impl_list): Refactor ifunc handling for wmemset.
bdc76f
            * sysdeps/s390/multiarch/wmemset-c.c: Move to ...
bdc76f
            * sysdeps/s390/wmemset-c.c: ... here and adjust ifunc handling.
bdc76f
            * sysdeps/s390/multiarch/wmemset-vx.S: Move to ...
bdc76f
            * sysdeps/s390/wmemset-vx.S: ... here and adjust ifunc handling.
bdc76f
            * sysdeps/s390/multiarch/wmemset.c: Move to ...
bdc76f
            * sysdeps/s390/wmemset.c: ... here and adjust ifunc handling.
bdc76f
            * sysdeps/s390/ifunc-wmemset.h: New file.
bdc76f
bdc76f
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
bdc76f
index fdfd1c605c28ddc7..f9a71276331b396a 100644
bdc76f
--- a/sysdeps/s390/Makefile
bdc76f
+++ b/sysdeps/s390/Makefile
bdc76f
@@ -76,5 +76,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
bdc76f
 		   wcsspn wcsspn-vx wcsspn-c \
bdc76f
 		   wcspbrk wcspbrk-vx wcspbrk-c \
bdc76f
 		   wcscspn wcscspn-vx wcscspn-c \
bdc76f
-		   wmemchr wmemchr-vx wmemchr-c
bdc76f
+		   wmemchr wmemchr-vx wmemchr-c \
bdc76f
+		   wmemset wmemset-vx wmemset-c
bdc76f
 endif
bdc76f
diff --git a/sysdeps/s390/ifunc-wmemset.h b/sysdeps/s390/ifunc-wmemset.h
bdc76f
new file mode 100644
bdc76f
index 0000000000000000..c9d1d17c3bfc7e9e
bdc76f
--- /dev/null
bdc76f
+++ b/sysdeps/s390/ifunc-wmemset.h
bdc76f
@@ -0,0 +1,53 @@
bdc76f
+/* wmemset variant information on S/390 version.
bdc76f
+   Copyright (C) 2018 Free Software Foundation, Inc.
bdc76f
+   This file is part of the GNU C Library.
bdc76f
+
bdc76f
+   The GNU C Library is free software; you can redistribute it and/or
bdc76f
+   modify it under the terms of the GNU Lesser General Public
bdc76f
+   License as published by the Free Software Foundation; either
bdc76f
+   version 2.1 of the License, or (at your option) any later version.
bdc76f
+
bdc76f
+   The GNU C Library is distributed in the hope that it will be useful,
bdc76f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
bdc76f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
bdc76f
+   Lesser General Public License for more details.
bdc76f
+
bdc76f
+   You should have received a copy of the GNU Lesser General Public
bdc76f
+   License along with the GNU C Library; if not, see
bdc76f
+   <http://www.gnu.org/licenses/>.  */
bdc76f
+
bdc76f
+#if defined USE_MULTIARCH && IS_IN (libc)		\
bdc76f
+  && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
bdc76f
+# define HAVE_WMEMSET_IFUNC	1
bdc76f
+#else
bdc76f
+# define HAVE_WMEMSET_IFUNC	0
bdc76f
+#endif
bdc76f
+
bdc76f
+#ifdef HAVE_S390_VX_ASM_SUPPORT
bdc76f
+# define HAVE_WMEMSET_IFUNC_AND_VX_SUPPORT HAVE_WMEMSET_IFUNC
bdc76f
+#else
bdc76f
+# define HAVE_WMEMSET_IFUNC_AND_VX_SUPPORT 0
bdc76f
+#endif
bdc76f
+
bdc76f
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
bdc76f
+# define WMEMSET_DEFAULT	WMEMSET_Z13
bdc76f
+/* The z13 ifunc variant is using the common code variant as fallback!  */
bdc76f
+# define HAVE_WMEMSET_C		1
bdc76f
+# define HAVE_WMEMSET_Z13	1
bdc76f
+#else
bdc76f
+# define WMEMSET_DEFAULT	WMEMSET_C
bdc76f
+# define HAVE_WMEMSET_C		1
bdc76f
+# define HAVE_WMEMSET_Z13	HAVE_WMEMSET_IFUNC_AND_VX_SUPPORT
bdc76f
+#endif
bdc76f
+
bdc76f
+#if HAVE_WMEMSET_C
bdc76f
+# define WMEMSET_C		__wmemset_c
bdc76f
+#else
bdc76f
+# define WMEMSET_C		NULL
bdc76f
+#endif
bdc76f
+
bdc76f
+#if HAVE_WMEMSET_Z13
bdc76f
+# define WMEMSET_Z13		__wmemset_vx
bdc76f
+#else
bdc76f
+# define WMEMSET_Z13		NULL
bdc76f
+#endif
bdc76f
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
bdc76f
index 92e28dc45ddbae37..cc6dd7adb10ee8ad 100644
bdc76f
--- a/sysdeps/s390/multiarch/Makefile
bdc76f
+++ b/sysdeps/s390/multiarch/Makefile
bdc76f
@@ -1,6 +1,5 @@
bdc76f
 ifeq ($(subdir),wcsmbs)
bdc76f
-sysdep_routines += wmemset wmemset-vx wmemset-c \
bdc76f
-		   wmemcmp wmemcmp-vx wmemcmp-c
bdc76f
+sysdep_routines += wmemcmp wmemcmp-vx wmemcmp-c
bdc76f
 endif
bdc76f
 
bdc76f
 ifeq ($(subdir),iconvdata)
bdc76f
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
index b5f55deb7faae9c4..7040959269c1612b 100644
bdc76f
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
@@ -63,6 +63,7 @@
bdc76f
 #include <ifunc-wcspbrk.h>
bdc76f
 #include <ifunc-wcscspn.h>
bdc76f
 #include <ifunc-wmemchr.h>
bdc76f
+#include <ifunc-wmemset.h>
bdc76f
 
bdc76f
 /* Maximum number of IFUNC implementations.  */
bdc76f
 #define MAX_IFUNC	3
bdc76f
@@ -645,6 +646,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
bdc76f
 		)
bdc76f
 #endif /* HAVE_WMEMCHR_IFUNC  */
bdc76f
 
bdc76f
+#if HAVE_WMEMSET_IFUNC
bdc76f
+    IFUNC_IMPL (i, name, wmemset,
bdc76f
+# if HAVE_WMEMSET_Z13
bdc76f
+		IFUNC_IMPL_ADD (array, i, wmemset,
bdc76f
+				dl_hwcap & HWCAP_S390_VX, WMEMSET_Z13)
bdc76f
+# endif
bdc76f
+# if HAVE_WMEMSET_C
bdc76f
+		IFUNC_IMPL_ADD (array, i, wmemset, 1, WMEMSET_C)
bdc76f
+# endif
bdc76f
+		)
bdc76f
+#endif /* HAVE_WMEMSET_IFUNC  */
bdc76f
+
bdc76f
 #ifdef HAVE_S390_VX_ASM_SUPPORT
bdc76f
 
bdc76f
 # define IFUNC_VX_IMPL(FUNC)						\
bdc76f
@@ -653,8 +666,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
bdc76f
 			      __##FUNC##_vx)				\
bdc76f
 	      IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
bdc76f
 
bdc76f
-  IFUNC_VX_IMPL (wmemset);
bdc76f
-
bdc76f
   IFUNC_VX_IMPL (wmemcmp);
bdc76f
 
bdc76f
 #endif /* HAVE_S390_VX_ASM_SUPPORT */
bdc76f
diff --git a/sysdeps/s390/multiarch/wmemset-c.c b/sysdeps/s390/wmemset-c.c
bdc76f
similarity index 59%
bdc76f
rename from sysdeps/s390/multiarch/wmemset-c.c
bdc76f
rename to sysdeps/s390/wmemset-c.c
bdc76f
index 1969cf93dcf08892..01e625496d8c2e4e 100644
bdc76f
--- a/sysdeps/s390/multiarch/wmemset-c.c
bdc76f
+++ b/sysdeps/s390/wmemset-c.c
bdc76f
@@ -16,22 +16,29 @@
bdc76f
    License along with the GNU C Library; if not, see
bdc76f
    <http://www.gnu.org/licenses/>.  */
bdc76f
 
bdc76f
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
bdc76f
-# define WMEMSET  __wmemset_c
bdc76f
-
bdc76f
-# include <wchar.h>
bdc76f
-extern __typeof (__wmemset) __wmemset_c;
bdc76f
-# undef weak_alias
bdc76f
-# define weak_alias(name, alias)
bdc76f
-# ifdef SHARED
bdc76f
-#  undef libc_hidden_def
bdc76f
-#  define libc_hidden_def(name)					\
bdc76f
-  __hidden_ver1 (__wmemset_c, __GI___wmemset, __wmemset_c);
bdc76f
-#  undef libc_hidden_weak
bdc76f
-#  define libc_hidden_weak(name)					\
bdc76f
+#include <ifunc-wmemset.h>
bdc76f
+
bdc76f
+#if HAVE_WMEMSET_C
bdc76f
+# if HAVE_WMEMSET_IFUNC || HAVE_WMEMSET_Z13
bdc76f
+#  define WMEMSET WMEMSET_C
bdc76f
+
bdc76f
+#  undef weak_alias
bdc76f
+#  define weak_alias(name, alias)
bdc76f
+
bdc76f
+#  if defined SHARED && IS_IN (libc)
bdc76f
+#   undef libc_hidden_weak
bdc76f
+#   define libc_hidden_weak(name)
bdc76f
+#   undef libc_hidden_def
bdc76f
+#   if ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
bdc76f
+#    define libc_hidden_def(name)					\
bdc76f
+  __hidden_ver1 (__wmemset_c, __GI_wmemset, __wmemset_c)  __attribute__((weak)); \
bdc76f
   strong_alias (__wmemset_c, __wmemset_c_1);				\
bdc76f
-  __hidden_ver1 (__wmemset_c_1, __GI_wmemset, __wmemset_c_1);
bdc76f
-# endif /* SHARED */
bdc76f
+  __hidden_ver1 (__wmemset_c_1, __GI___wmemset, __wmemset_c_1);
bdc76f
+#   else
bdc76f
+#    define libc_hidden_def(name)
bdc76f
+#   endif
bdc76f
+#  endif
bdc76f
+# endif
bdc76f
 
bdc76f
 # include <wcsmbs/wmemset.c>
bdc76f
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
bdc76f
+#endif
bdc76f
diff --git a/sysdeps/s390/multiarch/wmemset-vx.S b/sysdeps/s390/wmemset-vx.S
bdc76f
similarity index 91%
bdc76f
rename from sysdeps/s390/multiarch/wmemset-vx.S
bdc76f
rename to sysdeps/s390/wmemset-vx.S
bdc76f
index 0c2f6337b0e554ec..4b6050b5accd732b 100644
bdc76f
--- a/sysdeps/s390/multiarch/wmemset-vx.S
bdc76f
+++ b/sysdeps/s390/wmemset-vx.S
bdc76f
@@ -16,7 +16,8 @@
bdc76f
    License along with the GNU C Library; if not, see
bdc76f
    <http://www.gnu.org/licenses/>.  */
bdc76f
 
bdc76f
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
bdc76f
+#include <ifunc-wmemset.h>
bdc76f
+#if HAVE_WMEMSET_Z13
bdc76f
 
bdc76f
 # include "sysdep.h"
bdc76f
 # include "asm-syntax.h"
bdc76f
@@ -38,7 +39,7 @@
bdc76f
    -v17,v18,v19=copy of v16 for vstm
bdc76f
    -v31=saved dest for return
bdc76f
 */
bdc76f
-ENTRY(__wmemset_vx)
bdc76f
+ENTRY(WMEMSET_Z13)
bdc76f
 	.machine "z13"
bdc76f
 	.machinemode "zarch_nohighgprs"
bdc76f
 
bdc76f
@@ -137,6 +138,17 @@ ENTRY(__wmemset_vx)
bdc76f
 	br	%r14
bdc76f
 .Lfallback:
bdc76f
 	srlg	%r4,%r4,2	/* Convert byte-count to character-count.  */
bdc76f
-	jg	__wmemset_c
bdc76f
-END(__wmemset_vx)
bdc76f
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
bdc76f
+	jg	WMEMSET_C
bdc76f
+END(WMEMSET_Z13)
bdc76f
+
bdc76f
+# if ! HAVE_WMEMSET_IFUNC
bdc76f
+strong_alias (WMEMSET_Z13, __wmemset)
bdc76f
+weak_alias (__wmemset, wmemset)
bdc76f
+# endif
bdc76f
+
bdc76f
+# if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT \
bdc76f
+	&& defined SHARED && IS_IN (libc)
bdc76f
+strong_alias (WMEMSET_Z13, __GI___wmemset)
bdc76f
+weak_alias (WMEMSET_Z13, __GI_wmemset)
bdc76f
+# endif
bdc76f
+#endif
bdc76f
diff --git a/sysdeps/s390/multiarch/wmemset.c b/sysdeps/s390/wmemset.c
bdc76f
similarity index 70%
bdc76f
rename from sysdeps/s390/multiarch/wmemset.c
bdc76f
rename to sysdeps/s390/wmemset.c
bdc76f
index 149b4814708d820a..6118754d1df71948 100644
bdc76f
--- a/sysdeps/s390/multiarch/wmemset.c
bdc76f
+++ b/sysdeps/s390/wmemset.c
bdc76f
@@ -16,7 +16,9 @@
bdc76f
    License along with the GNU C Library; if not, see
bdc76f
    <http://www.gnu.org/licenses/>.  */
bdc76f
 
bdc76f
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
bdc76f
+#include <ifunc-wmemset.h>
bdc76f
+
bdc76f
+#if HAVE_WMEMSET_IFUNC
bdc76f
 # define wmemset __redirect_wmemset
bdc76f
 # define __wmemset __redirect___wmemset
bdc76f
 # include <wchar.h>
bdc76f
@@ -24,9 +26,18 @@
bdc76f
 # undef __wmemset
bdc76f
 # include <ifunc-resolve.h>
bdc76f
 
bdc76f
-s390_vx_libc_ifunc_redirected (__redirect___wmemset, __wmemset)
bdc76f
-weak_alias (__wmemset, wmemset)
bdc76f
+# if HAVE_WMEMSET_C
bdc76f
+extern __typeof (__redirect___wmemset) WMEMSET_C attribute_hidden;
bdc76f
+# endif
bdc76f
 
bdc76f
-#else
bdc76f
-# include <wcsmbs/wmemset.c>
bdc76f
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
bdc76f
+# if HAVE_WMEMSET_Z13
bdc76f
+extern __typeof (__redirect___wmemset) WMEMSET_Z13 attribute_hidden;
bdc76f
+# endif
bdc76f
+
bdc76f
+s390_libc_ifunc_expr (__redirect___wmemset, __wmemset,
bdc76f
+		      (HAVE_WMEMSET_Z13 && (hwcap & HWCAP_S390_VX))
bdc76f
+		      ? WMEMSET_Z13
bdc76f
+		      : WMEMSET_DEFAULT
bdc76f
+		      )
bdc76f
+weak_alias (__wmemset, wmemset)
bdc76f
+#endif