Skip to content

Commit

Permalink
S390: Refactor ifunc implementations and enable ifunc-test-framework.
Browse files Browse the repository at this point in the history 
On s390 all ifunc resolvers were implemented in multiarch/ifunc-resolve.c.
The resulting single object files has undefined references to all ifunc-functions.
This patch introduces one multiarch/<func>.c file for each of memcpy, memcmp
and memset with the function specific ifunc resolver. The different function
implementations are now implemented in multiarch/<func>-s390x.S
(moved from multiarch/<func>.S).

The new multiarch/ifunc-resolve.h file contains the ifunc-resolver macro
and other helper-macros. They are merged and are now used in common for
32/64bit. Therefore the __<func>_g5/__<func>_z900 functions were renamed to
__<func>_default.

This patch also enables testing the ifunc implementations by implementing
the function __libc_ifunc_impl_list. It uses the helper-macros of ifunc-resolve.h.

ChangeLog:

	* sysdeps/s390/s390-32/multiarch/Makefile (sysdep_routines):
	Remove ifunc-resolve, add memset-s390, memcpy-s390, memcmp-s390.
	* sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Delete File.
	* sysdeps/s390/s390-32/multiarch/memcmp.S: Move to ...
	* sysdeps/s390/s390-32/multiarch/memcmp-s390.S: ... here.
	(memcmp, bcmp): Use __memcmp_default as alias source.
	* sysdeps/s390/s390-32/multiarch/memcmp.c: New File.
	* sysdeps/s390/s390-32/memcmp.S (__memcmp_g5):
	Rename to __memcmp_default.
	* sysdeps/s390/s390-32/multiarch/memcpy.S: Move to ...
	* sysdeps/s390/s390-32/multiarch/memcpy-s390.S: ... here.
	(memcpy): Use __memcpy_default as alias source.
	* sysdeps/s390/s390-32/multiarch/memcpy.c: New File.
	* sysdeps/s390/s390-32/memcpy.S (__memcpy_g5):
	Rename to __memcpy_default.
	* sysdeps/s390/s390-32/multiarch/memset.S: Move to ...
	* sysdeps/s390/s390-32/multiarch/memset-s390.S: ... here.
	(memset): Use __memset_default as alias source.
	* sysdeps/s390/s390-32/multiarch/memset.c: New File.
	* sysdeps/s390/s390-32/memset.S (__memset_g5):
	Rename to __memset_default.
	* sysdeps/s390/s390-64/multiarch/Makefile (sysdep_routines):
	Remove ifunc-resolve, add memset-s390x, memcpy-s390x, memcmp-s390x.
	* sysdeps/s390/s390-64/multiarch/ifunc-resolve.c: Delete File.
	* sysdeps/s390/s390-64/multiarch/memcmp.S: Move to ...
	* sysdeps/s390/s390-64/multiarch/memcmp-s390x.S: ... here.
	(memcmp, bcmp): Use __memcmp_default as alias source.
	* sysdeps/s390/s390-64/multiarch/memcmp.c: New File.
	* sysdeps/s390/s390-64/memcmp.S (__memcmp_z900):
	Rename to __memcmp_default.
	* sysdeps/s390/s390-64/multiarch/memcpy.S: Move to ...
	* sysdeps/s390/s390-64/multiarch/memcpy-s390x.S: ... here.
	(memcpy): Use __memcpy_default as alias source.
	* sysdeps/s390/s390-64/multiarch/memcpy.c: New File.
	* sysdeps/s390/s390-64/memcpy.S (__memcpy_z900):
	Rename to __memcpy_default.
	* sysdeps/s390/s390-64/multiarch/memset.S: Move to ...
	* sysdeps/s390/s390-64/multiarch/memset-s390x.S: ... here.
	(memset): Use __memset_default as alias source.
	* sysdeps/s390/s390-64/multiarch/memset.c: New File.
	* sysdeps/s390/s390-64/memset.S (__memset_z900):
	Rename to __memset_default.
	* sysdeps/s390/multiarch/ifunc-resolve.h: New File.
	* sysdeps/s390/multiarch/ifunc-impl-list.c: New File.
  • Loading branch information
