From c09c1b6f014a45f6c4ba189f5ae94b1fb1a2982a Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:22 +0100 Subject: S390: Refactor wcschrnul ifunc handling. The ifunc handling for wcschrnul is adjusted in order to omit ifunc if the minimum architecture level already supports newer CPUs by default. Unfortunately the c ifunc variant can't be omitted at all as it is used by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcschrnul variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcschrnul variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcschrnul. * sysdeps/s390/multiarch/wcschrnul-c.c: Move to ... * sysdeps/s390/wcschrnul-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcschrnul-vx.S: Move to ... * sysdeps/s390/wcschrnul-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcschrnul.c: Move to ... * sysdeps/s390/wcschrnul.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcschrnul.h: New file. --- ChangeLog | 15 +++++ sysdeps/s390/Makefile | 3 +- sysdeps/s390/ifunc-wcschrnul.h | 53 ++++++++++++++++ sysdeps/s390/multiarch/Makefile | 3 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 15 ++++- sysdeps/s390/multiarch/wcschrnul-c.c | 25 -------- sysdeps/s390/multiarch/wcschrnul-vx.S | 97 ----------------------------- sysdeps/s390/multiarch/wcschrnul.c | 28 --------- sysdeps/s390/wcschrnul-c.c | 27 ++++++++ sysdeps/s390/wcschrnul-vx.S | 103 +++++++++++++++++++++++++++++++ sysdeps/s390/wcschrnul.c | 39 ++++++++++++ 11 files changed, 253 insertions(+), 155 deletions(-) create mode 100644 sysdeps/s390/ifunc-wcschrnul.h delete mode 100644 sysdeps/s390/multiarch/wcschrnul-c.c delete mode 100644 sysdeps/s390/multiarch/wcschrnul-vx.S delete mode 100644 sysdeps/s390/multiarch/wcschrnul.c create mode 100644 sysdeps/s390/wcschrnul-c.c create mode 100644 sysdeps/s390/wcschrnul-vx.S create mode 100644 sysdeps/s390/wcschrnul.c diff --git a/ChangeLog b/ChangeLog index e842405..23abd97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,21 @@ 2018-12-18 Stefan Liebler * sysdeps/s390/multiarch/Makefile + (sysdep_routines): Remove wcschrnul variants. + * sysdeps/s390/Makefile (sysdep_routines): Add wcschrnul variants. + * sysdeps/s390/multiarch/ifunc-impl-list.c + (__libc_ifunc_impl_list): Refactor ifunc handling for wcschrnul. + * sysdeps/s390/multiarch/wcschrnul-c.c: Move to ... + * sysdeps/s390/wcschrnul-c.c: ... here and adjust ifunc handling. + * sysdeps/s390/multiarch/wcschrnul-vx.S: Move to ... + * sysdeps/s390/wcschrnul-vx.S: ... here and adjust ifunc handling. + * sysdeps/s390/multiarch/wcschrnul.c: Move to ... + * sysdeps/s390/wcschrnul.c: ... here and adjust ifunc handling. + * sysdeps/s390/ifunc-wcschrnul.h: New file. + +2018-12-18 Stefan Liebler + + * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcschr variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcschr variants. * sysdeps/s390/multiarch/ifunc-impl-list.c diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 982e5ab..a8cd264 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -93,5 +93,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wcsncat wcsncat-vx wcsncat-c \ wcscmp wcscmp-vx wcscmp-c \ wcsncmp wcsncmp-vx wcsncmp-c \ - wcschr wcschr-vx wcschr-c + wcschr wcschr-vx wcschr-c \ + wcschrnul wcschrnul-vx wcschrnul-c endif diff --git a/sysdeps/s390/ifunc-wcschrnul.h b/sysdeps/s390/ifunc-wcschrnul.h new file mode 100644 index 0000000..39d4120 --- /dev/null +++ b/sysdeps/s390/ifunc-wcschrnul.h @@ -0,0 +1,53 @@ +/* wcschrnul 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_WCSCHRNUL_IFUNC 1 +#else +# define HAVE_WCSCHRNUL_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSCHRNUL_IFUNC_AND_VX_SUPPORT HAVE_WCSCHRNUL_IFUNC +#else +# define HAVE_WCSCHRNUL_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSCHRNUL_DEFAULT WCSCHRNUL_Z13 +/* The z13 ifunc variant is using the common code variant as fallback! */ +# define HAVE_WCSCHRNUL_C 1 +# define HAVE_WCSCHRNUL_Z13 1 +#else +# define WCSCHRNUL_DEFAULT WCSCHRNUL_C +# define HAVE_WCSCHRNUL_C 1 +# define HAVE_WCSCHRNUL_Z13 HAVE_WCSCHRNUL_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSCHRNUL_C +# define WCSCHRNUL_C __wcschrnul_c +#else +# define WCSCHRNUL_C NULL +#endif + +#if HAVE_WCSCHRNUL_Z13 +# define WCSCHRNUL_Z13 __wcschrnul_vx +#else +# define WCSCHRNUL_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index b282613..0eb01d5d 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),wcsmbs) -sysdep_routines += wcschrnul wcschrnul-vx wcschrnul-c \ - wcsrchr wcsrchr-vx wcsrchr-c \ +sysdep_routines += wcsrchr wcsrchr-vx wcsrchr-c \ wcsspn wcsspn-vx wcsspn-c \ wcspbrk wcspbrk-vx wcspbrk-c \ wcscspn wcscspn-vx wcscspn-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index c691654..553a76c 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -57,6 +57,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -567,6 +568,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCHR_IFUNC */ +#if HAVE_WCSCHRNUL_IFUNC + IFUNC_IMPL (i, name, wcschrnul, +# if HAVE_WCSCHRNUL_Z13 + IFUNC_IMPL_ADD (array, i, wcschrnul, + dl_hwcap & HWCAP_S390_VX, WCSCHRNUL_Z13) +# endif +# if HAVE_WCSCHRNUL_C + IFUNC_IMPL_ADD (array, i, wcschrnul, 1, WCSCHRNUL_C) +# endif + ) +#endif /* HAVE_WCSCHRNUL_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -575,8 +588,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 (wcschrnul); - IFUNC_VX_IMPL (wcsrchr); IFUNC_VX_IMPL (wcsspn); diff --git a/sysdeps/s390/multiarch/wcschrnul-c.c b/sysdeps/s390/multiarch/wcschrnul-c.c deleted file mode 100644 index 00e776a..0000000 --- a/sysdeps/s390/multiarch/wcschrnul-c.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Default wcschrnul 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 WCSCHRNUL __wcschrnul_c - -# include -extern __typeof (__wcschrnul) __wcschrnul_c; -# include -#endif diff --git a/sysdeps/s390/multiarch/wcschrnul-vx.S b/sysdeps/s390/multiarch/wcschrnul-vx.S deleted file mode 100644 index ebcd32b..0000000 --- a/sysdeps/s390/multiarch/wcschrnul-vx.S +++ /dev/null @@ -1,97 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of wcschrnul. - 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 - -/* wchar_t* wcschrnul (const wchar_t *s, wchar_t c) - Returns pointer to first c or to \0 if c not found. - - Register usage: - -r1=tmp - -r2=s and return pointer - -r3=c - -r4=tmp - -r5=current_len - -v16=part of s - -v18=vector with c replicated in every byte -*/ -ENTRY(__wcschrnul_vx) - .machine "z13" - .machinemode "zarch_nohighgprs" - - vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ - lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ - - tmll %r2,3 /* Test if s is 4-byte aligned? */ - jne .Lfallback /* And use common-code variant if not. */ - - lghi %r5,0 /* current_len = 0. */ - - vlvgf %v18,%r3,0 /* Generate vector which elements are all c. */ - vrepf %v18,%v18,0 - - vfeezfs %v16,%v16,%v18 /* Find element equal with zero search. */ - vlgvb %r4,%v16,7 /* Load byte index of character or zero. */ - clrjl %r4,%r1,.Lfound /* Return if c/zero is in loaded bytes. */ - - /* Align s to 16 byte. */ - risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - lghi %r5,16 /* current_len = 16. */ - slr %r5,%r4 /* Compute bytes to 16bytes boundary. */ - - /* Find c/zero in 16byte aligned loop */ -.Lloop: - vl %v16,0(%r5,%r2) /* Load s. */ - vfeezfs %v16,%v16,%v18 /* Find element equal with zero search. */ - jno .Lfound /* Found c/zero (cc=0|1|2). */ - vl %v16,16(%r5,%r2) - vfeezfs %v16,%v16,%v18 - jno .Lfound16 - vl %v16,32(%r5,%r2) - vfeezfs %v16,%v16,%v18 - jno .Lfound32 - vl %v16,48(%r5,%r2) - vfeezfs %v16,%v16,%v18 - jno .Lfound48 - - aghi %r5,64 - j .Lloop /* No character and no zero -> loop. */ - - /* Found character or zero */ -.Lfound48: - aghi %r5,16 -.Lfound32: - aghi %r5,16 -.Lfound16: - aghi %r5,16 -.Lfound: - vlgvb %r1,%v16,7 /* Load byte index of character. */ - algr %r5,%r1 - la %r2,0(%r5,%r2) /* Return pointer to character. */ - -.Lend: - br %r14 -.Lfallback: - jg __wcschrnul_c -END(__wcschrnul_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/wcschrnul.c b/sysdeps/s390/multiarch/wcschrnul.c deleted file mode 100644 index 807d7ee..0000000 --- a/sysdeps/s390/multiarch/wcschrnul.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Multiple versions of wcschrnul. - 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_ifunc (__wcschrnul) -weak_alias (__wcschrnul, wcschrnul) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/wcschrnul-c.c b/sysdeps/s390/wcschrnul-c.c new file mode 100644 index 0000000..410cee1 --- /dev/null +++ b/sysdeps/s390/wcschrnul-c.c @@ -0,0 +1,27 @@ +/* Default wcschrnul 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_WCSCHRNUL_C +# if HAVE_WCSCHRNUL_IFUNC || HAVE_WCSCHRNUL_Z13 +# define WCSCHRNUL WCSCHRNUL_C +# endif + +# include +#endif diff --git a/sysdeps/s390/wcschrnul-vx.S b/sysdeps/s390/wcschrnul-vx.S new file mode 100644 index 0000000..4ffb937 --- /dev/null +++ b/sysdeps/s390/wcschrnul-vx.S @@ -0,0 +1,103 @@ +/* Vector optimized 32/64 bit S/390 version of wcschrnul. + 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_WCSCHRNUL_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* wchar_t* wcschrnul (const wchar_t *s, wchar_t c) + Returns pointer to first c or to \0 if c not found. + + Register usage: + -r1=tmp + -r2=s and return pointer + -r3=c + -r4=tmp + -r5=current_len + -v16=part of s + -v18=vector with c replicated in every byte +*/ +ENTRY(WCSCHRNUL_Z13) + .machine "z13" + .machinemode "zarch_nohighgprs" + + vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ + lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ + + tmll %r2,3 /* Test if s is 4-byte aligned? */ + jne .Lfallback /* And use common-code variant if not. */ + + lghi %r5,0 /* current_len = 0. */ + + vlvgf %v18,%r3,0 /* Generate vector which elements are all c. */ + vrepf %v18,%v18,0 + + vfeezfs %v16,%v16,%v18 /* Find element equal with zero search. */ + vlgvb %r4,%v16,7 /* Load byte index of character or zero. */ + clrjl %r4,%r1,.Lfound /* Return if c/zero is in loaded bytes. */ + + /* Align s to 16 byte. */ + risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ + lghi %r5,16 /* current_len = 16. */ + slr %r5,%r4 /* Compute bytes to 16bytes boundary. */ + + /* Find c/zero in 16byte aligned loop */ +.Lloop: + vl %v16,0(%r5,%r2) /* Load s. */ + vfeezfs %v16,%v16,%v18 /* Find element equal with zero search. */ + jno .Lfound /* Found c/zero (cc=0|1|2). */ + vl %v16,16(%r5,%r2) + vfeezfs %v16,%v16,%v18 + jno .Lfound16 + vl %v16,32(%r5,%r2) + vfeezfs %v16,%v16,%v18 + jno .Lfound32 + vl %v16,48(%r5,%r2) + vfeezfs %v16,%v16,%v18 + jno .Lfound48 + + aghi %r5,64 + j .Lloop /* No character and no zero -> loop. */ + + /* Found character or zero */ +.Lfound48: + aghi %r5,16 +.Lfound32: + aghi %r5,16 +.Lfound16: + aghi %r5,16 +.Lfound: + vlgvb %r1,%v16,7 /* Load byte index of character. */ + algr %r5,%r1 + la %r2,0(%r5,%r2) /* Return pointer to character. */ + +.Lend: + br %r14 +.Lfallback: + jg WCSCHRNUL_C +END(WCSCHRNUL_Z13) + +# if ! HAVE_WCSCHRNUL_IFUNC +strong_alias (WCSCHRNUL_Z13, __wcschrnul) +weak_alias (__wcschrnul, wcschrnul) +# endif +#endif diff --git a/sysdeps/s390/wcschrnul.c b/sysdeps/s390/wcschrnul.c new file mode 100644 index 0000000..ab5aaf0 --- /dev/null +++ b/sysdeps/s390/wcschrnul.c @@ -0,0 +1,39 @@ +/* Multiple versions of wcschrnul. + 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_WCSCHRNUL_IFUNC +# include +# include + +# if HAVE_WCSCHRNUL_C +extern __typeof (__wcschrnul) WCSCHRNUL_C attribute_hidden; +# endif + +# if HAVE_WCSCHRNUL_Z13 +extern __typeof (__wcschrnul) WCSCHRNUL_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__wcschrnul, __wcschrnul, + (HAVE_WCSCHRNUL_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSCHRNUL_Z13 + : WCSCHRNUL_DEFAULT + ) +weak_alias (__wcschrnul, wcschrnul) +#endif -- cgit v1.1