|
 |
147e83 |
From 9b9fd1ec26b5386072fa967bac0771df5e86a284 Mon Sep 17 00:00:00 2001
|
|
|
147e83 |
From: Stefan Liebler <stli@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Thu, 27 Jul 2017 10:53:58 +0200
|
|
|
147e83 |
Subject: [PATCH 07/10] S390: Use cu41 instruction for converting from utf32 to
|
|
|
147e83 |
utf8.
|
|
|
147e83 |
|
|
|
147e83 |
upstream-commit 23ea69a9d6e9ab28c66a232b767a800b04eaa938
|
|
|
147e83 |
|
|
|
147e83 |
This patch adds an ifunc variant to use the cu instruction on arch12 CPUs.
|
|
|
147e83 |
This new ifunc variant can be built if binutils support z13 vector
|
|
|
147e83 |
instructions. At runtime, HWCAP_S390_VXE decides if we can use the
|
|
|
147e83 |
cu41 instruction.
|
|
|
147e83 |
|
|
|
147e83 |
ChangeLog:
|
|
|
147e83 |
|
|
|
147e83 |
* sysdeps/s390/utf8-utf32-z9.c (__to_utf8_loop_vx_cu):
|
|
|
147e83 |
Use vector and cu41 instruction.
|
|
|
147e83 |
* sysdeps/s390/multiarch/utf8-utf32-z9.c: Add __to_utf8_loop_vx_cu
|
|
|
147e83 |
in ifunc resolver.
|
|
|
147e83 |
---
|
|
|
147e83 |
sysdeps/s390/multiarch/utf8-utf32-z9.c | 8 ++-
|
|
|
147e83 |
sysdeps/s390/utf8-utf32-z9.c | 112 +++++++++++++++++++++++++++++++++
|
|
|
147e83 |
2 files changed, 117 insertions(+), 3 deletions(-)
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/sysdeps/s390/multiarch/utf8-utf32-z9.c b/sysdeps/s390/multiarch/utf8-utf32-z9.c
|
|
|
147e83 |
index faf1f46..0c6d9e9 100644
|
|
|
147e83 |
--- a/sysdeps/s390/multiarch/utf8-utf32-z9.c
|
|
|
147e83 |
+++ b/sysdeps/s390/multiarch/utf8-utf32-z9.c
|
|
|
147e83 |
@@ -41,8 +41,10 @@ s390_libc_ifunc_expr (FROM_LOOP_DEFAULT, FROM_LOOP,
|
|
|
147e83 |
: FROM_LOOP_DEFAULT);
|
|
|
147e83 |
|
|
|
147e83 |
s390_libc_ifunc_expr (TO_LOOP_DEFAULT, TO_LOOP,
|
|
|
147e83 |
- (HAVE_TO_VX && (hwcap & HWCAP_S390_VX))
|
|
|
147e83 |
- ? TO_LOOP_VX
|
|
|
147e83 |
- : TO_LOOP_DEFAULT);
|
|
|
147e83 |
+ (HAVE_TO_VX_CU && (hwcap & HWCAP_S390_VXE))
|
|
|
147e83 |
+ ? TO_LOOP_VX_CU
|
|
|
147e83 |
+ : (HAVE_TO_VX && (hwcap & HWCAP_S390_VX))
|
|
|
147e83 |
+ ? TO_LOOP_VX
|
|
|
147e83 |
+ : TO_LOOP_DEFAULT);
|
|
|
147e83 |
|
|
|
147e83 |
#include <iconv/skeleton.c>
|
|
|
147e83 |
diff --git a/sysdeps/s390/utf8-utf32-z9.c b/sysdeps/s390/utf8-utf32-z9.c
|
|
|
147e83 |
index e06d11e..e4f2e0c 100644
|
|
|
147e83 |
--- a/sysdeps/s390/utf8-utf32-z9.c
|
|
|
147e83 |
+++ b/sysdeps/s390/utf8-utf32-z9.c
|
|
|
147e83 |
@@ -52,9 +52,11 @@
|
|
|
147e83 |
#if defined HAVE_S390_VX_ASM_SUPPORT && defined USE_MULTIARCH
|
|
|
147e83 |
# define HAVE_FROM_VX 1
|
|
|
147e83 |
# define HAVE_TO_VX 1
|
|
|
147e83 |
+# define HAVE_TO_VX_CU 1
|
|
|
147e83 |
#else
|
|
|
147e83 |
# define HAVE_FROM_VX 0
|
|
|
147e83 |
# define HAVE_TO_VX 0
|
|
|
147e83 |
+# define HAVE_TO_VX_CU 0
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
#if defined HAVE_S390_VX_GCC_SUPPORT
|
|
|
147e83 |
@@ -863,6 +865,116 @@ gconv_end (struct __gconv_step *data)
|
|
|
147e83 |
# define TO_LOOP_VX NULL
|
|
|
147e83 |
#endif /* HAVE_TO_VX != 1 */
|
|
|
147e83 |
|
|
|
147e83 |
+#if HAVE_TO_VX_CU == 1
|
|
|
147e83 |
+#define BODY_TO_VX_CU \
|
|
|
147e83 |
+ { \
|
|
|
147e83 |
+ register const unsigned char* pInput asm ("8") = inptr; \
|
|
|
147e83 |
+ register size_t inlen asm ("9") = inend - inptr; \
|
|
|
147e83 |
+ register unsigned char* pOutput asm ("10") = outptr; \
|
|
|
147e83 |
+ register size_t outlen asm ("11") = outend - outptr; \
|
|
|
147e83 |
+ unsigned long tmp, tmp2; \
|
|
|
147e83 |
+ asm volatile (".machine push\n\t" \
|
|
|
147e83 |
+ ".machine \"z13\"\n\t" \
|
|
|
147e83 |
+ ".machinemode \"zarch_nohighgprs\"\n\t" \
|
|
|
147e83 |
+ " vleif %%v20,127,0\n\t" /* element 0: 127 */ \
|
|
|
147e83 |
+ " vzero %%v21\n\t" \
|
|
|
147e83 |
+ " vleih %%v21,8192,0\n\t" /* element 0: > */ \
|
|
|
147e83 |
+ " vleih %%v21,-8192,2\n\t" /* element 1: =<> */ \
|
|
|
147e83 |
+ CONVERT_32BIT_SIZE_T ([R_INLEN]) \
|
|
|
147e83 |
+ CONVERT_32BIT_SIZE_T ([R_OUTLEN]) \
|
|
|
147e83 |
+ /* Loop which handles UTF-32 chars <= 0x7f. */ \
|
|
|
147e83 |
+ "0: clgijl %[R_INLEN],64,20f\n\t" \
|
|
|
147e83 |
+ " clgijl %[R_OUTLEN],16,20f\n\t" \
|
|
|
147e83 |
+ "1: vlm %%v16,%%v19,0(%[R_IN])\n\t" \
|
|
|
147e83 |
+ " lghi %[R_TMP],0\n\t" \
|
|
|
147e83 |
+ /* Shorten to byte values. */ \
|
|
|
147e83 |
+ " vpkf %%v23,%%v16,%%v17\n\t" \
|
|
|
147e83 |
+ " vpkf %%v24,%%v18,%%v19\n\t" \
|
|
|
147e83 |
+ " vpkh %%v23,%%v23,%%v24\n\t" \
|
|
|
147e83 |
+ /* Checking for values > 0x7f. */ \
|
|
|
147e83 |
+ " vstrcfs %%v22,%%v16,%%v20,%%v21\n\t" \
|
|
|
147e83 |
+ " jno 10f\n\t" \
|
|
|
147e83 |
+ " vstrcfs %%v22,%%v17,%%v20,%%v21\n\t" \
|
|
|
147e83 |
+ " jno 11f\n\t" \
|
|
|
147e83 |
+ " vstrcfs %%v22,%%v18,%%v20,%%v21\n\t" \
|
|
|
147e83 |
+ " jno 12f\n\t" \
|
|
|
147e83 |
+ " vstrcfs %%v22,%%v19,%%v20,%%v21\n\t" \
|
|
|
147e83 |
+ " jno 13f\n\t" \
|
|
|
147e83 |
+ /* Store 16bytes to outptr. */ \
|
|
|
147e83 |
+ " vst %%v23,0(%[R_OUT])\n\t" \
|
|
|
147e83 |
+ " aghi %[R_INLEN],-64\n\t" \
|
|
|
147e83 |
+ " aghi %[R_OUTLEN],-16\n\t" \
|
|
|
147e83 |
+ " la %[R_IN],64(%[R_IN])\n\t" \
|
|
|
147e83 |
+ " la %[R_OUT],16(%[R_OUT])\n\t" \
|
|
|
147e83 |
+ " clgijl %[R_INLEN],64,20f\n\t" \
|
|
|
147e83 |
+ " clgijl %[R_OUTLEN],16,20f\n\t" \
|
|
|
147e83 |
+ " j 1b\n\t" \
|
|
|
147e83 |
+ /* Found a value > 0x7f. */ \
|
|
|
147e83 |
+ "13: ahi %[R_TMP],4\n\t" \
|
|
|
147e83 |
+ "12: ahi %[R_TMP],4\n\t" \
|
|
|
147e83 |
+ "11: ahi %[R_TMP],4\n\t" \
|
|
|
147e83 |
+ "10: vlgvb %[R_I],%%v22,7\n\t" \
|
|
|
147e83 |
+ " srlg %[R_I],%[R_I],2\n\t" \
|
|
|
147e83 |
+ " agr %[R_I],%[R_TMP]\n\t" \
|
|
|
147e83 |
+ " je 20f\n\t" \
|
|
|
147e83 |
+ /* Store characters before invalid one... */ \
|
|
|
147e83 |
+ " slgr %[R_OUTLEN],%[R_I]\n\t" \
|
|
|
147e83 |
+ "15: aghi %[R_I],-1\n\t" \
|
|
|
147e83 |
+ " vstl %%v23,%[R_I],0(%[R_OUT])\n\t" \
|
|
|
147e83 |
+ /* ... and update pointers. */ \
|
|
|
147e83 |
+ " aghi %[R_I],1\n\t" \
|
|
|
147e83 |
+ " la %[R_OUT],0(%[R_I],%[R_OUT])\n\t" \
|
|
|
147e83 |
+ " sllg %[R_I],%[R_I],2\n\t" \
|
|
|
147e83 |
+ " la %[R_IN],0(%[R_I],%[R_IN])\n\t" \
|
|
|
147e83 |
+ " slgr %[R_INLEN],%[R_I]\n\t" \
|
|
|
147e83 |
+ /* Handle multibyte utf8-char with convert instruction. */ \
|
|
|
147e83 |
+ "20: cu41 %[R_OUT],%[R_IN]\n\t" \
|
|
|
147e83 |
+ " jo 0b\n\t" /* Try vector implemenation again. */ \
|
|
|
147e83 |
+ " lochil %[R_RES],%[RES_OUT_FULL]\n\t" /* cc == 1. */ \
|
|
|
147e83 |
+ " lochih %[R_RES],%[RES_IN_ILL]\n\t" /* cc == 2. */ \
|
|
|
147e83 |
+ ".machine pop" \
|
|
|
147e83 |
+ : /* outputs */ [R_IN] "+a" (pInput) \
|
|
|
147e83 |
+ , [R_INLEN] "+d" (inlen), [R_OUT] "+a" (pOutput) \
|
|
|
147e83 |
+ , [R_OUTLEN] "+d" (outlen), [R_TMP] "=d" (tmp) \
|
|
|
147e83 |
+ , [R_I] "=a" (tmp2) \
|
|
|
147e83 |
+ , [R_RES] "+d" (result) \
|
|
|
147e83 |
+ : /* inputs */ \
|
|
|
147e83 |
+ [RES_OUT_FULL] "i" (__GCONV_FULL_OUTPUT) \
|
|
|
147e83 |
+ , [RES_IN_ILL] "i" (__GCONV_ILLEGAL_INPUT) \
|
|
|
147e83 |
+ : /* clobber list */ "memory", "cc" \
|
|
|
147e83 |
+ ASM_CLOBBER_VR ("v16") ASM_CLOBBER_VR ("v17") \
|
|
|
147e83 |
+ ASM_CLOBBER_VR ("v18") ASM_CLOBBER_VR ("v19") \
|
|
|
147e83 |
+ ASM_CLOBBER_VR ("v20") ASM_CLOBBER_VR ("v21") \
|
|
|
147e83 |
+ ASM_CLOBBER_VR ("v22") ASM_CLOBBER_VR ("v23") \
|
|
|
147e83 |
+ ASM_CLOBBER_VR ("v24") \
|
|
|
147e83 |
+ ); \
|
|
|
147e83 |
+ inptr = pInput; \
|
|
|
147e83 |
+ outptr = pOutput; \
|
|
|
147e83 |
+ \
|
|
|
147e83 |
+ if (__glibc_likely (inptr == inend) \
|
|
|
147e83 |
+ || result == __GCONV_FULL_OUTPUT) \
|
|
|
147e83 |
+ break; \
|
|
|
147e83 |
+ if (inptr + 4 > inend) \
|
|
|
147e83 |
+ { \
|
|
|
147e83 |
+ result = __GCONV_INCOMPLETE_INPUT; \
|
|
|
147e83 |
+ break; \
|
|
|
147e83 |
+ } \
|
|
|
147e83 |
+ STANDARD_TO_LOOP_ERR_HANDLER (4); \
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Generate loop-function with hardware vector and utf-convert instructions. */
|
|
|
147e83 |
+# define MIN_NEEDED_INPUT MIN_NEEDED_TO
|
|
|
147e83 |
+# define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
|
|
|
147e83 |
+# define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
|
|
|
147e83 |
+# define TO_LOOP_VX_CU __to_utf8_loop_vx_cu
|
|
|
147e83 |
+# define LOOPFCT TO_LOOP_VX_CU
|
|
|
147e83 |
+# define BODY BODY_TO_VX_CU
|
|
|
147e83 |
+# define LOOP_NEED_FLAGS
|
|
|
147e83 |
+# include <iconv/loop.c>
|
|
|
147e83 |
+#else
|
|
|
147e83 |
+# define TO_LOOP_VX_CU NULL
|
|
|
147e83 |
+#endif /* HAVE_TO_VX_CU != 1 */
|
|
|
147e83 |
+
|
|
|
147e83 |
/* This file also exists in sysdeps/s390/multiarch/ which
|
|
|
147e83 |
generates ifunc resolvers for FROM/TO_LOOP functions
|
|
|
147e83 |
and includes iconv/skeleton.c afterwards. */
|
|
|
147e83 |
--
|
|
|
147e83 |
1.8.3.1
|
|
|
147e83 |
|