qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: Remove POWER7 strncasecmp optimization 

These routines are not extensively used (gnulib documentation even
recommend use a replacement [1]), and there is already a POWER8
version that uses proper vectorized instructions.

[1] https://www.gnu.org/software/gnulib/manual/gnulib.html#C-strings

Checked with a build for some powerpc variations.
Reviewed-by: Peter Bergner <bergner@linux.ibm.com>
This commit is contained in:
Adhemerval Zanella 2025-05-02 09:07:36 -03:00
parent 3270c50e48
commit ac4e838289
12 changed files with 4 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
View File

@ -6,12 +6,9 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
memchr-ppc32 memrchr-power7 memrchr-ppc32 rawmemchr-power7 \ memchr-ppc32 memrchr-power7 memrchr-ppc32 rawmemchr-power7 \
rawmemchr-ppc32 strlen-power7 strlen-ppc32 strnlen-power7 \ rawmemchr-ppc32 strlen-power7 strlen-ppc32 strnlen-power7 \
strnlen-ppc32 \ strnlen-ppc32 \
strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \ strcasecmp-power7 strcasecmp_l-power7 \
strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \ strchrnul-power7 strchrnul-ppc32 \
strchr-power7 strchr-ppc32 \ strchr-power7 strchr-ppc32 \
wordcopy-power7 wordcopy-ppc32 \ wordcopy-power7 wordcopy-ppc32 \
memmove-power7 memmove-ppc memmove-power7 memmove-ppc
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
endif endif

15
sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c
View File