Stefan Liebler authored and Andreas Krebbel committed Aug 26, 2015
1 parent 5d96fe8 commit 3155624
Show file tree
Hide file tree
Showing 24 changed files with 676 additions and 484 deletions.
47 changes: 47 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

* sysdeps/s390/s390-32/multiarch/Makefile (sysdep_routines):
Remove ifunc-resolve, add memset-s390, memcpy-s390, memcmp-s390.
* sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Delete File.
* sysdeps/s390/s390-32/multiarch/memcmp.S: Move to ...
* sysdeps/s390/s390-32/multiarch/memcmp-s390.S: ... here.
(memcmp, bcmp): Use __memcmp_default as alias source.
* sysdeps/s390/s390-32/multiarch/memcmp.c: New File.
* sysdeps/s390/s390-32/memcmp.S (__memcmp_g5):
Rename to __memcmp_default.
* sysdeps/s390/s390-32/multiarch/memcpy.S: Move to ...
* sysdeps/s390/s390-32/multiarch/memcpy-s390.S: ... here.
(memcpy): Use __memcpy_default as alias source.
* sysdeps/s390/s390-32/multiarch/memcpy.c: New File.
* sysdeps/s390/s390-32/memcpy.S (__memcpy_g5):
Rename to __memcpy_default.
* sysdeps/s390/s390-32/multiarch/memset.S: Move to ...
* sysdeps/s390/s390-32/multiarch/memset-s390.S: ... here.
(memset): Use __memset_default as alias source.
* sysdeps/s390/s390-32/multiarch/memset.c: New File.
* sysdeps/s390/s390-32/memset.S (__memset_g5):
Rename to __memset_default.
* sysdeps/s390/s390-64/multiarch/Makefile (sysdep_routines):
Remove ifunc-resolve, add memset-s390x, memcpy-s390x, memcmp-s390x.
* sysdeps/s390/s390-64/multiarch/ifunc-resolve.c: Delete File.
* sysdeps/s390/s390-64/multiarch/memcmp.S: Move to ...
* sysdeps/s390/s390-64/multiarch/memcmp-s390x.S: ... here.
(memcmp, bcmp): Use __memcmp_default as alias source.
* sysdeps/s390/s390-64/multiarch/memcmp.c: New File.
* sysdeps/s390/s390-64/memcmp.S (__memcmp_z900):
Rename to __memcmp_default.
* sysdeps/s390/s390-64/multiarch/memcpy.S: Move to ...
* sysdeps/s390/s390-64/multiarch/memcpy-s390x.S: ... here.
(memcpy): Use __memcpy_default as alias source.
* sysdeps/s390/s390-64/multiarch/memcpy.c: New File.
* sysdeps/s390/s390-64/memcpy.S (__memcpy_z900):
Rename to __memcpy_default.
* sysdeps/s390/s390-64/multiarch/memset.S: Move to ...
* sysdeps/s390/s390-64/multiarch/memset-s390x.S: ... here.
(memset): Use __memset_default as alias source.
* sysdeps/s390/s390-64/multiarch/memset.c: New File.
* sysdeps/s390/s390-64/memset.S (__memset_z900):
Rename to __memset_default.
* sysdeps/s390/multiarch/ifunc-resolve.h: New File.
* sysdeps/s390/multiarch/ifunc-impl-list.c: New File.

2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

[BZ #18610]
Expand Down
74 changes: 74 additions & 0 deletions sysdeps/s390/multiarch/ifunc-impl-list.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/* Enumerate available IFUNC implementations of a function. s390/s390x version.
Copyright (C) 2015 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/>. */

#include <assert.h>
#include <string.h>
#include <ifunc-impl-list.h>
#include <ifunc-resolve.h>

/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3

/* Fill ARRAY of MAX elements with IFUNC implementations for function
NAME supported on target machine and return the number of valid
entries. */
size_t
__libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
size_t max)
{
assert (max >= MAX_IFUNC);

size_t i = 0;

/* Get hardware information. */
unsigned long int dl_hwcap = GLRO (dl_hwcap);
unsigned long long stfle_bits = 0ULL;
if ((dl_hwcap & HWCAP_S390_STFLE)
&& (dl_hwcap & HWCAP_S390_ZARCH)
&& (dl_hwcap & HWCAP_S390_HIGH_GPRS))
{
S390_STORE_STFLE (stfle_bits);
}

IFUNC_IMPL (i, name, memset,
IFUNC_IMPL_ADD (array, i, memset,
S390_IS_Z196 (stfle_bits), __memset_z196)
IFUNC_IMPL_ADD (array, i, memset,
S390_IS_Z10 (stfle_bits), __memset_z10)
IFUNC_IMPL_ADD (array, i, memset, 1, __memset_default))

IFUNC_IMPL (i, name, memcmp,
IFUNC_IMPL_ADD (array, i, memcmp,
S390_IS_Z196 (stfle_bits), __memcmp_z196)
IFUNC_IMPL_ADD (array, i, memcmp,
S390_IS_Z10 (stfle_bits), __memcmp_z10)
IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_default))

