OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

S390: Refactor strpbrk ifunc handling. 

The ifunc handling for strpbrk 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 strpbrk variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add strpbrk variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for strpbrk.
	* sysdeps/s390/multiarch/strpbrk-c.c: Move to ...
	* sysdeps/s390/strpbrk-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strpbrk-vx.S: Move to ...
	* sysdeps/s390/strpbrk-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strpbrk.c: Move to ...
	* sysdeps/s390/strpbrk.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-strpbrk.h: New file.
This commit is contained in:
Stefan Liebler 2018-12-18 13:57:15 +01:00
parent 483fc56978
commit 572cca93fa
8 changed files with 126 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2018-12-18 Stefan Liebler <stli@linux.ibm.com>
* sysdeps/s390/multiarch/Makefile
(sysdep_routines): Remove strpbrk variants.
* sysdeps/s390/Makefile (sysdep_routines): Add strpbrk variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for strpbrk.
* sysdeps/s390/multiarch/strpbrk-c.c: Move to ...
* sysdeps/s390/strpbrk-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strpbrk-vx.S: Move to ...
* sysdeps/s390/strpbrk-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strpbrk.c: Move to ...
* sysdeps/s390/strpbrk.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-strpbrk.h: New file.
2018-12-18 Stefan Liebler <stli@linux.ibm.com>
* sysdeps/s390/multiarch/Makefile

3
sysdeps/s390/Makefile
View File

@ -73,5 +73,6 @@ sysdep_routines += bzero memset memset-z900 \
strchr strchr-vx strchr-c \
strchrnul strchrnul-vx strchrnul-c \
strrchr strrchr-vx strrchr-c \
strspn strspn-vx strspn-c
strspn strspn-vx strspn-c \
strpbrk strpbrk-vx strpbrk-c
endif

52
sysdeps/s390/ifunc-strpbrk.h Normal file
View File

@ -0,0 +1,52 @@
/* strpbrk 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
<http://www.gnu.org/licenses/>. */
#if defined USE_MULTIARCH && IS_IN (libc) \
&& ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
# define HAVE_STRPBRK_IFUNC 1
#else
# define HAVE_STRPBRK_IFUNC 0
#endif
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define HAVE_STRPBRK_IFUNC_AND_VX_SUPPORT HAVE_STRPBRK_IFUNC
#else
# define HAVE_STRPBRK_IFUNC_AND_VX_SUPPORT 0
#endif
#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
# define STRPBRK_DEFAULT STRPBRK_Z13
# define HAVE_STRPBRK_C 0
# define HAVE_STRPBRK_Z13 1
#else
# define STRPBRK_DEFAULT STRPBRK_C
# define HAVE_STRPBRK_C 1
# define HAVE_STRPBRK_Z13 HAVE_STRPBRK_IFUNC_AND_VX_SUPPORT
#endif
#if HAVE_STRPBRK_C
# define STRPBRK_C __strpbrk_c
#else
# define STRPBRK_C NULL
#endif
#if HAVE_STRPBRK_Z13
# define STRPBRK_Z13 __strpbrk_vx
#else
# define STRPBRK_Z13 NULL
#endif

3
sysdeps/s390/multiarch/Makefile
View File

@ -1,6 +1,5 @@
ifeq ($(subdir),string)
sysdep_routines += strpbrk strpbrk-vx strpbrk-c \
strcspn strcspn-vx strcspn-c \
sysdep_routines += strcspn strcspn-vx strcspn-c \
memchr memchr-vx \
rawmemchr rawmemchr-vx rawmemchr-c \
memccpy memccpy-vx memccpy-c \

14
sysdeps/s390/multiarch/ifunc-impl-list.c
View File