@ -138,21 +138,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1, IFUNC_IMPL_ADD (array, i, strcasecmp_l, 1,
__strcasecmp_l_ppc)) __strcasecmp_l_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c. */
IFUNC_IMPL (i, name, strncasecmp,
IFUNC_IMPL_ADD (array, i, strncasecmp,
hwcap & PPC_FEATURE_HAS_VSX,
__strncasecmp_power7)
IFUNC_IMPL_ADD (array, i, strncasecmp, 1, __strncasecmp_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c. */
IFUNC_IMPL (i, name, strncasecmp_l,
IFUNC_IMPL_ADD (array, i, strncasecmp_l,
hwcap & PPC_FEATURE_HAS_VSX,
__strncasecmp_l_power7)
IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
__strncasecmp_l_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c. */ /* Support sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c. */
IFUNC_IMPL (i, name, strchrnul, IFUNC_IMPL (i, name, strchrnul,
IFUNC_IMPL_ADD (array, i, strchrnul, IFUNC_IMPL_ADD (array, i, strchrnul,

26
sysdeps/powerpc/powerpc32/power4/multiarch/strncase-power7.c
View File

@ -1,26 +0,0 @@
/* Optimized strcasecmp_l implementation for POWER7.
Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#include <string.h>
#define __strncasecmp __strncasecmp_power7
extern __typeof (strncasecmp) __strncasecmp_power7 attribute_hidden;
#include <string/strncase.c>

41
sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c
View File

@ -1,41 +0,0 @@
/* Multiple versions of strncasecmp.
Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#if IS_IN (libc)
# include <string.h>
# define strncasecmp __strncasecmp_ppc
extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden;
extern __typeof (__strncasecmp) __strncasecmp_power7 attribute_hidden;
#endif
#include <string/strncase.c>
#undef strncasecmp
#if IS_IN (libc)
# include <shlib-compat.h>
# include "init-arch.h"
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
extern __typeof (__strncasecmp) __libc_strncasecmp;
libc_ifunc (__libc_strncasecmp,
(hwcap & PPC_FEATURE_HAS_VSX)
? __strncasecmp_power7
: __strncasecmp_ppc);
weak_alias (__libc_strncasecmp, strncasecmp)
#endif

26
sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l-power7.c
View File

@ -1,26 +0,0 @@
/* Optimized strcasecmp_l implementation for POWER7.
Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#include <string.h>
#define __strncasecmp_l __strncasecmp_l_power7
#define USE_IN_EXTENDED_LOCALE_MODEL 1
extern __typeof (strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
#include <string/strncase.c>

42
sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c
View File

@ -1,42 +0,0 @@
/* Multiple versions of strncasecmp_l.
Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#if IS_IN (libc)
# include <string.h>
# define strncasecmp_l __strncasecmp_l_ppc
extern __typeof (__strncasecmp_l) __strncasecmp_l_ppc attribute_hidden;
extern __typeof (__strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
#endif
#include <string/strncase_l.c>
#undef strncasecmp_l
#if IS_IN (libc)
# include <shlib-compat.h>
# include "init-arch.h"
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
extern __typeof (__strncasecmp_l) __libc_strncasecmp_l;
libc_ifunc (__libc_strncasecmp_l,
(hwcap & PPC_FEATURE_HAS_VSX)
? __strncasecmp_l_power7
: __strncasecmp_l_ppc);
weak_alias (__libc_strncasecmp_l, strncasecmp_l)
#endif

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

@ -11,7 +11,6 @@ sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \
strlen-power7 strlen-ppc64 \ strlen-power7 strlen-ppc64 \
strnlen-power8 strnlen-power7 strnlen-ppc64 \ strnlen-power8 strnlen-power7 strnlen-ppc64 \
strcasecmp-power7 strcasecmp_l-power7 \ strcasecmp-power7 strcasecmp_l-power7 \
strncase-power7 strncase_l-power7 \
strncmp-power8 strncmp-ppc64 \ strncmp-power8 strncmp-ppc64 \
strchr-power8 strchr-power7 strchr-ppc64 \ strchr-power8 strchr-power7 strchr-ppc64 \
strchrnul-power8 strchrnul-power7 strchrnul-ppc64 \ strchrnul-power8 strchrnul-power7 strchrnul-ppc64 \
@ -38,8 +37,6 @@ sysdep_routines += memchr-power10 memcmp-power10 memcpy-power10 \
stpcpy-power9 strlen-power9 strncpy-power9 stpncpy-power9 \ stpcpy-power9 strlen-power9 strncpy-power9 stpncpy-power9 \
strlen-power10 strlen-power10
endif endif
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
endif endif
# Called during static initialization # Called during static initialization

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

@ -311,19 +311,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
hwcap2 & PPC_FEATURE2_ARCH_2_07 hwcap2 & PPC_FEATURE2_ARCH_2_07
&& hwcap & PPC_FEATURE_HAS_ALTIVEC, && hwcap & PPC_FEATURE_HAS_ALTIVEC,
__strncasecmp_power8) __strncasecmp_power8)
IFUNC_IMPL_ADD (array, i, strncasecmp,
hwcap & PPC_FEATURE_ARCH_2_06,
__strncasecmp_power7)
IFUNC_IMPL_ADD (array, i, strncasecmp, 1, __strncasecmp_ppc)) IFUNC_IMPL_ADD (array, i, strncasecmp, 1, __strncasecmp_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/strncase_l.c. */
IFUNC_IMPL (i, name, strncasecmp_l,
IFUNC_IMPL_ADD (array, i, strncasecmp_l,
hwcap & PPC_FEATURE_ARCH_2_06,
__strncasecmp_l_power7)
IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
__strncasecmp_l_ppc))
/* Support sysdeps/powerpc/powerpc64/multiarch/strrchr.c. */ /* Support sysdeps/powerpc/powerpc64/multiarch/strrchr.c. */
IFUNC_IMPL (i, name, strrchr, IFUNC_IMPL (i, name, strrchr,
IFUNC_IMPL_ADD (array, i, strrchr, IFUNC_IMPL_ADD (array, i, strrchr,

24
sysdeps/powerpc/powerpc64/multiarch/strncase-power7.c
View File

@ -1,24 +0,0 @@
/* Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#include <string.h>
#define __strncasecmp __strncasecmp_power7
extern __typeof (strncasecmp) __strncasecmp_power7 attribute_hidden;
#include <string/strncase.c>

7
sysdeps/powerpc/powerpc64/multiarch/strncase.c
View File

@ -23,15 +23,12 @@
extern __typeof (__strncasecmp) __libc_strncasecmp; extern __typeof (__strncasecmp) __libc_strncasecmp;
extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden; extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden;
extern __typeof (__strncasecmp) __strncasecmp_power7 attribute_hidden;
extern __typeof (__strncasecmp) __strncasecmp_power8 attribute_hidden; extern __typeof (__strncasecmp) __strncasecmp_power8 attribute_hidden;
libc_ifunc (__libc_strncasecmp, libc_ifunc (__libc_strncasecmp,
(hwcap2 & PPC_FEATURE2_ARCH_2_07 (hwcap2 & PPC_FEATURE2_ARCH_2_07
&& hwcap & PPC_FEATURE_HAS_ALTIVEC) && hwcap & PPC_FEATURE_HAS_ALTIVEC)
? __strncasecmp_power8: ? __strncasecmp_power8
(hwcap & PPC_FEATURE_ARCH_2_06) : __strncasecmp_ppc);
? __strncasecmp_power7
: __strncasecmp_ppc);
weak_alias (__libc_strncasecmp, strncasecmp) weak_alias (__libc_strncasecmp, strncasecmp)

30
sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c
View File

@ -1,30 +0,0 @@
/* Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#include <string.h>
#define __strncasecmp_l __strncasecmp_l_power7
#undef weak_alias
#define weak_alias(a,b)
#undef libc_hidden_def
#define libc_hidden_def(name)
extern __typeof (strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
#include <string/strncase_l.c>

42
sysdeps/powerpc/powerpc64/multiarch/strncase_l.c
View File

@ -1,42 +0,0 @@
/* Multiple versions of strncasecmp_l
Copyright (C) 2013-2025 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
<https://www.gnu.org/licenses/>. */
#if IS_IN (libc)
# include <string.h>
# define strncasecmp_l __strncasecmp_l_ppc
extern __typeof (__strncasecmp_l) __strncasecmp_l_ppc attribute_hidden;
extern __typeof (__strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
#endif
#include <string/strncase_l.c>
#undef strncasecmp_l
#if IS_IN (libc)
# include <shlib-compat.h>
# include "init-arch.h"
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
extern __typeof (__strncasecmp_l) __libc_strncasecmp_l;
libc_ifunc (__libc_strncasecmp_l,
(hwcap & PPC_FEATURE_ARCH_2_06)
? __strncasecmp_l_power7
: __strncasecmp_l_ppc);
weak_alias (__libc_strncasecmp_l, strncasecmp_l)
#endif