From e9873e1d47c870d707117ada91c9be21e3bf1537 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:21 +0100 Subject: S390: Refactor wcsncmp ifunc handling. The ifunc handling for wcsncmp is adjusted in order to omit ifunc variants if those will never be used as the minimum architecture level already supports newer CPUs by default. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcsncmp variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsncmp variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsncmp. * sysdeps/s390/multiarch/wcsncmp-c.c: Move to ... * sysdeps/s390/wcsncmp-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncmp-vx.S: Move to ... * sysdeps/s390/wcsncmp-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncmp.c: Move to ... * sysdeps/s390/wcsncmp.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsncmp.h: New file. --- ChangeLog | 15 +++ sysdeps/s390/Makefile | 3 +- sysdeps/s390/ifunc-wcsncmp.h | 52 +++++++++ sysdeps/s390/multiarch/Makefile | 3 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 15 ++- sysdeps/s390/multiarch/wcsncmp-c.c | 25 ----- sysdeps/s390/multiarch/wcsncmp-vx.S | 177 ------------------------------ sysdeps/s390/multiarch/wcsncmp.c | 27 ----- sysdeps/s390/wcsncmp-c.c | 27 +++++ sysdeps/s390/wcsncmp-vx.S | 182 +++++++++++++++++++++++++++++++ sysdeps/s390/wcsncmp.c | 38 +++++++ 11 files changed, 330 insertions(+), 234 deletions(-) create mode 100644 sysdeps/s390/ifunc-wcsncmp.h delete mode 100644 sysdeps/s390/multiarch/wcsncmp-c.c delete mode 100644 sysdeps/s390/multiarch/wcsncmp-vx.S delete mode 100644 sysdeps/s390/multiarch/wcsncmp.c create mode 100644 sysdeps/s390/wcsncmp-c.c create mode 100644 sysdeps/s390/wcsncmp-vx.S create mode 100644 sysdeps/s390/wcsncmp.c diff --git a/ChangeLog b/ChangeLog index 792ee9ea80..1e5c084706 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2018-12-18 Stefan Liebler + + * sysdeps/s390/multiarch/Makefile + (sysdep_routines): Remove wcsncmp variants. + * sysdeps/s390/Makefile (sysdep_routines): Add wcsncmp variants. + * sysdeps/s390/multiarch/ifunc-impl-list.c + (__libc_ifunc_impl_list): Refactor ifunc handling for wcsncmp. + * sysdeps/s390/multiarch/wcsncmp-c.c: Move to ... + * sysdeps/s390/wcsncmp-c.c: ... here and adjust ifunc handling. + * sysdeps/s390/multiarch/wcsncmp-vx.S: Move to ... + * sysdeps/s390/wcsncmp-vx.S: ... here and adjust ifunc handling. + * sysdeps/s390/multiarch/wcsncmp.c: Move to ... + * sysdeps/s390/wcsncmp.c: ... here and adjust ifunc handling. + * sysdeps/s390/ifunc-wcsncmp.h: New file. + 2018-12-18 Stefan Liebler * sysdeps/s390/multiarch/Makefile diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 00398ba6c2..e1253c04be 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -91,5 +91,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wcpncpy wcpncpy-vx wcpncpy-c \ wcscat wcscat-vx wcscat-c \ wcsncat wcsncat-vx wcsncat-c \ - wcscmp wcscmp-vx wcscmp-c + wcscmp wcscmp-vx wcscmp-c \ + wcsncmp wcsncmp-vx wcsncmp-c endif diff --git a/sysdeps/s390/ifunc-wcsncmp.h b/sysdeps/s390/ifunc-wcsncmp.h new file mode 100644 index 0000000000..3a22bc9c12 --- /dev/null +++ b/sysdeps/s390/ifunc-wcsncmp.h @@ -0,0 +1,52 @@ +/* wcsncmp variant information on S/390 version. + Copyright (C) 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 + . */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_WCSNCMP_IFUNC 1 +#else +# define HAVE_WCSNCMP_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSNCMP_IFUNC_AND_VX_SUPPORT HAVE_WCSNCMP_IFUNC +#else +# define HAVE_WCSNCMP_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSNCMP_DEFAULT WCSNCMP_Z13 +# define HAVE_WCSNCMP_C 0 +# define HAVE_WCSNCMP_Z13 1 +#else +# define WCSNCMP_DEFAULT WCSNCMP_C +# define HAVE_WCSNCMP_C 1 +# define HAVE_WCSNCMP_Z13 HAVE_WCSNCMP_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSNCMP_C +# define WCSNCMP_C __wcsncmp_c +#else +# define WCSNCMP_C NULL +#endif + +#if HAVE_WCSNCMP_Z13 +# define WCSNCMP_Z13 __wcsncmp_vx +#else +# define WCSNCMP_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 70162d0eaa..d1740fa8e4 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),wcsmbs) -sysdep_routines += wcsncmp wcsncmp-vx wcsncmp-c \ - wcschr wcschr-vx wcschr-c \ +sysdep_routines += wcschr wcschr-vx wcschr-c \ wcschrnul wcschrnul-vx wcschrnul-c \ wcsrchr wcsrchr-vx wcsrchr-c \ wcsspn wcsspn-vx wcsspn-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index f461063c80..8c9e788ae5 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -55,6 +55,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -541,6 +542,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCMP_IFUNC */ +#if HAVE_WCSNCMP_IFUNC + IFUNC_IMPL (i, name, wcsncmp, +# if HAVE_WCSNCMP_Z13 + IFUNC_IMPL_ADD (array, i, wcsncmp, + dl_hwcap & HWCAP_S390_VX, WCSNCMP_Z13) +# endif +# if HAVE_WCSNCMP_C + IFUNC_IMPL_ADD (array, i, wcsncmp, 1, WCSNCMP_C) +# endif + ) +#endif /* HAVE_WCSNCMP_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -549,8 +562,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 (wcsncmp); - IFUNC_VX_IMPL (wcschr); IFUNC_VX_IMPL (wcschrnul); diff --git a/sysdeps/s390/multiarch/wcsncmp-c.c b/sysdeps/s390/multiarch/wcsncmp-c.c deleted file mode 100644 index 92ab5e8b50..0000000000 --- a/sysdeps/s390/multiarch/wcsncmp-c.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Default wcsncmp 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 - . */ - -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) -# define WCSNCMP __wcsncmp_c - -# include -extern __typeof (wcsncmp) __wcsncmp_c; -# include -#endif diff --git a/sysdeps/s390/multiarch/wcsncmp-vx.S b/sysdeps/s390/multiarch/wcsncmp-vx.S deleted file mode 100644 index 34c203bc90..0000000000 --- a/sysdeps/s390/multiarch/wcsncmp-vx.S +++ /dev/null @@ -1,177 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of wcsncmp. - 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 - . */ - -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) - -# include "sysdep.h" -# include "asm-syntax.h" - - .text - -/* int wcsncmp (const wchar_t *s1, const wchar_t *s2, size_t n) - Compare at most n characters of two strings. - - Register usage: - -r0=tmp - -r1=tmp - -r2=s1 - -r3=s2 - -r4=n - -r5=current_len - -v16=part of s1 - -v17=part of s2 - -v18=index of unequal -*/ -ENTRY(__wcsncmp_vx) - .machine "z13" - .machinemode "zarch_nohighgprs" - -# if !defined __s390x__ - llgfr %r4,%r4 -# endif /* !defined __s390x__ */ - - clgije %r4,0,.Lend_equal /* Nothing to do if n == 0. */ - - /* Check range of n and convert to byte-count. */ -# ifdef __s390x__ - tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */ - lghi %r1,-4 /* Max byte-count is 18446744073709551612. */ -# else - tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */ - llilf %r1,4294967292 /* Max byte-count is 4294967292. */ -# endif /* !__s390x__ */ - sllg %r4,%r4,2 /* Convert character-count to byte-count. */ - locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */ - - /* Check first character without vector load. */ - lghi %r5,4 /* current_len = 4 bytes. */ - /* Check s1/2[0]. */ - lt %r0,0(%r2) - l %r1,0(%r3) - je .Lend_cmp_one_char - crjne %r0,%r1,.Lend_cmp_one_char - -.Lloop: - vlbb %v17,0(%r5,%r3),6 /* Load s2 to block boundary. */ - vlbb %v16,0(%r5,%r2),6 /* Load s1 to block boundary. */ - lcbb %r0,0(%r5,%r2),6 /* Get loaded byte count of s1. */ - jo .Llt16_1 /* Jump away if vector not fully loaded. */ - lcbb %r1,0(%r5,%r3),6 /* Get loaded byte count of s2. */ - jo .Llt16_2 /* Jump away if vector not fully loaded. */ - aghi %r5,16 /* Both vectors are fully loaded. */ - vfenezfs %v18,%v16,%v17 /* Compare not equal with zero search. */ - clgrjhe %r5,%r4,.Llastcmp /* If current_len >= n ->last compare. */ - jno .Lfound - - vlbb %v17,0(%r5,%r3),6 - vlbb %v16,0(%r5,%r2),6 - lcbb %r0,0(%r5,%r2),6 - jo .Llt16_1 - lcbb %r1,0(%r5,%r3),6 - jo .Llt16_2 - aghi %r5,16 - vfenezfs %v18,%v16,%v17 - clgrjhe %r5,%r4,.Llastcmp - jno .Lfound - - vlbb %v17,0(%r5,%r3),6 - vlbb %v16,0(%r5,%r2),6 - lcbb %r0,0(%r5,%r2),6 - jo .Llt16_1 - lcbb %r1,0(%r5,%r3),6 - jo .Llt16_2 - aghi %r5,16 - vfenezfs %v18,%v16,%v17 - clgrjhe %r5,%r4,.Llastcmp - jno .Lfound - - vlbb %v17,0(%r5,%r3),6 - vlbb %v16,0(%r5,%r2),6 - lcbb %r0,0(%r5,%r2),6 - jo .Llt16_1 - lcbb %r1,0(%r5,%r3),6 - jo .Llt16_2 - aghi %r5,16 - vfenezfs %v18,%v16,%v17 - clgrjhe %r5,%r4,.Llastcmp - jno .Lfound - - j .Lloop - -.Llt16_1: - lcbb %r1,0(%r5,%r3),6 /* Get loaded byte count of s2. */ -.Llt16_2: - clr %r0,%r1 /* Compare logical. */ - locrh %r0,%r1 /* Compute minimum of bytes loaded. */ - nill %r0,65532 /* Align bytes loaded to full characters. */ - jz .Lcmp_one_char /* Jump away if no full char is available. */ -.Llt_cmp: - algfr %r5,%r0 /* Add smallest loaded bytes to current_len. */ - vfenezfs %v18,%v16,%v17 /* Compare not equal with zero search. */ - clgrj %r5,%r4,10,.Llastcmp /* If current_len >= n -> last compare */ - vlgvb %r1,%v18,7 /* Get not equal index or 16 if all equal. */ - clrjl %r1,%r0,.Lfound /* Jump away if miscompare is within - loaded bytes; (index < loaded-bytes) */ - j .Lloop - -.Lcmp_one_char: - /* At least one of both strings is not 4-byte aligned - and there is no full character before next block-boundary. - Compare one character to get over the boundary and - proceed with normal loop! */ - vlef %v16,0(%r5,%r2),0 /* Load one character. */ - lghi %r0,4 /* Loaded byte count is 4. */ - vlef %v17,0(%r5,%r3),0 - j .Llt_cmp /* Proceed with comparision. */ - -.Llastcmp: - /* Use comparision result only if located within first n characters. - %r0: loaded byte count in vreg; - %r5: current_len; - %r4: n; - (current_len - n): [0...16[ - First ignored match index: loaded bytes - (current_len-n): ]0...16] - */ - slgr %r5,%r4 /* %r5 = current_len - n. */ - slr %r0,%r5 /* %r0 = first ignored match index. */ - vlgvb %r4,%v18,7 /* Get not equal index or 16 if all equal. */ - clrjl %r4,%r0,.Lfound2 /* Jump away if miscompare is within - loaded bytes and below n bytes. */ -.Lend_equal: - lghi %r2,0 - br %r14 - -.Lfound: - /* Difference or end of string. */ - /* vfenezf found an unequal element or zero. - This instruction compares unsigned words, but wchar_t is signed. - Thus we have to compare the found element again. */ - vlgvb %r4,%v18,7 /* Extract not equal byte-index. */ -.Lfound2: - srl %r4,2 /* And convert it to character-index. */ - vlgvf %r0,%v16,0(%r4) /* Load character-values. */ - vlgvf %r1,%v17,0(%r4) -.Lend_cmp_one_char: - cr %r0,%r1 - je .Lend_equal - lghi %r2,1 - lghi %r1,-1 - locgrl %r2,%r1 - br %r14 -END(__wcsncmp_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/wcsncmp.c b/sysdeps/s390/multiarch/wcsncmp.c deleted file mode 100644 index ee5f08c1e4..0000000000 --- a/sysdeps/s390/multiarch/wcsncmp.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Multiple versions of wcsncmp. - 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 - . */ - -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) -# include -# include - -s390_vx_libc_ifunc2 (__wcsncmp, wcsncmp) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/wcsncmp-c.c b/sysdeps/s390/wcsncmp-c.c new file mode 100644 index 0000000000..a9ccb8de82 --- /dev/null +++ b/sysdeps/s390/wcsncmp-c.c @@ -0,0 +1,27 @@ +/* Default wcsncmp 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 + . */ + +#include + +#if HAVE_WCSNCMP_C +# if HAVE_WCSNCMP_IFUNC +# define WCSNCMP WCSNCMP_C +# endif + +# include +#endif diff --git a/sysdeps/s390/wcsncmp-vx.S b/sysdeps/s390/wcsncmp-vx.S new file mode 100644 index 0000000000..9bdd21acef --- /dev/null +++ b/sysdeps/s390/wcsncmp-vx.S @@ -0,0 +1,182 @@ +/* Vector optimized 32/64 bit S/390 version of wcsncmp. + 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 + . */ + +#include +#if HAVE_WCSNCMP_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* int wcsncmp (const wchar_t *s1, const wchar_t *s2, size_t n) + Compare at most n characters of two strings. + + Register usage: + -r0=tmp + -r1=tmp + -r2=s1 + -r3=s2 + -r4=n + -r5=current_len + -v16=part of s1 + -v17=part of s2 + -v18=index of unequal +*/ +ENTRY(WCSNCMP_Z13) + .machine "z13" + .machinemode "zarch_nohighgprs" + +# if !defined __s390x__ + llgfr %r4,%r4 +# endif /* !defined __s390x__ */ + + clgije %r4,0,.Lend_equal /* Nothing to do if n == 0. */ + + /* Check range of n and convert to byte-count. */ +# ifdef __s390x__ + tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */ + lghi %r1,-4 /* Max byte-count is 18446744073709551612. */ +# else + tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */ + llilf %r1,4294967292 /* Max byte-count is 4294967292. */ +# endif /* !__s390x__ */ + sllg %r4,%r4,2 /* Convert character-count to byte-count. */ + locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */ + + /* Check first character without vector load. */ + lghi %r5,4 /* current_len = 4 bytes. */ + /* Check s1/2[0]. */ + lt %r0,0(%r2) + l %r1,0(%r3) + je .Lend_cmp_one_char + crjne %r0,%r1,.Lend_cmp_one_char + +.Lloop: + vlbb %v17,0(%r5,%r3),6 /* Load s2 to block boundary. */ + vlbb %v16,0(%r5,%r2),6 /* Load s1 to block boundary. */ + lcbb %r0,0(%r5,%r2),6 /* Get loaded byte count of s1. */ + jo .Llt16_1 /* Jump away if vector not fully loaded. */ + lcbb %r1,0(%r5,%r3),6 /* Get loaded byte count of s2. */ + jo .Llt16_2 /* Jump away if vector not fully loaded. */ + aghi %r5,16 /* Both vectors are fully loaded. */ + vfenezfs %v18,%v16,%v17 /* Compare not equal with zero search. */ + clgrjhe %r5,%r4,.Llastcmp /* If current_len >= n ->last compare. */ + jno .Lfound + + vlbb %v17,0(%r5,%r3),6 + vlbb %v16,0(%r5,%r2),6 + lcbb %r0,0(%r5,%r2),6 + jo .Llt16_1 + lcbb %r1,0(%r5,%r3),6 + jo .Llt16_2 + aghi %r5,16 + vfenezfs %v18,%v16,%v17 + clgrjhe %r5,%r4,.Llastcmp + jno .Lfound + + vlbb %v17,0(%r5,%r3),6 + vlbb %v16,0(%r5,%r2),6 + lcbb %r0,0(%r5,%r2),6 + jo .Llt16_1 + lcbb %r1,0(%r5,%r3),6 + jo .Llt16_2 + aghi %r5,16 + vfenezfs %v18,%v16,%v17 + clgrjhe %r5,%r4,.Llastcmp + jno .Lfound + + vlbb %v17,0(%r5,%r3),6 + vlbb %v16,0(%r5,%r2),6 + lcbb %r0,0(%r5,%r2),6 + jo .Llt16_1 + lcbb %r1,0(%r5,%r3),6 + jo .Llt16_2 + aghi %r5,16 + vfenezfs %v18,%v16,%v17 + clgrjhe %r5,%r4,.Llastcmp + jno .Lfound + + j .Lloop + +.Llt16_1: + lcbb %r1,0(%r5,%r3),6 /* Get loaded byte count of s2. */ +.Llt16_2: + clr %r0,%r1 /* Compare logical. */ + locrh %r0,%r1 /* Compute minimum of bytes loaded. */ + nill %r0,65532 /* Align bytes loaded to full characters. */ + jz .Lcmp_one_char /* Jump away if no full char is available. */ +.Llt_cmp: + algfr %r5,%r0 /* Add smallest loaded bytes to current_len. */ + vfenezfs %v18,%v16,%v17 /* Compare not equal with zero search. */ + clgrj %r5,%r4,10,.Llastcmp /* If current_len >= n -> last compare */ + vlgvb %r1,%v18,7 /* Get not equal index or 16 if all equal. */ + clrjl %r1,%r0,.Lfound /* Jump away if miscompare is within + loaded bytes; (index < loaded-bytes) */ + j .Lloop + +.Lcmp_one_char: + /* At least one of both strings is not 4-byte aligned + and there is no full character before next block-boundary. + Compare one character to get over the boundary and + proceed with normal loop! */ + vlef %v16,0(%r5,%r2),0 /* Load one character. */ + lghi %r0,4 /* Loaded byte count is 4. */ + vlef %v17,0(%r5,%r3),0 + j .Llt_cmp /* Proceed with comparision. */ + +.Llastcmp: + /* Use comparision result only if located within first n characters. + %r0: loaded byte count in vreg; + %r5: current_len; + %r4: n; + (current_len - n): [0...16[ + First ignored match index: loaded bytes - (current_len-n): ]0...16] + */ + slgr %r5,%r4 /* %r5 = current_len - n. */ + slr %r0,%r5 /* %r0 = first ignored match index. */ + vlgvb %r4,%v18,7 /* Get not equal index or 16 if all equal. */ + clrjl %r4,%r0,.Lfound2 /* Jump away if miscompare is within + loaded bytes and below n bytes. */ +.Lend_equal: + lghi %r2,0 + br %r14 + +.Lfound: + /* Difference or end of string. */ + /* vfenezf found an unequal element or zero. + This instruction compares unsigned words, but wchar_t is signed. + Thus we have to compare the found element again. */ + vlgvb %r4,%v18,7 /* Extract not equal byte-index. */ +.Lfound2: + srl %r4,2 /* And convert it to character-index. */ + vlgvf %r0,%v16,0(%r4) /* Load character-values. */ + vlgvf %r1,%v17,0(%r4) +.Lend_cmp_one_char: + cr %r0,%r1 + je .Lend_equal + lghi %r2,1 + lghi %r1,-1 + locgrl %r2,%r1 + br %r14 +END(WCSNCMP_Z13) + +# if ! HAVE_WCSNCMP_IFUNC +strong_alias (WCSNCMP_Z13, wcsncmp) +# endif +#endif diff --git a/sysdeps/s390/wcsncmp.c b/sysdeps/s390/wcsncmp.c new file mode 100644 index 0000000000..101db44591 --- /dev/null +++ b/sysdeps/s390/wcsncmp.c @@ -0,0 +1,38 @@ +/* Multiple versions of wcsncmp. + 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 + . */ + +#include + +#if HAVE_WCSNCMP_IFUNC +# include +# include + +# if HAVE_WCSNCMP_C +extern __typeof (wcsncmp) WCSNCMP_C attribute_hidden; +# endif + +# if HAVE_WCSNCMP_Z13 +extern __typeof (wcsncmp) WCSNCMP_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (wcsncmp, wcsncmp, + (HAVE_WCSNCMP_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSNCMP_Z13 + : WCSNCMP_DEFAULT + ) +#endif -- cgit v1.2.3