@ -40,6 +40,7 @@
#include <ifunc-strchrnul.h>
#include <ifunc-strrchr.h>
#include <ifunc-strspn.h>
#include <ifunc-strpbrk.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@ -346,6 +347,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_STRSPN_IFUNC */
#if HAVE_STRPBRK_IFUNC
IFUNC_IMPL (i, name, strpbrk,
# if HAVE_STRPBRK_Z13
IFUNC_IMPL_ADD (array, i, strpbrk,
dl_hwcap & HWCAP_S390_VX, STRPBRK_Z13)
# endif
# if HAVE_STRPBRK_C
IFUNC_IMPL_ADD (array, i, strpbrk, 1, STRPBRK_C)
# endif
)
#endif /* HAVE_STRPBRK_IFUNC */
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@ -382,7 +395,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_VX_IMPL (wcsspn);
IFUNC_VX_IMPL (strpbrk);
IFUNC_VX_IMPL (wcspbrk);
IFUNC_VX_IMPL (strcspn);

20
sysdeps/s390/multiarch/strpbrk-c.c → sysdeps/s390/strpbrk-c.c
View File

@ -16,13 +16,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
# define STRPBRK __strpbrk_c
# ifdef SHARED
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__strpbrk_c, __GI_strpbrk, __strpbrk_c);
# endif /* SHARED */
#include <ifunc-strpbrk.h>
#if HAVE_STRPBRK_C
# if HAVE_STRPBRK_IFUNC
# define STRPBRK STRPBRK_C
# if defined SHARED && IS_IN (libc)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__strpbrk_c, __GI_strpbrk, __strpbrk_c);
# endif
# endif
# include <string/strpbrk.c>
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
#endif

19
sysdeps/s390/multiarch/strpbrk-vx.S → sysdeps/s390/strpbrk-vx.S
View File

@ -16,7 +16,9 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
#include <ifunc-strpbrk.h>
#if HAVE_STRPBRK_Z13
# include "sysdep.h"
# include "asm-syntax.h"
@ -59,7 +61,7 @@
otherwise =0;
r9: loaded byte count of vlbb accept-string
*/
ENTRY(__strpbrk_vx)
ENTRY(STRPBRK_Z13)
.machine "z13"
.machinemode "zarch_nohighgprs"
@ -298,5 +300,14 @@ ENTRY(__strpbrk_vx)
vlgvg %r9,%v31,1
lgr %r2,%r1
br %r14
END(__strpbrk_vx)
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
END(STRPBRK_Z13)
# if ! HAVE_STRPBRK_IFUNC
strong_alias (STRPBRK_Z13, strpbrk)
# endif
# if ! HAVE_STRPBRK_C && defined SHARED && IS_IN (libc)
strong_alias (STRPBRK_Z13, __GI_strpbrk)
# endif
#endif /* HAVE_STRPBRK_Z13 */

21
sysdeps/s390/multiarch/strpbrk.c → sysdeps/s390/strpbrk.c
View File

@ -16,7 +16,9 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
#include <ifunc-strpbrk.h>
#if HAVE_STRPBRK_IFUNC
# define strpbrk __redirect_strpbrk
/* Omit the strpbrk inline definitions because it would redefine strpbrk. */
# define __NO_STRING_INLINES
@ -24,8 +26,17 @@
# undef strpbrk
# include <ifunc-resolve.h>
s390_vx_libc_ifunc2_redirected (__redirect_strpbrk, __strpbrk, strpbrk)
# if HAVE_STRPBRK_C
extern __typeof (__redirect_strpbrk) STRPBRK_C attribute_hidden;
# endif
#else
# include <string/strpbrk.c>
#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
# if HAVE_STRPBRK_Z13
extern __typeof (__redirect_strpbrk) STRPBRK_Z13 attribute_hidden;
# endif
s390_libc_ifunc_expr (__redirect_strpbrk, strpbrk,
(HAVE_STRPBRK_Z13 && (hwcap & HWCAP_S390_VX))
? STRPBRK_Z13
: STRPBRK_DEFAULT
)
#endif /* HAVE_STRPBRK_IFUNC */