#ifdef SHARED

IFUNC_IMPL (i, name, memcpy,
IFUNC_IMPL_ADD (array, i, memcpy,
S390_IS_Z196 (stfle_bits), __memcpy_z196)
IFUNC_IMPL_ADD (array, i, memcpy,
S390_IS_Z10 (stfle_bits), __memcpy_z10)
IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_default))

#endif /* SHARED */

return i;
}
57 changes: 30 additions & 27 deletions ...ps/s390/s390-32/multiarch/ifunc-resolve.c → sysdeps/s390/multiarch/ifunc-resolve.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* IFUNC resolver function for CPU specific functions.
32 bit S/390 version.
Copyright (C) 2012-2015 Free Software Foundation, Inc.
32/64 bit S/390 version.
Copyright (C) 2015 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
Expand All @@ -20,12 +20,28 @@
#include <unistd.h>
#include <dl-procinfo.h>

#define STFLE_BITS_Z10 34 /* General instructions extension */
#define STFLE_BITS_Z196 45 /* Distinct operands, pop ... */
#define S390_STFLE_BITS_Z10 34 /* General instructions extension */
#define S390_STFLE_BITS_Z196 45 /* Distinct operands, pop ... */

#if IS_IN (libc)
#define S390_IS_Z196(STFLE_BITS) \
((STFLE_BITS & (1ULL << (63 - S390_STFLE_BITS_Z196))) != 0)

#define IFUNC_RESOLVE(FUNC) \
#define S390_IS_Z10(STFLE_BITS) \
((STFLE_BITS & (1ULL << (63 - S390_STFLE_BITS_Z10))) != 0)

#define S390_STORE_STFLE(STFLE_BITS) \
/* We want just 1 double word to be returned. */ \
register unsigned long reg0 asm("0") = 0; \
\
asm volatile(".machine push" "\n\t" \
".machine \"z9-109\"" "\n\t" \
".machinemode \"zarch_nohighgprs\"\n\t" \
"stfle %0" "\n\t" \
".machine pop" "\n" \
: "=QS" (STFLE_BITS), "+d" (reg0) \
: : "cc");

