system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

S390: Refactor strncmp ifunc handling.

Browse Source 
The ifunc handling for strncmp 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 strncmp variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add strncmp variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for strncmp.
	* sysdeps/s390/multiarch/strncmp-c.c: Move to ...
	* sysdeps/s390/strncmp-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strncmp-vx.S: Move to ...
	* sysdeps/s390/strncmp-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strncmp.c: Move to ...
	* sysdeps/s390/strncmp.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-strncmp.h: New file.
This commit is contained in:
Stefan Liebler 2018-12-18 13:57:13 +01:00
parent cdab85fe33
commit 316b884219
8 changed files with 125 additions and 20 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 strncmp variants.
* sysdeps/s390/Makefile (sysdep_routines): Add strncmp variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for strncmp.
* sysdeps/s390/multiarch/strncmp-c.c: Move to ...
* sysdeps/s390/strncmp-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strncmp-vx.S: Move to ...
* sysdeps/s390/strncmp-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strncmp.c: Move to ...
* sysdeps/s390/strncmp.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-strncmp.h: New file.
2018-12-18 Stefan Liebler <stli@linux.ibm.com>
* sysdeps/s390/multiarch/Makefile

3
sysdeps/s390/Makefile
View File

@ -68,5 +68,6 @@ sysdep_routines += bzero memset memset-z900 \
stpncpy stpncpy-vx stpncpy-c \
strcat strcat-vx strcat-c \
strncat strncat-vx strncat-c \
strcmp strcmp-vx strcmp-z900
strcmp strcmp-vx strcmp-z900 \
strncmp strncmp-vx strncmp-c
endif

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

@ -0,0 +1,52 @@
/* strncmp 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_STRNCMP_IFUNC 1
#else
# define HAVE_STRNCMP_IFUNC 0
#endif
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define HAVE_STRNCMP_IFUNC_AND_VX_SUPPORT HAVE_STRNCMP_IFUNC
#else
# define HAVE_STRNCMP_IFUNC_AND_VX_SUPPORT 0
#endif
#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
# define STRNCMP_DEFAULT STRNCMP_Z13
# define HAVE_STRNCMP_C 0
# define HAVE_STRNCMP_Z13 1
#else
# define STRNCMP_DEFAULT STRNCMP_C
# define HAVE_STRNCMP_C 1
# define HAVE_STRNCMP_Z13 HAVE_STRNCMP_IFUNC_AND_VX_SUPPORT
#endif
#if HAVE_STRNCMP_C
# define STRNCMP_C __strncmp_c
#else
# define STRNCMP_C NULL
#endif
#if HAVE_STRNCMP_Z13
# define STRNCMP_Z13 __strncmp_vx
#else
# define STRNCMP_Z13 NULL
#endif

3
sysdeps/s390/multiarch/Makefile
View File

@ -1,6 +1,5 @@
ifeq ($(subdir),string)
sysdep_routines += strncmp strncmp-vx strncmp-c \
strchr strchr-vx strchr-c \
sysdep_routines += strchr strchr-vx strchr-c \
strchrnul strchrnul-vx strchrnul-c \
strrchr strrchr-vx strrchr-c \
strspn strspn-vx strspn-c \

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

@ -35,6 +35,7 @@
#include <ifunc-strcat.h>
#include <ifunc-strncat.h>
#include <ifunc-strcmp.h>
#include <ifunc-strncmp.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@ -281,6 +282,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_STRCMP_IFUNC */
#if HAVE_STRNCMP_IFUNC
IFUNC_IMPL (i, name, strncmp,
# if HAVE_STRNCMP_Z13
IFUNC_IMPL_ADD (array, i, strncmp,
dl_hwcap & HWCAP_S390_VX, STRNCMP_Z13)
# endif
# if HAVE_STRNCMP_C
IFUNC_IMPL_ADD (array, i, strncmp, 1, STRNCMP_C)
# endif
)
#endif /* HAVE_STRNCMP_IFUNC */
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@ -307,7 +320,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_VX_IMPL (wcscmp);
IFUNC_VX_IMPL (strncmp);
IFUNC_VX_IMPL (wcsncmp);
IFUNC_VX_IMPL (strchr);

18
sysdeps/s390/multiarch/strncmp-c.c → sysdeps/s390/strncmp-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 STRNCMP __strncmp_c
# ifdef SHARED
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
#include <ifunc-strncmp.h>
#if HAVE_STRNCMP_C
# if HAVE_STRNCMP_IFUNC
# define STRNCMP STRNCMP_C
# if defined SHARED && IS_IN (libc)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__strncmp_c, __GI_strncmp, __strncmp_c);
# endif /* SHARED */
# endif
# endif
# include <string/strncmp.c>
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
#endif

19
sysdeps/s390/multiarch/strncmp-vx.S → sysdeps/s390/strncmp-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-strncmp.h>
#if HAVE_STRNCMP_Z13
# include "sysdep.h"
# include "asm-syntax.h"
@ -37,7 +39,7 @@
-v17=part of s2
-v18=index of unequal
*/
ENTRY(__strncmp_vx)
ENTRY(STRNCMP_Z13)
.machine "z13"
.machinemode "zarch_nohighgprs"
@ -133,5 +135,14 @@ ENTRY(__strncmp_vx)
.Lend_equal:
lghi %r2,0
br %r14
END(__strncmp_vx)
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
END(STRNCMP_Z13)
# if ! HAVE_STRNCMP_IFUNC
strong_alias (STRNCMP_Z13, strncmp)
# endif
# if ! HAVE_STRNCMP_C && defined SHARED && IS_IN (libc)
strong_alias (STRNCMP_Z13, __GI_strncmp)
# endif
#endif /* HAVE_STRNCMP_Z13 */

21
sysdeps/s390/multiarch/strncmp.c → sysdeps/s390/strncmp.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-strncmp.h>
#if HAVE_STRNCMP_IFUNC
# define strncmp __redirect_strncmp
/* Omit the strncmp inline definitions because it would redefine strncmp. */
# define __NO_STRING_INLINES
@ -24,8 +26,17 @@
# undef strncmp
# include <ifunc-resolve.h>
s390_vx_libc_ifunc2_redirected (__redirect_strncmp, __strncmp, strncmp)
# if HAVE_STRNCMP_C
extern __typeof (__redirect_strncmp) STRNCMP_C attribute_hidden;
# endif
#else
# include <string/strncmp.c>
#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
# if HAVE_STRNCMP_Z13
extern __typeof (__redirect_strncmp) STRNCMP_Z13 attribute_hidden;
# endif
s390_libc_ifunc_expr (__redirect_strncmp, strncmp,
(HAVE_STRNCMP_Z13 && (hwcap & HWCAP_S390_VX))
? STRNCMP_Z13
: STRNCMP_DEFAULT
)
#endif /* HAVE_STRNCMP_IFUNC */