From 418f5be91f4c843d63db0d29eee65ff46eb59202 Mon Sep 17 00:00:00 2001
From: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Thu, 27 Jul 2017 10:53:58 +0200
Subject: [PATCH 03/10] S390: Move utf8-utf16-z9.c to multiarch folder and use
s390_libc_ifunc_expr macro.
upstream-commit df6cc7ee3b2e032c6c62cedd30b1c0fefbb43018
The utf8-utf16-z9.c iconv module is using ifunc and thus the ifunc part should
be in multiarch folder. Otherwise ifunc is used even if you configure
with --disable-multi-arch.
This patch moves the ifunc resolvers to the new file
sysdeps/s390/multiarch/utf8-utf16-z9.c. The resolvers are now implemented
with s390_libc_ifunc_expr macro instead of using gcc attribute ifunc directly.
The ifunc versions are implemented in sysdeps/s390/utf8-utf16-z9.c.
Each version is only implemented if needed or supported. Therefore there is
a block at beginning of the file which selects the versions which should be
defined depending on support for multiarch, vector-support and used minimum
architecture level. This block defines HAVE_[FROM|TO]_[C|CU|VX] to 1 or 0.
The code below is rearranged and surrounded
by #if HAVE_[FROM|TO]_[C|CU|VX] == 1. There is no functional change.
The cu instructions are z9 zarch instructions. As the major distros are
already using the newer z196 as architecture level set, those instructions
can be used as fallback version instead of the c-code. This behaviour is
decided at compile time via HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT.
ChangeLog:
* sysdeps/s390/multiarch/utf8-utf16-z9.c: New File.
* sysdeps/s390/utf8-utf16-z9.c: Move ifunc resolvers to multiarch
folder and define ifunc versions depending on HAVE_[FROM|TO]_[C|CU|VX].
(HAVE_FROM_C, HAVE_FROM_CU, HAVE_FROM_VX, HAVE_TO_C, HAVE_TO_VX,
FROM_LOOP_DEFAULT, FROM_LOOP_C, FROM_LOOP_CU, FROM_LOOP_VX,
---
sysdeps/s390/multiarch/utf8-utf16-z9.c | 48 ++++++++
sysdeps/s390/utf8-utf16-z9.c | 197 +++++++++++++++++----------------
2 files changed, 150 insertions(+), 95 deletions(-)
create mode 100644 sysdeps/s390/multiarch/utf8-utf16-z9.c
diff --git a/sysdeps/s390/multiarch/utf8-utf16-z9.c b/sysdeps/s390/multiarch/utf8-utf16-z9.c
new file mode 100644
index 0000000..b55ef1a
--- /dev/null
+++ b/sysdeps/s390/multiarch/utf8-utf16-z9.c
@@ -0,0 +1,48 @@
+/* Conversion between UTF-8 and UTF-16 - multiarch s390 version.
+
+ Copyright (C) 2017 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/>. */
+
+#include <sysdeps/s390/utf8-utf16-z9.c>
+#include <ifunc-resolve.h>
+
+#undef FROM_LOOP
+#define FROM_LOOP __from_utf8_loop
+#undef TO_LOOP
+#define TO_LOOP __to_utf8_loop
+
+#define _SINGLE_NAME(NAME) NAME##_single
+#define SINGLE_NAME(NAME) _SINGLE_NAME(NAME)
+strong_alias (SINGLE_NAME (FROM_LOOP_DEFAULT), SINGLE_NAME (FROM_LOOP))
+strong_alias (SINGLE_NAME (TO_LOOP_DEFAULT), SINGLE_NAME (TO_LOOP))
+
+/* Generate ifunc'ed loop functions for FROM/TO_LOOP. */
+s390_libc_ifunc_expr (FROM_LOOP_DEFAULT, FROM_LOOP,
+ (HAVE_FROM_VX && (hwcap & HWCAP_S390_VX))
+ ? FROM_LOOP_VX
+ : (HAVE_FROM_CU && (hwcap & HWCAP_S390_ZARCH
+ && hwcap & HWCAP_S390_HIGH_GPRS
+ && hwcap & HWCAP_S390_ETF3EH))
+ ? FROM_LOOP_CU
+ : FROM_LOOP_DEFAULT);
+
+s390_libc_ifunc_expr (TO_LOOP_DEFAULT, TO_LOOP,
+ (HAVE_TO_VX && (hwcap & HWCAP_S390_VX))
+ ? TO_LOOP_VX
+ : TO_LOOP_DEFAULT);
+
+#include <iconv/skeleton.c>
diff --git a/sysdeps/s390/utf8-utf16-z9.c b/sysdeps/s390/utf8-utf16-z9.c
index d3dc9bd..d870a29 100644
--- a/sysdeps/s390/utf8-utf16-z9.c
+++ b/sysdeps/s390/utf8-utf16-z9.c
@@ -1,4 +1,4 @@
-/* Conversion between UTF-16 and UTF-32 BE/internal.
+/* Conversion between UTF-8 and UTF-16 - s390 version.
This module uses the Z9-109 variants of the Convert Unicode
instructions.
@@ -27,8 +27,35 @@
#include <dlfcn.h>
#include <stdint.h>
#include <unistd.h>
-#include <dl-procinfo.h>
#include <gconv.h>
+#include <string.h>
+
+/* Select which versions should be defined depending on support
+ for multiarch, vector and used minimum architecture level. */
+#ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT
+# define HAVE_FROM_C 0
+# define FROM_LOOP_DEFAULT FROM_LOOP_CU
+#else
+# define HAVE_FROM_C 1
+# define FROM_LOOP_DEFAULT FROM_LOOP_C
+#endif
+
+#define HAVE_TO_C 1
+#define TO_LOOP_DEFAULT TO_LOOP_C
+
+#if defined HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT || defined USE_MULTIARCH
+# define HAVE_FROM_CU 1
+#else
+# define HAVE_FROM_CU 0
+#endif
+
+#if defined HAVE_S390_VX_ASM_SUPPORT && defined USE_MULTIARCH
+# define HAVE_FROM_VX 1
+# define HAVE_TO_VX 1
+#else
+# define HAVE_FROM_VX 0
+# define HAVE_TO_VX 0
+#endif
#if defined HAVE_S390_VX_GCC_SUPPORT
# define ASM_CLOBBER_VR(NR) , NR
@@ -49,8 +76,8 @@
#define MAX_NEEDED_FROM 4
#define MIN_NEEDED_TO 2
#define MAX_NEEDED_TO 4
-#define FROM_LOOP __from_utf8_loop
-#define TO_LOOP __to_utf8_loop
+#define FROM_LOOP FROM_LOOP_DEFAULT
+#define TO_LOOP TO_LOOP_DEFAULT
#define FROM_DIRECTION (dir == from_utf8)
#define ONE_DIRECTION 0
@@ -214,9 +241,8 @@ gconv_end (struct __gconv_step *data)
STANDARD_FROM_LOOP_ERR_HANDLER (i); \
}
-#define BODY_FROM_ETF3EH BODY_FROM_HW (HARDWARE_CONVERT ("cu12 %0, %1, 1"))
-
-#define HW_FROM_VX \
+#if HAVE_FROM_VX == 1
+# define HW_FROM_VX \
{ \
register const unsigned char* pInput asm ("8") = inptr; \
register size_t inlen asm ("9") = inend - inptr; \
@@ -291,11 +317,42 @@ gconv_end (struct __gconv_step *data)
inptr = pInput; \
outptr = pOutput; \
}
-#define BODY_FROM_VX BODY_FROM_HW (HW_FROM_VX)
+# define BODY_FROM_VX BODY_FROM_HW (HW_FROM_VX)
+/* Generate loop-function with hardware vector and utf-convert instructions. */
+# define MIN_NEEDED_INPUT MIN_NEEDED_FROM
+# define MAX_NEEDED_INPUT MAX_NEEDED_FROM
+# define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
+# define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
+# define FROM_LOOP_VX __from_utf8_loop_vx
+# define LOOPFCT FROM_LOOP_VX
+# define LOOP_NEED_FLAGS
+# define BODY BODY_FROM_VX
+# include <iconv/loop.c>
+#else
+# define FROM_LOOP_VX NULL
+#endif /* HAVE_FROM_VX != 1 */
+
+#if HAVE_FROM_CU == 1
+# define BODY_FROM_ETF3EH BODY_FROM_HW (HARDWARE_CONVERT ("cu12 %0, %1, 1"))
+/* Generate loop-function with hardware utf-convert instruction. */
+# define MIN_NEEDED_INPUT MIN_NEEDED_FROM
+# define MAX_NEEDED_INPUT MAX_NEEDED_FROM
+# define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
+# define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
+# define FROM_LOOP_CU __from_utf8_loop_etf3eh
+# define LOOPFCT FROM_LOOP_CU
+# define LOOP_NEED_FLAGS
+# define BODY BODY_FROM_ETF3EH
+# include <iconv/loop.c>
+#else
+# define FROM_LOOP_CU NULL
+#endif /* HAVE_FROM_CU != 1 */
+
+#if HAVE_FROM_C == 1
/* The software implementation is based on the code in gconv_simple.c. */
-#define BODY_FROM_C \
+# define BODY_FROM_C \
{ \
/* Next input byte. */ \
uint16_t ch = *inptr; \
@@ -443,66 +500,26 @@ gconv_end (struct __gconv_step *data)
}
/* Generate loop-function with software implementation. */
-#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
-#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
-#define LOOPFCT __from_utf8_loop_c
-#define LOOP_NEED_FLAGS
-#define BODY BODY_FROM_C
-#include <iconv/loop.c>
-
-/* Generate loop-function with hardware utf-convert instruction. */
-#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
-#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
-#define LOOPFCT __from_utf8_loop_etf3eh
-#define LOOP_NEED_FLAGS
-#define BODY BODY_FROM_ETF3EH
-#include <iconv/loop.c>
-
-#if defined HAVE_S390_VX_ASM_SUPPORT
-/* Generate loop-function with hardware vector and utf-convert instructions. */
# define MIN_NEEDED_INPUT MIN_NEEDED_FROM
# define MAX_NEEDED_INPUT MAX_NEEDED_FROM
# define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
# define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
-# define LOOPFCT __from_utf8_loop_vx
+# define FROM_LOOP_C __from_utf8_loop_c
+# define LOOPFCT FROM_LOOP_C
# define LOOP_NEED_FLAGS
-# define BODY BODY_FROM_VX
+# define BODY BODY_FROM_C
# include <iconv/loop.c>
-#endif
-
-
-/* Generate ifunc'ed loop function. */
-__typeof(__from_utf8_loop_c)
-__attribute__ ((ifunc ("__from_utf8_loop_resolver")))
-__from_utf8_loop;
-
-static void *
-__from_utf8_loop_resolver (unsigned long int dl_hwcap)
-{
-#if defined HAVE_S390_VX_ASM_SUPPORT
- if (dl_hwcap & HWCAP_S390_VX)
- return __from_utf8_loop_vx;
- else
-#endif
- if (dl_hwcap & HWCAP_S390_ZARCH && dl_hwcap & HWCAP_S390_HIGH_GPRS
- && dl_hwcap & HWCAP_S390_ETF3EH)
- return __from_utf8_loop_etf3eh;
- else
- return __from_utf8_loop_c;
-}
-
-strong_alias (__from_utf8_loop_c_single, __from_utf8_loop_single)
+#else
+# define FROM_LOOP_C NULL
+#endif /* HAVE_FROM_C != 1 */
/* Conversion from UTF-16 to UTF-8. */
+#if HAVE_TO_C == 1
/* The software routine is based on the functionality of the S/390
hardware instruction (cu21) as described in the Principles of
Operation. */
-#define BODY_TO_C \
+# define BODY_TO_C \
{ \
uint16_t c = get16 (inptr); \
\
@@ -601,7 +618,22 @@ strong_alias (__from_utf8_loop_c_single, __from_utf8_loop_single)
inptr += 2; \
}
-#define BODY_TO_VX \
+/* Generate loop-function with software implementation. */
+# define MIN_NEEDED_INPUT MIN_NEEDED_TO
+# define MAX_NEEDED_INPUT MAX_NEEDED_TO
+# define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
+# define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
+# define TO_LOOP_C __to_utf8_loop_c
+# define LOOPFCT TO_LOOP_C
+# define BODY BODY_TO_C
+# define LOOP_NEED_FLAGS
+# include <iconv/loop.c>
+#else
+# define TO_LOOP_C NULL
+#endif /* HAVE_TO_C != 1 */
+
+#if HAVE_TO_VX == 1
+# define BODY_TO_VX \
{ \
size_t inlen = inend - inptr; \
size_t outlen = outend - outptr; \
@@ -771,48 +803,23 @@ strong_alias (__from_utf8_loop_c_single, __from_utf8_loop_single)
STANDARD_TO_LOOP_ERR_HANDLER (2); \
}
-/* Generate loop-function with software implementation. */
-#define MIN_NEEDED_INPUT MIN_NEEDED_TO
-#define MAX_NEEDED_INPUT MAX_NEEDED_TO
-#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
-#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
-#if defined HAVE_S390_VX_ASM_SUPPORT
-# define LOOPFCT __to_utf8_loop_c
-# define BODY BODY_TO_C
-# define LOOP_NEED_FLAGS
-# include <iconv/loop.c>
-
-/* Generate loop-function with software implementation. */
+/* Generate loop-function with vector implementation. */
# define MIN_NEEDED_INPUT MIN_NEEDED_TO
# define MAX_NEEDED_INPUT MAX_NEEDED_TO
# define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
# define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
-# define LOOPFCT __to_utf8_loop_vx
+# define TO_LOOP_VX __to_utf8_loop_vx
+# define LOOPFCT TO_LOOP_VX
# define BODY BODY_TO_VX
# define LOOP_NEED_FLAGS
# include <iconv/loop.c>
-
-/* Generate ifunc'ed loop function. */
-__typeof(__to_utf8_loop_c)
-__attribute__ ((ifunc ("__to_utf8_loop_resolver")))
-__to_utf8_loop;
-
-static void *
-__to_utf8_loop_resolver (unsigned long int dl_hwcap)
-{
- if (dl_hwcap & HWCAP_S390_VX)
- return __to_utf8_loop_vx;
- else
- return __to_utf8_loop_c;
-}
-
-strong_alias (__to_utf8_loop_c_single, __to_utf8_loop_single)
-
#else
-# define LOOPFCT TO_LOOP
-# define BODY BODY_TO_C
-# define LOOP_NEED_FLAGS
-# include <iconv/loop.c>
-#endif /* !HAVE_S390_VX_ASM_SUPPORT */
-
-#include <iconv/skeleton.c>
+# define TO_LOOP_VX NULL
+#endif /* HAVE_TO_VX != 1 */
+
+/* This file also exists in sysdeps/s390/multiarch/ which
+ generates ifunc resolvers for FROM/TO_LOOP functions
+ and includes iconv/skeleton.c afterwards. */
+#if ! defined USE_MULTIARCH
+# include <iconv/skeleton.c>
+#endif
--
1.8.3.1