PowerPC: multiarch strchrnul for PowerPC32

This commit is contained in:
Adhemerval Zanella 2013-10-14 09:14:06 -05:00
parent 0d0607d9ab
commit 31c81aaa01
7 changed files with 133 additions and 2 deletions

View File

@ -1,3 +1,18 @@
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* string/strchrnul.c (__strchrnul): Using macro to redefine symbol
name.
* sysdeps/powerpc/powerpc32/power4//multiarch/strchrnul-power7.S: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c: New file:
multiarch strchrnul for PPC32.
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile: Added strchrnul
multiarch objects.
* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list
(__libc_ifunc_impl_list): Likewise.
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power4/multiarch/strncase-power7.c: New

View File

@ -27,9 +27,13 @@
#undef __strchrnul
#undef strchrnul
#ifndef STRCHRNUL
# define STRCHRNUL __strchrnul
#endif
/* Find the first occurrence of C in S or the final NUL byte. */
char *
__strchrnul (s, c_in)
STRCHRNUL (s, c_in)
const char *s;
int c_in;
{

View File

@ -7,7 +7,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
rawmemchr-ppc32 strlen-power7 strlen-ppc32 strnlen-power7 \
strnlen-ppc32 strncmp-power7 strncmp-ppc32 \
strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \
strncase_l-power7
strncase_l-power7 strchrnul-power7 strchrnul-ppc32
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops

View File

@ -165,5 +165,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
__strncasecmp_l_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c. */
IFUNC_IMPL (i, name, strchrnul,
IFUNC_IMPL_ADD (array, i, strchrnul,
hwcap & PPC_FEATURE_HAS_VSX,
__strchrnul_power7)
IFUNC_IMPL_ADD (array, i, strchrnul, 1,
__strchrnul_ppc))
return i;
}

View File

@ -0,0 +1,39 @@
/* Optimized strchrnul implementation for PowerPC32/POWER7 using cmpb insn.
Copyright (C) 2013 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 ENTRY
#define ENTRY(name) \
.globl C_SYMBOL_NAME(__strchrnul_power7); \
.type C_SYMBOL_NAME(__strchrnul_power7),@function; \
C_LABEL(__strchrnul_power7) \
cfi_startproc;
#undef END
#define END(name) \
cfi_endproc; \
ASM_SIZE_DIRECTIVE(__strchrnul_power7)
#undef weak_alias
#define weak_alias(name, alias)
#undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name)
#include <sysdeps/powerpc/powerpc32/power7/strchrnul.S>

View File

@ -0,0 +1,28 @@
/* PowerPC32 default implementation of strchrnul.
Copyright (C) 2013 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 STRCHRNUL __strchrnul_ppc
#undef weak_alias
#define weak_alias(a,b )
extern __typeof (strchrnul) __strchrnul_ppc attribute_hidden;
#include <string/strchrnul.c>

View File

@ -0,0 +1,37 @@
/* Multiple versions of strchrnul.
Copyright (C) 2013 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/>. */
#ifndef NOT_IN_libc
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (__strchrnul) __strchrnul_ppc attribute_hidden;
extern __typeof (__strchrnul) __strchrnul_power7 attribute_hidden;
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
libc_ifunc (__strchrnul,
(hwcap & PPC_FEATURE_HAS_VSX)
? __strchrnul_power7
: __strchrnul_ppc);
weak_alias (__strchrnul, strchrnul)
#else
#include <string/strchrnul.c>
#endif