00db10
From f69ff8906aeb1c4fd762bc9964f8a261963c30d5 Mon Sep 17 00:00:00 2001
00db10
From: Stefan Liebler <stli@linux.vnet.ibm.com>
00db10
Date: Thu, 27 Jul 2017 10:53:58 +0200
00db10
Subject: [PATCH 05/10] S390: Move utf8-utf32-z9.c to multiarch folder and use
00db10
 s390_libc_ifunc_expr macro.
00db10
00db10
upstream-commit 5ea9ce3749007348a8d12e8eef9e0ccc6fd90aec
00db10
00db10
The utf8-utf32-z9.c iconv module is using ifunc and thus the ifunc part should
00db10
be in multiarch folder.  Otherwise ifunc is used even if you configure
00db10
with --disable-multi-arch.
00db10
00db10
This patch moves the ifunc resolvers to the new file
00db10
sysdeps/s390/multiarch/utf8-utf32-z9.c. The resolvers are now implemented
00db10
with s390_libc_ifunc_expr macro instead of using gcc attribute ifunc directly.
00db10
00db10
The ifunc versions are implemented in sysdeps/s390/utf8-utf32-z9.c.
00db10
Each version is only implemented if needed or supported.  Therefore there is
00db10
a block at beginning of the file which selects the versions which should be
00db10
defined depending on support for multiarch, vector-support and used minimum
00db10
architecture level.  This block defines HAVE_[FROM|TO]_[C|CU|VX] to 1 or 0.
00db10
The code below is rearranged and surrounded
00db10
by #if HAVE_[FROM|TO]_[C|CU|VX] == 1.  There is no functional change.
00db10
00db10
The cu instructions are z9 zarch instructions.  As the major distros are
00db10
already using the newer z196 as architecture level set, those instructions
00db10
can be used as fallback version instead of the c-code.  This behaviour is
00db10
decided at compile time via HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT.
00db10
00db10
ChangeLog:
00db10
00db10
	* sysdeps/s390/multiarch/utf8-utf32-z9.c: New File.
00db10
	* sysdeps/s390/utf8-utf32-z9.c: Move ifunc resolvers to multiarch
00db10
	folder and define ifunc versions depending on HAVE_[FROM|TO]_[C|CU|VX].
00db10
	(HAVE_FROM_C, HAVE_FROM_CU, HAVE_FROM_VX, HAVE_TO_C, HAVE_TO_VX,
00db10
	FROM_LOOP_DEFAULT, FROM_LOOP_C, FROM_LOOP_CU, FROM_LOOP_VX,
00db10
	TO_LOOP_DEFAULT, TO_LOOP_C, TO_LOOP_VX): New Define.
00db10
---
00db10
 sysdeps/s390/multiarch/utf8-utf32-z9.c |  48 ++++++++
00db10
 sysdeps/s390/utf8-utf32-z9.c           | 215 +++++++++++++++++----------------
00db10
 2 files changed, 160 insertions(+), 103 deletions(-)
00db10
 create mode 100644 sysdeps/s390/multiarch/utf8-utf32-z9.c