#define s390_libc_ifunc(FUNC) \
asm (".globl " #FUNC "\n\t" \
".type " #FUNC ",@gnu_indirect_function\n\t" \
".set " #FUNC ",__resolve_" #FUNC "\n\t" \
Expand All @@ -36,37 +52,24 @@
to prevent GOT slots being generated for them. */ \
extern void *__##FUNC##_z196 attribute_hidden; \
extern void *__##FUNC##_z10 attribute_hidden; \
extern void *__##FUNC##_g5 attribute_hidden; \
extern void *__##FUNC##_default attribute_hidden; \
\
void *__resolve_##FUNC (unsigned long int dl_hwcap) \
{ \
if ((dl_hwcap & HWCAP_S390_STFLE) \
&& (dl_hwcap & HWCAP_S390_ZARCH) \
&& (dl_hwcap & HWCAP_S390_HIGH_GPRS)) \
{ \
/* We want just 1 double word to be returned. */ \
register unsigned long reg0 asm("0") = 0; \
unsigned long long stfle_bits; \
S390_STORE_STFLE (stfle_bits); \
\
asm volatile(".insn s,0xb2b00000,%0" "\n\t" /* stfle */ \
: "=QS" (stfle_bits), "+d" (reg0) \
: : "cc"); \
\
if ((stfle_bits & (1ULL << (63 - STFLE_BITS_Z196))) != 0) \
if (S390_IS_Z196 (stfle_bits)) \
return &__##FUNC##_z196; \
else if ((stfle_bits & (1ULL << (63 - STFLE_BITS_Z10))) != 0) \
else if (S390_IS_Z10 (stfle_bits)) \
return &__##FUNC##_z10; \
else \
return &__##FUNC##_default; \
} \
return &__##FUNC##_g5; \
else \
return &__##FUNC##_default; \
}

IFUNC_RESOLVE(memset)
IFUNC_RESOLVE(memcmp)
asm(".weak bcmp ; bcmp = memcmp");

/* In the static lib memcpy is needed before the reloc is resolved. */
#ifdef SHARED
IFUNC_RESOLVE(memcpy)
#endif

#endif
46 changes: 23 additions & 23 deletions sysdeps/s390/s390-32/memcmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,38 @@

.text
#ifdef USE_MULTIARCH
ENTRY(__memcmp_g5)
ENTRY(__memcmp_default)
#else
ENTRY(memcmp)
#endif
.machine "g5"
basr %r5,0
basr %r5,0
.L_G5_16:
ltr %r4,%r4
je .L_G5_4
ahi %r4,-1
lr %r1,%r4
srl %r1,8
ltr %r1,%r1
jne .L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r5)
ltr %r4,%r4
je .L_G5_4
ahi %r4,-1
lr %r1,%r4
srl %r1,8
ltr %r1,%r1
jne .L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r5)
.L_G5_4:
ipm %r2
sll %r2,2
sra %r2,30
br %r14
ipm %r2
sll %r2,2
sra %r2,30
br %r14
.L_G5_12:
clc 0(256,%r3),0(%r2)
jne .L_G5_4
la %r3,256(%r3)
la %r2,256(%r2)
brct %r1,.L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r5)
j .L_G5_4
clc 0(256,%r3),0(%r2)
jne .L_G5_4
la %r3,256(%r3)
la %r2,256(%r2)
brct %r1,.L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r5)
j .L_G5_4
.L_G5_17:
clc 0(1,%r3),0(%r2)
clc 0(1,%r3),0(%r2)
#ifdef USE_MULTIARCH
END(__memcmp_g5)
END(__memcmp_default)
#else
END(memcmp)
libc_hidden_builtin_def (memcmp)
Expand Down
50 changes: 25 additions & 25 deletions sysdeps/s390/s390-32/memcpy.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@
%r4 = number of bytes to copy. */

#ifdef USE_MULTIARCH
ENTRY(__memcpy_g5)
ENTRY(__memcpy_default)
#else
ENTRY(memcpy)
#endif
.machine "g5"
st %r13,52(%r15)
.cfi_offset 13, -44
basr %r13,0
st %r13,52(%r15)
.cfi_offset 13, -44
basr %r13,0
.L_G5_16:
ltr %r4,%r4
je .L_G5_4
ahi %r4,-1
lr %r5,%r4
srl %r5,8
ltr %r5,%r5
lr %r1,%r2
jne .L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r13)
ltr %r4,%r4
je .L_G5_4
ahi %r4,-1
lr %r5,%r4
srl %r5,8
ltr %r5,%r5
lr %r1,%r2
jne .L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r13)
.L_G5_4:
l %r13,52(%r15)
br %r14
l %r13,52(%r15)
br %r14
.L_G5_13:
chi %r5,4096 # Switch to mvcle for copies >1MB
jh __memcpy_mvcle
chi %r5,4096 # Switch to mvcle for copies >1MB
jh __memcpy_mvcle
.L_G5_12:
mvc 0(256,%r1),0(%r3)
la %r1,256(%r1)
la %r3,256(%r3)
brct %r5,.L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r13)
j .L_G5_4
mvc 0(256,%r1),0(%r3)
la %r1,256(%r1)
la %r3,256(%r3)
brct %r5,.L_G5_12
ex %r4,.L_G5_17-.L_G5_16(%r13)
j .L_G5_4
.L_G5_17:
mvc 0(1,%r1),0(%r3)
mvc 0(1,%r1),0(%r3)
#ifdef USE_MULTIARCH
END(__memcpy_g5)
END(__memcpy_default)
#else
END(memcpy)
libc_hidden_builtin_def (memcpy)
Expand Down
Loading

0 comments on commit 3155624

Please sign in to comment.