From 4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:16 +0100 Subject: S390: Refactor rawmemchr ifunc handling. The ifunc handling for rawmemchr 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. Glibc internal calls will then also use the "newer" ifunc variant. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove rawmemchr variants. * sysdeps/s390/Makefile (sysdep_routines): Add rawmemchr variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for rawmemchr. * sysdeps/s390/multiarch/rawmemchr-c.c: Move to ... * sysdeps/s390/rawmemchr-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/rawmemchr-vx.S: Move to ... * sysdeps/s390/rawmemchr-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/rawmemchr.c: Move to ... * sysdeps/s390/rawmemchr.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-rawmemchr.h: New file. --- sysdeps/s390/multiarch/Makefile | 3 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 14 ++++- sysdeps/s390/multiarch/rawmemchr-c.c | 34 ------------ sysdeps/s390/multiarch/rawmemchr-vx.S | 92 -------------------------------- sysdeps/s390/multiarch/rawmemchr.c | 31 ----------- 5 files changed, 14 insertions(+), 160 deletions(-) delete mode 100644 sysdeps/s390/multiarch/rawmemchr-c.c delete mode 100644 sysdeps/s390/multiarch/rawmemchr-vx.S delete mode 100644 sysdeps/s390/multiarch/rawmemchr.c (limited to 'sysdeps/s390/multiarch') diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index fa1f7b81db..ac6cfcf9c7 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),string) -sysdep_routines += rawmemchr rawmemchr-vx rawmemchr-c \ - memccpy memccpy-vx memccpy-c \ +sysdep_routines += memccpy memccpy-vx memccpy-c \ memrchr memrchr-vx memrchr-c endif diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index b4be014042..bf3b40e111 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -43,6 +43,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -385,6 +386,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_MEMCHR_IFUNC */ +#if HAVE_RAWMEMCHR_IFUNC + IFUNC_IMPL (i, name, rawmemchr, +# if HAVE_RAWMEMCHR_Z13 + IFUNC_IMPL_ADD (array, i, rawmemchr, + dl_hwcap & HWCAP_S390_VX, RAWMEMCHR_Z13) +# endif +# if HAVE_RAWMEMCHR_C + IFUNC_IMPL_ADD (array, i, rawmemchr, 1, RAWMEMCHR_C) +# endif + ) +#endif /* HAVE_RAWMEMCHR_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -426,7 +439,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcscspn); IFUNC_VX_IMPL (wmemchr); - IFUNC_VX_IMPL (rawmemchr); IFUNC_VX_IMPL (memccpy); diff --git a/sysdeps/s390/multiarch/rawmemchr-c.c b/sysdeps/s390/multiarch/rawmemchr-c.c deleted file mode 100644 index f43c883a76..0000000000 --- a/sysdeps/s390/multiarch/rawmemchr-c.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Default rawmemchr 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) -# include - -# define RAWMEMCHR __rawmemchr_c -# undef weak_alias -# define weak_alias(a, b) -# ifdef SHARED -# undef libc_hidden_def -# define libc_hidden_def(name) \ - __hidden_ver1 (__rawmemchr_c, __GI___rawmemchr, __rawmemchr_c); -# endif /* SHARED */ - -extern __typeof (rawmemchr) __rawmemchr_c attribute_hidden; - -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/multiarch/rawmemchr-vx.S b/sysdeps/s390/multiarch/rawmemchr-vx.S deleted file mode 100644 index d5778be068..0000000000 --- a/sysdeps/s390/multiarch/rawmemchr-vx.S +++ /dev/null @@ -1,92 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of rawmemchr. - 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 - -/* void *rawmemchr (const void *s, int c) - Scans memory for character c - and returns pointer to first c. - - Register usage: - -r1=tmp - -r2=s - -r3=c - -r4=tmp - -r5=current_len - -v16=part of s - -v17=index of unequal - -v18=c replicated -*/ -ENTRY(__rawmemchr_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. */ - - vlvgb %v18,%r3,0 /* Generate vector which elements are all c. - If c > 255, c will be truncated. */ - vrepb %v18,%v18,0 - - vfeeb %v17,%v16,%v18 /* Vector find element equal. */ - vlgvb %r5,%v17,7 /* Load byte index of character or zero. */ - clrjl %r5,%r1,.Lend_found /* If found c is in loaded bytes, end. */ - - /* Align s to 16 byte. */ - risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - lghi %r5,16 - slr %r5,%r1 /* Compute bytes to 16bytes boundary. */ - - /* Find c in a 16byte aligned loop. */ -.Lloop: - vl %v16,0(%r5,%r2) /* Load s. */ - vfeebs %v17,%v16,%v18 /* Vector find element equal. */ - jno .Lcharacter /* Jump away if element found. */ - vl %v16,16(%r5,%r2) - vfeebs %v17,%v16,%v18 - jno .Lcharacter16 - vl %v16,32(%r5,%r2) - vfeebs %v17,%v16,%v18 - jno .Lcharacter32 - vl %v16,48(%r5,%r2) - vfeebs %v17,%v16,%v18 - jno .Lcharacter48 - - aghi %r5,64 - j .Lloop /* No character found -> loop. */ - - /* Found character. */ -.Lcharacter48: - aghi %r5,16 -.Lcharacter32: - aghi %r5,16 -.Lcharacter16: - aghi %r5,16 -.Lcharacter: - vlgvb %r1,%v17,7 /* Load byte index of character. */ - algr %r5,%r1 -.Lend_found: - la %r2,0(%r5,%r2) /* Return pointer to character. */ - br %r14 -END(__rawmemchr_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/rawmemchr.c b/sysdeps/s390/multiarch/rawmemchr.c deleted file mode 100644 index 5fdb2252df..0000000000 --- a/sysdeps/s390/multiarch/rawmemchr.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Multiple versions of rawmemchr. - 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 __rawmemchr __redirect___rawmemchr -# include -# undef __rawmemchr -# include - -s390_vx_libc_ifunc2_redirected (__redirect___rawmemchr, __rawmemchr - , __rawmemchr) -weak_alias (__rawmemchr, rawmemchr) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ -- cgit 1.4.1