00db10
00db10
diff --git a/sysdeps/s390/multiarch/utf8-utf32-z9.c b/sysdeps/s390/multiarch/utf8-utf32-z9.c
00db10
new file mode 100644
00db10
index 0000000..faf1f46
00db10
--- /dev/null
00db10
+++ b/sysdeps/s390/multiarch/utf8-utf32-z9.c
00db10
@@ -0,0 +1,48 @@
00db10
+/* Conversion between UTF-8 and UTF-32 - multiarch s390 version.
00db10
+
00db10
+   Copyright (C) 2017 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <sysdeps/s390/utf8-utf32-z9.c>
00db10
+#include <ifunc-resolve.h>
00db10
+
00db10
+#undef FROM_LOOP
00db10
+#define FROM_LOOP	__from_utf8_loop
00db10
+#undef TO_LOOP
00db10
+#define TO_LOOP		__to_utf8_loop
00db10
+
00db10
+#define _SINGLE_NAME(NAME) NAME##_single
00db10
+#define SINGLE_NAME(NAME) _SINGLE_NAME(NAME)
00db10
+strong_alias (SINGLE_NAME (FROM_LOOP_DEFAULT), SINGLE_NAME (FROM_LOOP))
00db10
+strong_alias (SINGLE_NAME (TO_LOOP_DEFAULT), SINGLE_NAME (TO_LOOP))
00db10
+
00db10
+/* Generate ifunc'ed loop functions for FROM/TO_LOOP.  */
00db10
+s390_libc_ifunc_expr (FROM_LOOP_DEFAULT, FROM_LOOP,
00db10
+		      (HAVE_FROM_VX && (hwcap & HWCAP_S390_VX))
00db10
+		      ? FROM_LOOP_VX
00db10
+		      : (HAVE_FROM_CU && (hwcap & HWCAP_S390_ZARCH
00db10
+					  && hwcap & HWCAP_S390_HIGH_GPRS
00db10
+					  && hwcap & HWCAP_S390_ETF3EH))
00db10
+			? FROM_LOOP_CU
00db10
+			: FROM_LOOP_DEFAULT);
00db10
+
00db10
+s390_libc_ifunc_expr (TO_LOOP_DEFAULT, TO_LOOP,
00db10
+		      (HAVE_TO_VX && (hwcap & HWCAP_S390_VX))
00db10
+		      ? TO_LOOP_VX
00db10
+		      : TO_LOOP_DEFAULT);
00db10
+
00db10
+#include <iconv/skeleton.c>
00db10
diff --git a/sysdeps/s390/utf8-utf32-z9.c b/sysdeps/s390/utf8-utf32-z9.c
00db10
index efae745..e06d11e 100644
00db10
--- a/sysdeps/s390/utf8-utf32-z9.c
00db10
+++ b/sysdeps/s390/utf8-utf32-z9.c
00db10
@@ -27,8 +27,35 @@
00db10
 #include <dlfcn.h>
00db10
 #include <stdint.h>
00db10
 #include <unistd.h>
00db10
-#include <dl-procinfo.h>
00db10
 #include <gconv.h>
00db10
+#include <string.h>
00db10
+
00db10
+/* Select which versions should be defined depending on support
00db10
+   for multiarch, vector and used minimum architecture level.  */
00db10
+#ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT
00db10
+# define HAVE_FROM_C		0
00db10
+# define FROM_LOOP_DEFAULT	FROM_LOOP_CU
00db10
+#else
00db10
+# define HAVE_FROM_C		1
00db10
+# define FROM_LOOP_DEFAULT	FROM_LOOP_C
00db10
+#endif
00db10
+
00db10
+#define HAVE_TO_C		1
00db10
+#define TO_LOOP_DEFAULT		TO_LOOP_C
00db10
+
00db10
+#if defined HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT || defined USE_MULTIARCH
00db10
+# define HAVE_FROM_CU		1
00db10
+#else
00db10
+# define HAVE_FROM_CU		0
00db10
+#endif
00db10
+
00db10
+#if defined HAVE_S390_VX_ASM_SUPPORT && defined USE_MULTIARCH
00db10
+# define HAVE_FROM_VX		1
00db10
+# define HAVE_TO_VX		1
00db10
+#else
00db10
+# define HAVE_FROM_VX		0
00db10
+# define HAVE_TO_VX		0
00db10
+#endif
00db10
 
00db10
 #if defined HAVE_S390_VX_GCC_SUPPORT
00db10
 # define ASM_CLOBBER_VR(NR) , NR
00db10
@@ -48,8 +75,8 @@
00db10
 #define MIN_NEEDED_FROM		1
00db10
 #define MAX_NEEDED_FROM		6
00db10
 #define MIN_NEEDED_TO		4
00db10
-#define FROM_LOOP		__from_utf8_loop
00db10
-#define TO_LOOP			__to_utf8_loop
00db10
+#define FROM_LOOP		FROM_LOOP_DEFAULT
00db10
+#define TO_LOOP			TO_LOOP_DEFAULT
00db10
 #define FROM_DIRECTION		(dir == from_utf8)
