AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

S390: Refactor wcsnlen ifunc handling.

Browse Source 
The ifunc handling for wcsnlen 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.
Glibc internal calls will use the "newer" ifunc variant.

ChangeLog:

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

3
sysdeps/s390/Makefile
View File

@ -83,5 +83,6 @@ sysdep_routines += bzero memset memset-z900 \
endif
ifeq ($(subdir),wcsmbs)
sysdep_routines += wcslen wcslen-vx wcslen-c
sysdep_routines += wcslen wcslen-vx wcslen-c \
wcsnlen wcsnlen-vx wcsnlen-c
endif

53
sysdeps/s390/ifunc-wcsnlen.h Normal file
View File

@ -0,0 +1,53 @@
/* wcsnlen 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_WCSNLEN_IFUNC 1
#else
# define HAVE_WCSNLEN_IFUNC 0
#endif
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT HAVE_WCSNLEN_IFUNC
#else
# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT 0
#endif
#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
# define WCSNLEN_DEFAULT WCSNLEN_Z13
/* The z13 ifunc variant is using the common code variant as fallback! */
# define HAVE_WCSNLEN_C 1
# define HAVE_WCSNLEN_Z13 1
#else
# define WCSNLEN_DEFAULT WCSNLEN_C
# define HAVE_WCSNLEN_C 1
# define HAVE_WCSNLEN_Z13 HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT
#endif
#if HAVE_WCSNLEN_C
# define WCSNLEN_C __wcsnlen_c
#else
# define WCSNLEN_C NULL
#endif
#if HAVE_WCSNLEN_Z13
# define WCSNLEN_Z13 __wcsnlen_vx
#else
# define WCSNLEN_Z13 NULL
#endif

3
sysdeps/s390/multiarch/Makefile
View File

@ -1,6 +1,5 @@
ifeq ($(subdir),wcsmbs)
sysdep_routines += wcsnlen wcsnlen-vx wcsnlen-c \
wcscpy wcscpy-vx wcscpy-c \
sysdep_routines += wcscpy wcscpy-vx wcscpy-c \
wcpcpy wcpcpy-vx wcpcpy-c \
wcsncpy wcsncpy-vx wcsncpy-c \
wcpncpy wcpncpy-vx wcpncpy-c \

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

@ -47,6 +47,7 @@
#include <ifunc-memccpy.h>
#include <ifunc-memrchr.h>
#include <ifunc-wcslen.h>
#include <ifunc-wcsnlen.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@ -437,6 +438,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_WCSLEN_IFUNC */
#if HAVE_WCSNLEN_IFUNC
IFUNC_IMPL (i, name, wcsnlen,
# if HAVE_WCSNLEN_Z13
IFUNC_IMPL_ADD (array, i, wcsnlen,
dl_hwcap & HWCAP_S390_VX, WCSNLEN_Z13)
# endif
# if HAVE_WCSNLEN_C
IFUNC_IMPL_ADD (array, i, wcsnlen, 1, WCSNLEN_C)
# endif
)
#endif /* HAVE_WCSNLEN_IFUNC */
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@ -445,8 +458,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 (wcsnlen);
IFUNC_VX_IMPL (wcscpy);
IFUNC_VX_IMPL (wcpcpy);

10
sysdeps/s390/multiarch/wcsnlen-c.c → sysdeps/s390/wcsnlen-c.c
View File

@ -16,10 +16,12 @@
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 WCSNLEN __wcsnlen_c
#include <ifunc-wcsnlen.h>
#if HAVE_WCSNLEN_C
# if HAVE_WCSNLEN_IFUNC || HAVE_WCSNLEN_Z13
# define WCSNLEN WCSNLEN_C
# endif
# include <wchar.h>
extern __typeof (__wcsnlen) __wcsnlen_c;
# include <wcsmbs/wcsnlen.c>
#endif

16
sysdeps/s390/multiarch/wcsnlen-vx.S → sysdeps/s390/wcsnlen-vx.S
View File

@ -16,7 +16,8 @@
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-wcsnlen.h>
#if HAVE_WCSNLEN_Z13
# include "sysdep.h"
# include "asm-syntax.h"
@ -34,7 +35,7 @@
-r5=current_len and return_value
-v16=part of s
*/
ENTRY(__wcsnlen_vx)
ENTRY(WCSNLEN_Z13)
.machine "z13"
.machinemode "zarch_nohighgprs"
@ -146,6 +147,11 @@ ENTRY(__wcsnlen_vx)
j .Llt64
.Lfallback:
jg __wcsnlen_c
END(__wcsnlen_vx)
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
jg WCSNLEN_C
END(WCSNLEN_Z13)
# if ! HAVE_WCSNLEN_IFUNC
strong_alias (WCSNLEN_Z13, __wcsnlen)
weak_alias (__wcsnlen, wcsnlen)
# endif
#endif

23
sysdeps/s390/multiarch/wcsnlen.c → sysdeps/s390/wcsnlen.c
View File

@ -16,13 +16,24 @@
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-wcsnlen.h>
#if HAVE_WCSNLEN_IFUNC
# include <wchar.h>
# include <ifunc-resolve.h>
s390_vx_libc_ifunc (__wcsnlen)
weak_alias (__wcsnlen, wcsnlen)
# if HAVE_WCSNLEN_C
extern __typeof (__wcsnlen) WCSNLEN_C attribute_hidden;
# endif
#else
# include <wcsmbs/wcsnlen.c>
#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
# if HAVE_WCSNLEN_Z13
extern __typeof (__wcsnlen) WCSNLEN_Z13 attribute_hidden;
# endif
s390_libc_ifunc_expr (__wcsnlen, __wcsnlen,
(HAVE_WCSNLEN_Z13 && (hwcap & HWCAP_S390_VX))
? WCSNLEN_Z13
: WCSNLEN_DEFAULT
)
weak_alias (__wcsnlen, wcsnlen)
#endif