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

powerpc: Add powerpc64 strpbrk optimization 

This patch makes the POWER7 optimized strpbrk generic by using
default doubleword stores to zero the hash, instead of VSX
instructions.  Performance on POWER7/POWER8 does not change.
This commit is contained in:
Adhemerval Zanella 2014-11-19 16:27:56 -05:00
parent bb2542e0ae
commit 0f0a1c82f5
7 changed files with 35 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,14 @@
2014-12-02 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
Remove strpbrk objects.
* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Remove strpbrk implementation.
* sysdeps/powerpc/powerpc64/multiarch/strpbrk-ppc64.c: Remove file.
* sysdeps/powerpc/powerpc64/multiarch/strpbrk.c: Remove file.
* sysdeps/powerpc/powerpc64/power7/strpbrk.S: Remove file.
* sysdeps/powerpc/powerpc64/strpbrk.S: New file.
* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
Remove strcspn objects.
* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c

2
sysdeps/powerpc/powerpc64/multiarch/Makefile
View File

@ -15,7 +15,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \
strcpy-power7 strcpy-ppc64 stpcpy-power7 stpcpy-ppc64 \
strrchr-power7 strrchr-ppc64 strncat-power7 strncat-ppc64 \
strpbrk-power7 strpbrk-ppc64 strncpy-power7 strncpy-ppc64 \
strncpy-power7 strncpy-ppc64 \
stpncpy-power7 stpncpy-ppc64 strcmp-power7 strcmp-ppc64 \
strcat-power7 strcat-ppc64 memmove-power7 memmove-ppc64 \
bcopy-ppc64

8
sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
View File

@ -272,14 +272,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, strncat, 1,
__strncat_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/strpbrk.c. */
IFUNC_IMPL (i, name, strpbrk,
IFUNC_IMPL_ADD (array, i, strpbrk,
hwcap & PPC_FEATURE_HAS_VSX,
__strpbrk_power7)
IFUNC_IMPL_ADD (array, i, strpbrk, 1,
__strpbrk_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/strncpy.c. */
IFUNC_IMPL (i, name, strncpy,
IFUNC_IMPL_ADD (array, i, strncpy,

40
sysdeps/powerpc/powerpc64/multiarch/strpbrk-power7.S
View File

@ -1,40 +0,0 @@
/* Optimized strpbrk implementation for POWER7.
Copyright (C) 2014 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 <sysdep.h>
#undef EALIGN
#define EALIGN(name, alignt, words) \
.section ".text"; \
ENTRY_2(__strpbrk_power7) \
.align ALIGNARG(alignt); \
EALIGN_W_##words; \
BODY_LABEL(__strpbrk_power7): \
cfi_startproc; \
LOCALENTRY(__strpbrk_power7)
#undef END
#define END(name) \
cfi_endproc; \
TRACEBACK(__strpbrk_power7) \
END_2(__strpbrk_power7)
#undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name)
#include <sysdeps/powerpc/powerpc64/power7/strpbrk.S>

30
sysdeps/powerpc/powerpc64/multiarch/strpbrk-ppc64.c
View File

@ -1,30 +0,0 @@
/* Copyright (C) 2014 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 <string.h>
#define STRPBRK __strpbrk_ppc
#ifdef SHARED
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__strpbrk_ppc, __GI_strpbrk, __strpbrk_ppc);
#endif
extern __typeof (strpbrk) __strpbrk_ppc attribute_hidden;
#include <string/strpbrk.c>

31
sysdeps/powerpc/powerpc64/multiarch/strpbrk.c
View File

@ -1,31 +0,0 @@
/* Multiple versions of strpbrk. PowerPC64 version.
Copyright (C) 2014 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 IS_IN (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (strpbrk) __strpbrk_ppc attribute_hidden;
extern __typeof (strpbrk) __strpbrk_power7 attribute_hidden;
libc_ifunc (strpbrk,
(hwcap & PPC_FEATURE_HAS_VSX)
? __strpbrk_power7
: __strpbrk_ppc);
#endif

61
sysdeps/powerpc/powerpc64/power7/strpbrk.S → sysdeps/powerpc/powerpc64/strpbrk.S
View File

@ -1,4 +1,4 @@
/* Optimized strpbrk implementation for PowerPC64/POWER7.
/* Optimized strpbrk implementation for PowerPC64.
Copyright (C) 2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -20,7 +20,6 @@
/* char [r3] *strpbrk(const char [r4] *s, const char [r5] *accept) */
.machine power7
EALIGN (strpbrk, 4, 0)
CALL_MCOUNT 3
@ -32,43 +31,31 @@ EALIGN (strpbrk, 4, 0)
for fast check if input character should be considered. For ASCII
or ISO-8859-X character sets it has 256 positions. */
/* First the table should be cleared and to avoid unaligned accesses
when using the VSX stores the table address is aligned to 16
bytes. */
xxlxor v0,v0,v0
/* PPC64 ELF ABI stack is aligned to 16 bytes */
/* PPC64 ELF ABI stack is aligned to 16 bytes. */
addi r9,r1,-256
li r5,16
li r6,32
li r8,48
addi r12,r9,64
/* Clear the table with 0 values */
stxvw4x v0,r0,r9
addi r11,r9,128
addi r7,r9,192
stxvw4x v0,r9,r5
li r0,1
stxvw4x v0,r9,r6
stxvw4x v0,r9,r8
stxvw4x v0,r0,r12
stxvw4x v0,r12,r5
stxvw4x v0,r12,r6
stxvw4x v0,r12,r8
stxvw4x v0,r0,r11
stxvw4x v0,r11,r5
stxvw4x v0,r11,r6
stxvw4x v0,r11,r8
stxvw4x v0,r0,r7
stxvw4x v0,r7,r5
stxvw4x v0,r7,r6
stxvw4x v0,r7,r8
li r6, 0
li r7, 4
mtctr r7
mr r8, r9
.align 4
L(zerohash):
std r6, 0(r8)
std r6, 8(r8)
std r6, 16(r8)
std r6, 24(r8)
std r6, 32(r8)
std r6, 40(r8)
std r6, 48(r8)
std r6, 56(r8)
addi r8, r8, 64
bdnz L(zerohash)
/* Initialize the table as:
for (i=0; accept[i]; i++
table[accept[i]]] = 1 */
.p2align 4,,15
li r0,1
.align 4
L(init_table):
stbx r0,r9,r10
lbzu r10,1(r4)
@ -93,7 +80,7 @@ L(finish_table):
if (table[input[i++]] == 1)
return (s[i -1] ? s + i - 1: NULL);
} */
.p2align 4
.align 4
L(unroll):
lbz r0,1(r3)
lbzx r8,r9,r0
@ -121,7 +108,7 @@ L(mainloop):
L(end):
blr
.p2align 4
.align 4
L(checkend):
cmpdi cr1,r12,0
mr r3,r7
@ -131,14 +118,14 @@ L(nullfound):
li 3,0
blr
.p2align 4
.align 4
L(checkend2):
cmpdi cr7,r0,0
mr r3,r11
beq cr7,L(nullfound)
blr
.p2align 4
.align 4
L(checkend3):
cmpdi cr6,r10,0
mr r3,r5