diff options
author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-11-19 15:24:55 -0500 |
---|---|---|
committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-12-02 07:16:24 -0500 |
commit | bb2542e0ae6f82197e804e7e9b78fed461553fc0 (patch) | |
tree | 2e62b412d0e0991663d888dd31b214c0c69b5f5c /sysdeps/powerpc/powerpc64/multiarch | |
parent | 2e8a2de2dafa3238b5b58eecb407af6825a780cd (diff) | |
download | glibc-bb2542e0ae6f82197e804e7e9b78fed461553fc0.tar.gz glibc-bb2542e0ae6f82197e804e7e9b78fed461553fc0.tar.xz glibc-bb2542e0ae6f82197e804e7e9b78fed461553fc0.zip |
powerpc: Add powerpc64 strcspn optimization
This patch makes the POWER7 optimized strcspn generic by using default doubleword stores to zero the hash, instead of VSX instructions. Performance on POWER7/POWER8 does not change.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/multiarch')
-rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/Makefile | 1 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c | 8 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/strcspn-power7.S | 40 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c | 30 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/strcspn.c | 31 |
5 files changed, 0 insertions, 110 deletions
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile index d6de5a539a..05dab25b96 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile @@ -15,7 +15,6 @@ 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 \ - strcspn-power7 strcspn-ppc64 \ strpbrk-power7 strpbrk-ppc64 strncpy-power7 strncpy-ppc64 \ stpncpy-power7 stpncpy-ppc64 strcmp-power7 strcmp-ppc64 \ strcat-power7 strcat-ppc64 memmove-power7 memmove-ppc64 \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c index 4a9e5238dd..1a2e38d5b2 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c +++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c @@ -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/strcspn.c. */ - IFUNC_IMPL (i, name, strcspn, - IFUNC_IMPL_ADD (array, i, strcspn, - hwcap & PPC_FEATURE_HAS_VSX, - __strcspn_power7) - IFUNC_IMPL_ADD (array, i, strcspn, 1, - __strcspn_ppc)) - /* Support sysdeps/powerpc/powerpc64/multiarch/strpbrk.c. */ IFUNC_IMPL (i, name, strpbrk, IFUNC_IMPL_ADD (array, i, strpbrk, diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcspn-power7.S deleted file mode 100644 index 02ffcc89b8..0000000000 --- a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power7.S +++ /dev/null @@ -1,40 +0,0 @@ -/* Optimized strcspn 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(__strcspn_power7) \ - .align ALIGNARG(alignt); \ - EALIGN_W_##words; \ - BODY_LABEL(__strcspn_power7): \ - cfi_startproc; \ - LOCALENTRY(__strcspn_power7) - -#undef END -#define END(name) \ - cfi_endproc; \ - TRACEBACK(__strcspn_power7) \ - END_2(__strcspn_power7) - -#undef libc_hidden_builtin_def -#define libc_hidden_builtin_def(name) - -#include <sysdeps/powerpc/powerpc64/power7/strcspn.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c deleted file mode 100644 index 5f8b61054d..0000000000 --- a/sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c +++ /dev/null @@ -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 STRCSPN __strcspn_ppc -#ifdef SHARED - -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strcspn_ppc, __GI_strcspn, __strcspn_ppc); -#endif - -extern __typeof (strcspn) __strcspn_ppc attribute_hidden; - -#include <string/strcspn.c> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c b/sysdeps/powerpc/powerpc64/multiarch/strcspn.c deleted file mode 100644 index 156fa6aa71..0000000000 --- a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Multiple versions of strcspn. 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 (strcspn) __strcspn_ppc attribute_hidden; -extern __typeof (strcspn) __strcspn_power7 attribute_hidden; - -libc_ifunc (strcspn, - (hwcap & PPC_FEATURE_HAS_VSX) - ? __strcspn_power7 - : __strcspn_ppc); -#endif |