00db10
 #define ONE_DIRECTION           0
00db10
 
00db10
@@ -303,12 +330,9 @@ gconv_end (struct __gconv_step *data)
00db10
     STANDARD_FROM_LOOP_ERR_HANDLER (i);					\
00db10
   }
00db10
 
00db10
-/* This hardware routine uses the Convert UTF8 to UTF32 (cu14) instruction.  */
00db10
-#define BODY_FROM_ETF3EH BODY_FROM_HW (HARDWARE_CONVERT ("cu14 %0, %1, 1"))
00db10
-
00db10
-
00db10
+#if HAVE_FROM_C == 1
00db10
 /* The software routine is copied from gconv_simple.c.  */
00db10
-#define BODY_FROM_C							\
00db10
+# define BODY_FROM_C							\
00db10
   {									\
00db10
     /* Next input byte.  */						\
00db10
     uint32_t ch = *inptr;						\
00db10
@@ -408,7 +432,50 @@ gconv_end (struct __gconv_step *data)
00db10
     outptr += sizeof (uint32_t);					\
00db10
   }
00db10
 
00db10
-#define HW_FROM_VX							\
00db10
+/* These definitions apply to the UTF-8 to UTF-32 direction.  The
00db10
+   software implementation for UTF-8 still supports multibyte
00db10
+   characters up to 6 bytes whereas the hardware variant does not.  */
00db10
+# define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
00db10
+# define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
00db10
+# define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
00db10
+# define FROM_LOOP_C		__from_utf8_loop_c
00db10
+# define LOOPFCT		FROM_LOOP_C
00db10
+
00db10
+# define LOOP_NEED_FLAGS
00db10
+
00db10
+# define STORE_REST		STORE_REST_COMMON
00db10
+# define UNPACK_BYTES		UNPACK_BYTES_COMMON
00db10
+# define CLEAR_STATE		CLEAR_STATE_COMMON
00db10
+# define BODY			BODY_FROM_C
00db10
+# include <iconv/loop.c>
00db10
+#else
00db10
+# define FROM_LOOP_C		NULL
00db10
+#endif /* HAVE_FROM_C != 1  */
00db10
+
00db10
+#if HAVE_FROM_CU == 1
00db10
+/* This hardware routine uses the Convert UTF8 to UTF32 (cu14) instruction.  */
00db10
+# define BODY_FROM_ETF3EH BODY_FROM_HW (HARDWARE_CONVERT ("cu14 %0, %1, 1"))
00db10
+
00db10
+/* Generate loop-function with hardware utf-convert instruction.  */
00db10
+# define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
00db10
+# define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
00db10
+# define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
00db10
+# define FROM_LOOP_CU		__from_utf8_loop_etf3eh
00db10
+# define LOOPFCT		FROM_LOOP_CU
00db10
+
00db10
+# define LOOP_NEED_FLAGS
00db10
+
00db10
+# define STORE_REST		STORE_REST_COMMON
00db10
+# define UNPACK_BYTES		UNPACK_BYTES_COMMON
00db10
+# define CLEAR_STATE		CLEAR_STATE_COMMON
00db10
+# define BODY			BODY_FROM_ETF3EH
00db10
+# include <iconv/loop.c>
00db10
+#else
00db10
+# define FROM_LOOP_CU		NULL
00db10
+#endif /* HAVE_FROM_CU != 1  */
00db10
+
00db10
+#if HAVE_FROM_VX == 1
00db10
+# define HW_FROM_VX							\
00db10
   {									\
00db10
     register const unsigned char* pInput asm ("8") = inptr;		\
00db10
     register size_t inlen asm ("9") = inend - inptr;			\
00db10
@@ -500,45 +567,14 @@ gconv_end (struct __gconv_step *data)
00db10
     inptr = pInput;							\
00db10
     outptr = pOutput;							\
00db10
   }
00db10
-#define BODY_FROM_VX BODY_FROM_HW (HW_FROM_VX)
00db10
+# define BODY_FROM_VX BODY_FROM_HW (HW_FROM_VX)
00db10
 
