mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

S390: Refactor wmemset ifunc handling.

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

3
sysdeps/s390/Makefile
View File

@ -99,5 +99,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
wcsspn wcsspn-vx wcsspn-c \
wcspbrk wcspbrk-vx wcspbrk-c \
wcscspn wcscspn-vx wcscspn-c \
wmemchr wmemchr-vx wmemchr-c
wmemchr wmemchr-vx wmemchr-c \
wmemset wmemset-vx wmemset-c
endif

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

@ -0,0 +1,53 @@
/* wmemset 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_WMEMSET_IFUNC 1
#else
# define HAVE_WMEMSET_IFUNC 0
#endif
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define HAVE_WMEMSET_IFUNC_AND_VX_SUPPORT HAVE_WMEMSET_IFUNC
#else
# define HAVE_WMEMSET_IFUNC_AND_VX_SUPPORT 0
#endif
#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
# define WMEMSET_DEFAULT WMEMSET_Z13
/* The z13 ifunc variant is using the common code variant as fallback! */
# define HAVE_WMEMSET_C 1
# define HAVE_WMEMSET_Z13 1
#else
# define WMEMSET_DEFAULT WMEMSET_C
# define HAVE_WMEMSET_C 1
# define HAVE_WMEMSET_Z13 HAVE_WMEMSET_IFUNC_AND_VX_SUPPORT
#endif
#if HAVE_WMEMSET_C
# define WMEMSET_C __wmemset_c
#else
# define WMEMSET_C NULL
#endif
#if HAVE_WMEMSET_Z13
# define WMEMSET_Z13 __wmemset_vx
#else
# define WMEMSET_Z13 NULL
#endif

3
sysdeps/s390/multiarch/Makefile
View File

@ -1,6 +1,5 @@
ifeq ($(subdir),wcsmbs)
sysdep_routines += wmemset wmemset-vx wmemset-c \
wmemcmp wmemcmp-vx wmemcmp-c
sysdep_routines += wmemcmp wmemcmp-vx wmemcmp-c
endif
ifeq ($(subdir),iconvdata)

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

@ -63,6 +63,7 @@
#include <ifunc-wcspbrk.h>
#include <ifunc-wcscspn.h>
#include <ifunc-wmemchr.h>
#include <ifunc-wmemset.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@ -645,6 +646,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_WMEMCHR_IFUNC */
#if HAVE_WMEMSET_IFUNC
IFUNC_IMPL (i, name, wmemset,
# if HAVE_WMEMSET_Z13
IFUNC_IMPL_ADD (array, i, wmemset,
dl_hwcap & HWCAP_S390_VX, WMEMSET_Z13)
# endif
# if HAVE_WMEMSET_C
IFUNC_IMPL_ADD (array, i, wmemset, 1, WMEMSET_C)
# endif
)
#endif /* HAVE_WMEMSET_IFUNC */
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@ -653,8 +666,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 (wmemset);
IFUNC_VX_IMPL (wmemcmp);
#endif /* HAVE_S390_VX_ASM_SUPPORT */

37
sysdeps/s390/multiarch/wmemset-c.c → sysdeps/s390/wmemset-c.c
View File

@ -16,22 +16,29 @@
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 WMEMSET __wmemset_c
#include <ifunc-wmemset.h>
# include <wchar.h>
extern __typeof (__wmemset) __wmemset_c;
# undef weak_alias
# define weak_alias(name, alias)
# ifdef SHARED
# undef libc_hidden_def
# define libc_hidden_def(name) \
__hidden_ver1 (__wmemset_c, __GI___wmemset, __wmemset_c);
# undef libc_hidden_weak
# define libc_hidden_weak(name) \
#if HAVE_WMEMSET_C
# if HAVE_WMEMSET_IFUNC || HAVE_WMEMSET_Z13
# define WMEMSET WMEMSET_C
# undef weak_alias
# define weak_alias(name, alias)
# if defined SHARED && IS_IN (libc)
# undef libc_hidden_weak
# define libc_hidden_weak(name)
# undef libc_hidden_def
# if ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
# define libc_hidden_def(name) \
__hidden_ver1 (__wmemset_c, __GI_wmemset, __wmemset_c) __attribute__((weak)); \
strong_alias (__wmemset_c, __wmemset_c_1); \
__hidden_ver1 (__wmemset_c_1, __GI_wmemset, __wmemset_c_1);
# endif /* SHARED */
__hidden_ver1 (__wmemset_c_1, __GI___wmemset, __wmemset_c_1);
# else
# define libc_hidden_def(name)
# endif
# endif
# endif
# include <wcsmbs/wmemset.c>
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
#endif

22
sysdeps/s390/multiarch/wmemset-vx.S → sysdeps/s390/wmemset-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-wmemset.h>
#if HAVE_WMEMSET_Z13
# include "sysdep.h"
# include "asm-syntax.h"
@ -38,7 +39,7 @@
-v17,v18,v19=copy of v16 for vstm
-v31=saved dest for return
*/
ENTRY(__wmemset_vx)
ENTRY(WMEMSET_Z13)
.machine "z13"
.machinemode "zarch_nohighgprs"
@ -137,6 +138,17 @@ ENTRY(__wmemset_vx)
br %r14
.Lfallback:
srlg %r4,%r4,2 /* Convert byte-count to character-count. */
jg __wmemset_c
END(__wmemset_vx)
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
jg WMEMSET_C
END(WMEMSET_Z13)
# if ! HAVE_WMEMSET_IFUNC
strong_alias (WMEMSET_Z13, __wmemset)
weak_alias (__wmemset, wmemset)
# endif
# if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT \
&& defined SHARED && IS_IN (libc)
strong_alias (WMEMSET_Z13, __GI___wmemset)
weak_alias (WMEMSET_Z13, __GI_wmemset)
# endif
#endif

23
sysdeps/s390/multiarch/wmemset.c → sysdeps/s390/wmemset.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-wmemset.h>
#if HAVE_WMEMSET_IFUNC
# define wmemset __redirect_wmemset
# define __wmemset __redirect___wmemset
# include <wchar.h>
@ -24,9 +26,18 @@
# undef __wmemset
# include <ifunc-resolve.h>
s390_vx_libc_ifunc_redirected (__redirect___wmemset, __wmemset)
weak_alias (__wmemset, wmemset)
# if HAVE_WMEMSET_C
extern __typeof (__redirect___wmemset) WMEMSET_C attribute_hidden;
# endif
#else
# include <wcsmbs/wmemset.c>
#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
# if HAVE_WMEMSET_Z13
extern __typeof (__redirect___wmemset) WMEMSET_Z13 attribute_hidden;
# endif
s390_libc_ifunc_expr (__redirect___wmemset, __wmemset,
(HAVE_WMEMSET_Z13 && (hwcap & HWCAP_S390_VX))
? WMEMSET_Z13
: WMEMSET_DEFAULT
)
weak_alias (__wmemset, wmemset)
#endif