| From 1a5121cbdc34d9f56bb1bbb3f3ce3a90ddc1ff6b Mon Sep 17 00:00:00 2001 |
| From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com> |
| Date: Wed, 30 Jul 2014 05:55:13 -0500 |
| Subject: [PATCH] PowerPC: multiarch strchr for PowerPC64 |
| |
| commit 372dc060e0a25044ba5a797c71fb0ee53921fe47 |
| Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com> |
| Date: Fri Dec 13 14:49:54 2013 -0500 |
| |
| sysdeps/powerpc/powerpc64/multiarch/Makefile | 2 +- |
| .../powerpc/powerpc64/multiarch/ifunc-impl-list.c | 8 +++++ |
| sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S | 18 ++++++++++ |
| .../powerpc/powerpc64/multiarch/strchr-power7.S | 38 ++++++++++++++++++++ |
| sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S | 41 ++++++++++++++++++++++ |
| sysdeps/powerpc/powerpc64/multiarch/strchr.c | 35 ++++++++++++++++++ |
| 6 files changed, 141 insertions(+), 1 deletion(-) |
| create mode 100644 sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S |
| create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S |
| create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S |
| create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strchr.c |
| |
| diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile |
| index 22baf1c..f7c5853 100644 |
| |
| |
| @@ -8,7 +8,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ |
| rawmemchr-ppc64 strlen-power7 strlen-ppc64 strnlen-power7 \ |
| strnlen-ppc64 strcasecmp-power7 strcasecmp_l-power7 \ |
| strncase-power7 strncase_l-power7 strncmp-power7 \ |
| - strncmp-power4 strncmp-ppc64 |
| + strncmp-power4 strncmp-ppc64 strchr-power7 strchr-ppc64 |
| |
| CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops |
| CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops |
| diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c |
| index 67f75a5..3b005ea 100644 |
| |
| |
| @@ -86,6 +86,14 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, |
| __strncmp_power4) |
| IFUNC_IMPL_ADD (array, i, strncmp, 1, |
| __strncmp_ppc)) |
| + |
| + /* Support sysdeps/powerpc/powerpc64/multiarch/strchr.c. */ |
| + IFUNC_IMPL (i, name, strchr, |
| + IFUNC_IMPL_ADD (array, i, strchr, |
| + hwcap & PPC_FEATURE_HAS_VSX, |
| + __strchr_power7) |
| + IFUNC_IMPL_ADD (array, i, strchr, 1, |
| + __strchr_ppc)) |
| #endif |
| |
| /* Support sysdeps/powerpc/powerpc64/multiarch/memcmp.c. */ |
| diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S |
| new file mode 100644 |
| index 0000000..5c62657 |
| |
| |
| @@ -0,0 +1,18 @@ |
| +/* Copyright (C) 2013-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 <sysdeps/powerpc/powerpc64/strchr.S> |
| diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S |
| new file mode 100644 |
| index 0000000..0b2ca42 |
| |
| |
| @@ -0,0 +1,38 @@ |
| +/* Optimized strchr implementation for POWER7. |
| + Copyright (C) 2013-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 ENTRY |
| +#define ENTRY(name) \ |
| + .section ".text"; \ |
| + ENTRY_2(__strchr_power7) \ |
| + .align ALIGNARG(2); \ |
| + BODY_LABEL(__strchr_power7): \ |
| + cfi_startproc; |
| + |
| +#undef END |
| +#define END(name) \ |
| + cfi_endproc; \ |
| + TRACEBACK(__strchr_power7) \ |
| + END_2(__strchr_power7) |
| + |
| +#undef libc_hidden_builtin_def |
| +#define libc_hidden_builtin_def(name) |
| + |
| +#include <sysdeps/powerpc/powerpc64/power7/strchr.S> |
| diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S |
| new file mode 100644 |
| index 0000000..ded9284 |
| |
| |
| @@ -0,0 +1,41 @@ |
| +/* PowerPC64 default implementation of strchr. |
| + Copyright (C) 2013-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> |
| + |
| +#ifdef SHARED |
| +# undef ENTRY |
| +# define ENTRY(name) \ |
| + .section ".text"; \ |
| + ENTRY_2(__strchr_ppc) \ |
| + .align ALIGNARG(2); \ |
| + BODY_LABEL(__strchr_ppc): \ |
| + cfi_startproc; |
| + |
| +# undef END |
| +# define END(name) \ |
| + cfi_endproc; \ |
| + TRACEBACK(__strchr_ppc) \ |
| + END_2(__strchr_ppc) |
| + |
| +# undef libc_hidden_builtin_def |
| +# define libc_hidden_builtin_def(name) \ |
| + .globl __GI_strchr; __GI_strchr = __strchr_ppc |
| +#endif |
| + |
| +#include <sysdeps/powerpc/powerpc64/strchr.S> |
| diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchr.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchr.c |
| new file mode 100644 |
| index 0000000..74a9d54 |
| |
| |
| @@ -0,0 +1,35 @@ |
| +/* Multiple versions of strchr. |
| + Copyright (C) 2013-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/>. */ |
| + |
| +/* Define multiple versions only for definition in libc. */ |
| +#if defined SHARED && !defined NOT_IN_libc |
| +# include <string.h> |
| +# include <shlib-compat.h> |
| +# include "init-arch.h" |
| + |
| +extern __typeof (strchr) __strchr_ppc attribute_hidden; |
| +extern __typeof (strchr) __strchr_power7 attribute_hidden; |
| + |
| +/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle |
| + ifunc symbol properly. */ |
| +libc_ifunc (strchr, |
| + (hwcap & PPC_FEATURE_HAS_VSX) |
| + ? __strchr_power7 |
| + : __strchr_ppc); |
| +weak_alias (strchr, index) |
| +#endif |
| -- |
| 1.8.3.1 |
| |