00db10
-/* These definitions apply to the UTF-8 to UTF-32 direction.  The
00db10
-   software implementation for UTF-8 still supports multibyte
00db10
-   characters up to 6 bytes whereas the hardware variant does not.  */
00db10
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
00db10
-#define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
00db10
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
00db10
-#define LOOPFCT			__from_utf8_loop_c
00db10
-
00db10
-#define LOOP_NEED_FLAGS
00db10
-
00db10
-#define STORE_REST		STORE_REST_COMMON
00db10
-#define UNPACK_BYTES		UNPACK_BYTES_COMMON
00db10
-#define CLEAR_STATE		CLEAR_STATE_COMMON
00db10
-#define BODY			BODY_FROM_C
00db10
-#include <iconv/loop.c>
00db10
-
00db10
-
00db10
-/* Generate loop-function with hardware utf-convert instruction.  */
00db10
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
00db10
-#define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
00db10
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
00db10
-#define LOOPFCT			__from_utf8_loop_etf3eh
00db10
-
00db10
-#define LOOP_NEED_FLAGS
00db10
-
00db10
-#define STORE_REST		STORE_REST_COMMON
00db10
-#define UNPACK_BYTES		UNPACK_BYTES_COMMON
00db10
-#define CLEAR_STATE		CLEAR_STATE_COMMON
00db10
-#define BODY			BODY_FROM_ETF3EH
00db10
-#include <iconv/loop.c>
00db10
-
00db10
-#if defined HAVE_S390_VX_ASM_SUPPORT
00db10
-/* Generate loop-function with hardware vector instructions.  */
00db10
+/* Generate loop-function with hardware vector and utf-convert instructions.  */
00db10
 # define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
00db10
 # define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
00db10
 # define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
00db10
-# define LOOPFCT		__from_utf8_loop_vx
00db10
+# define FROM_LOOP_VX		__from_utf8_loop_vx
00db10
+# define LOOPFCT		FROM_LOOP_VX
00db10
 
00db10
 # define LOOP_NEED_FLAGS
00db10
 
00db10
@@ -547,33 +583,13 @@ gconv_end (struct __gconv_step *data)
00db10
 # define CLEAR_STATE		CLEAR_STATE_COMMON
00db10
 # define BODY			BODY_FROM_VX
00db10
 # include <iconv/loop.c>
00db10
-#endif
00db10
-
00db10
-
00db10
-/* Generate ifunc'ed loop function.  */
00db10
-__typeof(__from_utf8_loop_c)
00db10
-__attribute__ ((ifunc ("__from_utf8_loop_resolver")))
00db10
-__from_utf8_loop;
00db10
-
00db10
-static void *
00db10
-__from_utf8_loop_resolver (unsigned long int dl_hwcap)
00db10
-{
00db10
-#if defined HAVE_S390_VX_ASM_SUPPORT
00db10
-  if (dl_hwcap & HWCAP_S390_VX)
00db10
-    return __from_utf8_loop_vx;
00db10
-  else
00db10
-#endif
00db10
-  if (dl_hwcap & HWCAP_S390_ZARCH && dl_hwcap & HWCAP_S390_HIGH_GPRS
00db10
-      && dl_hwcap & HWCAP_S390_ETF3EH)
00db10
-    return __from_utf8_loop_etf3eh;
00db10
-  else
00db10
-    return __from_utf8_loop_c;
00db10
-}
00db10
-
00db10
-strong_alias (__from_utf8_loop_c_single, __from_utf8_loop_single)
00db10
+#else
00db10
+# define FROM_LOOP_VX		NULL
00db10
+#endif /* HAVE_FROM_VX != 1  */
00db10
 
00db10
+#if HAVE_TO_C == 1
00db10
 /* The software routine mimics the S/390 cu41 instruction.  */
00db10
-#define BODY_TO_C						\
00db10
+# define BODY_TO_C						\
00db10
   {								\
00db10
     uint32_t wc = *((const uint32_t *) inptr);			\
00db10
 								\
00db10
@@ -657,8 +673,22 @@ strong_alias (__from_utf8_loop_c_single, __from_utf8_loop_single)
00db10
     inptr += 4;							\
00db10
   }
00db10
 
00db10
+/* Generate loop-function with software routing.  */
00db10
+# define MIN_NEEDED_INPUT	MIN_NEEDED_TO
00db10
+# define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
00db10
+# define MAX_NEEDED_OUTPUT	MAX_NEEDED_FROM
00db10
+# define TO_LOOP_C		__to_utf8_loop_c
00db10
+# define LOOPFCT		TO_LOOP_C
00db10
+# define BODY			BODY_TO_C
00db10
+# define LOOP_NEED_FLAGS
00db10
+# include <iconv/loop.c>
00db10
+#else
00db10
+# define TO_LOOP_C		NULL
00db10
+#endif /* HAVE_TO_C != 1  */
00db10
+
00db10
+#if HAVE_TO_VX == 1
00db10
 /* The hardware routine uses the S/390 vector instructions.  */
00db10
-#define BODY_TO_VX							\
00db10
+# define BODY_TO_VX							\
00db10
   {									\
00db10
     size_t inlen = inend - inptr;					\
00db10
     size_t outlen = outend - outptr;					\
00db10
@@ -820,43 +850,22 @@ strong_alias (__from_utf8_loop_c_single, __from_utf8_loop_single)
00db10
     STANDARD_TO_LOOP_ERR_HANDLER (4);					\
00db10
   }
00db10
 
00db10
-/* Generate loop-function with software routing.  */
00db10
-#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
00db10
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
00db10
-#define MAX_NEEDED_OUTPUT	MAX_NEEDED_FROM
00db10
-#define LOOPFCT			__to_utf8_loop_c
00db10
-#define BODY			BODY_TO_C
00db10
-#define LOOP_NEED_FLAGS
00db10
-#include <iconv/loop.c>
00db10
-
00db10
-#if defined HAVE_S390_VX_ASM_SUPPORT
00db10
-/* Generate loop-function with hardware vector and utf-convert instructions.  */
00db10
+/* Generate loop-function with hardware vector instructions.  */
00db10
 # define MIN_NEEDED_INPUT	MIN_NEEDED_TO
00db10
 # define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
00db10
 # define MAX_NEEDED_OUTPUT	MAX_NEEDED_FROM
00db10
-# define LOOPFCT		__to_utf8_loop_vx
00db10
+# define TO_LOOP_VX		__to_utf8_loop_vx
00db10
+# define LOOPFCT		TO_LOOP_VX
00db10
 # define BODY			BODY_TO_VX
00db10
 # define LOOP_NEED_FLAGS
00db10
 # include <iconv/loop.c>
00db10
+#else
00db10
+# define TO_LOOP_VX		NULL
00db10
+#endif /* HAVE_TO_VX != 1  */
00db10
+
00db10
+/* This file also exists in sysdeps/s390/multiarch/ which
00db10
+   generates ifunc resolvers for FROM/TO_LOOP functions
00db10
+   and includes iconv/skeleton.c afterwards.  */
00db10
+#if ! defined USE_MULTIARCH
00db10
+# include <iconv/skeleton.c>
00db10
 #endif
00db10
-
00db10
-/* Generate ifunc'ed loop function.  */
00db10
-__typeof(__to_utf8_loop_c)
00db10
-__attribute__ ((ifunc ("__to_utf8_loop_resolver")))
00db10
-__to_utf8_loop;
00db10
-
00db10
-static void *
00db10
-__to_utf8_loop_resolver (unsigned long int dl_hwcap)
00db10
-{
00db10
-#if defined HAVE_S390_VX_ASM_SUPPORT
00db10
-  if (dl_hwcap & HWCAP_S390_VX)
00db10
-    return __to_utf8_loop_vx;
00db10
-  else
00db10
-#endif
00db10
-    return __to_utf8_loop_c;
00db10
-}
00db10
-
00db10
-strong_alias (__to_utf8_loop_c_single, __to_utf8_loop_single)
00db10
-
00db10
-
00db10
-#include <iconv/skeleton.c>
00db10
-- 
00db10
1.8.3.1
00db10