|
 |
bca718 |
Backport of:
|
|
|
bca718 |
commit 94c9680945369d63ef9ed266a29f28ebaaaeb5ce
|
|
|
bca718 |
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
bca718 |
Date: Tue Dec 23 13:36:34 2014 -0500
|
|
|
bca718 |
|
|
|
bca718 |
powerpc: Optimized strcat for POWER8/PPC64
|
|
|
bca718 |
|
|
|
bca718 |
With new optimized strcpy for POWER8, this patch adds an optimized
|
|
|
bca718 |
strcat which uses it along with default implementation at strings/.
|
|
|
bca718 |
|
|
|
bca718 |
ChangeLog:
|
|
|
bca718 |
2015-01-13 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
bca718 |
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: Add
|
|
|
bca718 |
strncat-power8 object.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/strcat.c (strcat): Add
|
|
|
bca718 |
__strcat_power8 implementation.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
bca718 |
(__libc_ifunc_impl_list): Add __strcat_power8 implementation.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c: New file:
|
|
|
bca718 |
optimized strcat for power8.
|
|
|
bca718 |
|
|
|
bca718 |
and its dependency:
|
|
|
bca718 |
|
|
|
bca718 |
commit bc8ea38590070604006399e42469087e943fc8ec
|
|
|
bca718 |
Author: Vidya Ranganathan <vidya@linux.vnet.ibm.com>
|
|
|
bca718 |
Date: Wed Jun 11 22:21:20 2014 -0500
|
|
|
bca718 |
|
|
|
bca718 |
PowerPC: strcat optimization for PPC64/POWER7
|
|
|
bca718 |
|
|
|
bca718 |
This patch adds an ifunc power7 strcat symbol that uses the logic on
|
|
|
bca718 |
sysdeps/powerpc/strcat.c but call power7 strlen/strcpy symbols instead
|
|
|
bca718 |
of default ones.
|
|
|
bca718 |
|
|
|
bca718 |
ChangeLog:
|
|
|
bca718 |
|
|
|
bca718 |
2014-07-02 Vidya Ranganathan <vidya@linux.vnet.ibm.com>
|
|
|
bca718 |
Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
bca718 |
|
|
|
bca718 |
* sysdeps/powerpc/strcat.c: Using macro to redefine symbol name.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/Makefile: Add strcat multiarch
|
|
|
bca718 |
optimizations.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c:
|
|
|
bca718 |
(__libc_ifunc_impl_list): Likewise.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/strcat.c: New file:
|
|
|
bca718 |
multiarch strcat for PPC64.
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c: New file/
|
|
|
bca718 |
* sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c: New file.
|
|
|
bca718 |
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
bca718 |
index 1cdd5d6..7ebfc7e 100644
|
|
|
bca718 |
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
bca718 |
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
bca718 |
@@ -6,6 +6,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
|
|
|
bca718 |
mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64 \
|
|
|
bca718 |
memrchr-power7 memrchr-ppc64 rawmemchr-power7 \
|
|
|
bca718 |
stpcpy-power8 stpcpy-power7 stpcpy-ppc64 \
|
|
|
bca718 |
+ strcat-power8 strcat-power7 strcat-ppc64 \
|
|
|
bca718 |
strcpy-power8 strcpy-power7 strcpy-ppc64 \
|
|
|
bca718 |
rawmemchr-ppc64 strlen-power7 strlen-ppc64 strnlen-power7 \
|
|
|
bca718 |
strnlen-ppc64 strcasecmp-power7 strcasecmp_l-power7 \
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
bca718 |
index e89fd3e..4e5bb17 100644
|
|
|
bca718 |
--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
bca718 |
+++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
bca718 |
@@ -211,6 +211,17 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
bca718 |
IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
|
|
|
bca718 |
__strncasecmp_l_ppc))
|
|
|
bca718 |
|
|
|
bca718 |
+ /* Support sysdeps/powerpc/powerpc64/multiarch/strcat.c. */
|
|
|
bca718 |
+ IFUNC_IMPL (i, name, strcat,
|
|
|
bca718 |
+ IFUNC_IMPL_ADD (array, i, strcat,
|
|
|
bca718 |
+ hwcap2 & PPC_FEATURE2_ARCH_2_07,
|
|
|
bca718 |
+ __strcat_power8)
|
|
|
bca718 |
+ IFUNC_IMPL_ADD (array, i, strcat,
|
|
|
bca718 |
+ hwcap & PPC_FEATURE_HAS_VSX,
|
|
|
bca718 |
+ __strcat_power7)
|
|
|
bca718 |
+ IFUNC_IMPL_ADD (array, i, strcat, 1,
|
|
|
bca718 |
+ __strcat_ppc))
|
|
|
bca718 |
+
|
|
|
bca718 |
/* Support sysdeps/powerpc/powerpc64/multiarch/wcschr.c. */
|
|
|
bca718 |
IFUNC_IMPL (i, name, wcschr,
|
|
|
bca718 |
IFUNC_IMPL_ADD (array, i, wcschr,
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c
|
|
|
bca718 |
new file mode 100644
|
|
|
bca718 |
index 0000000..291a720
|
|
|
bca718 |
--- /dev/null
|
|
|
bca718 |
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c
|
|
|
bca718 |
@@ -0,0 +1,31 @@
|
|
|
bca718 |
+/* Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
bca718 |
+ This file is part of the GNU C Library.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
bca718 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
bca718 |
+ License as published by the Free Software Foundation; either
|
|
|
bca718 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
bca718 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
bca718 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
bca718 |
+ Lesser General Public License for more details.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
bca718 |
+ License along with the GNU C Library; if not, see
|
|
|
bca718 |
+ <http://www.gnu.org/licenses/ >. */
|
|
|
bca718 |
+
|
|
|
bca718 |
+#include <string.h>
|
|
|
bca718 |
+
|
|
|
bca718 |
+#define STRCAT __strcat_power7
|
|
|
bca718 |
+
|
|
|
bca718 |
+#undef libc_hidden_def
|
|
|
bca718 |
+#define libc_hidden_def(name)
|
|
|
bca718 |
+
|
|
|
bca718 |
+extern typeof (strcpy) __strcpy_power7;
|
|
|
bca718 |
+extern typeof (strlen) __strlen_power7;
|
|
|
bca718 |
+
|
|
|
bca718 |
+#define strcpy __strcpy_power7
|
|
|
bca718 |
+#define strlen __strlen_power7
|
|
|
bca718 |
+
|
|
|
bca718 |
+#include <sysdeps/powerpc/strcat.c>
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
|
|
|
bca718 |
new file mode 100644
|
|
|
bca718 |
index 0000000..6c7544c
|
|
|
bca718 |
--- /dev/null
|
|
|
bca718 |
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
|
|
|
bca718 |
@@ -0,0 +1,30 @@
|
|
|
bca718 |
+/* Copyright (C) 2015 Free Software Foundation, Inc.
|
|
|
bca718 |
+ This file is part of the GNU C Library.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
bca718 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
bca718 |
+ License as published by the Free Software Foundation; either
|
|
|
bca718 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
bca718 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
bca718 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
bca718 |
+ Lesser General Public License for more details.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
bca718 |
+ License along with the GNU C Library; if not, see
|
|
|
bca718 |
+ <http://www.gnu.org/licenses/ >. */
|
|
|
bca718 |
+
|
|
|
bca718 |
+#include <string.h>
|
|
|
bca718 |
+
|
|
|
bca718 |
+#define STRCAT __strcat_power8
|
|
|
bca718 |
+
|
|
|
bca718 |
+#undef libc_hidden_def
|
|
|
bca718 |
+#define libc_hidden_def(name)
|
|
|
bca718 |
+
|
|
|
bca718 |
+extern typeof (strcpy) __strcpy_power8;
|
|
|
bca718 |
+extern typeof (strlen) __strlen_power7;
|
|
|
bca718 |
+
|
|
|
bca718 |
+#define strcpy __strcpy_power8
|
|
|
bca718 |
+#define strlen __strlen_power7
|
|
|
bca718 |
+#include <sysdeps/powerpc/strcat.c>
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c
|
|
|
bca718 |
new file mode 100644
|
|
|
bca718 |
index 0000000..1245764
|
|
|
bca718 |
--- /dev/null
|
|
|
bca718 |
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c
|
|
|
bca718 |
@@ -0,0 +1,29 @@
|
|
|
bca718 |
+/* Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
bca718 |
+ This file is part of the GNU C Library.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
bca718 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
bca718 |
+ License as published by the Free Software Foundation; either
|
|
|
bca718 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
bca718 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
bca718 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
bca718 |
+ Lesser General Public License for more details.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
bca718 |
+ License along with the GNU C Library; if not, see
|
|
|
bca718 |
+ <http://www.gnu.org/licenses/ >. */
|
|
|
bca718 |
+
|
|
|
bca718 |
+#include <string.h>
|
|
|
bca718 |
+
|
|
|
bca718 |
+#define STRCAT __strcat_ppc
|
|
|
bca718 |
+#ifdef SHARED
|
|
|
bca718 |
+# undef libc_hidden_builtin_def
|
|
|
bca718 |
+# define libc_hidden_builtin_def(name) \
|
|
|
bca718 |
+ __hidden_ver1 (__strcat_ppc, __GI_strcat, __strcat_ppc);
|
|
|
bca718 |
+#endif
|
|
|
bca718 |
+
|
|
|
bca718 |
+extern __typeof (strcat) __strcat_ppc attribute_hidden;
|
|
|
bca718 |
+
|
|
|
bca718 |
+#include <sysdeps/powerpc/strcat.c>
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat.c b/sysdeps/powerpc/powerpc64/multiarch/strcat.c
|
|
|
bca718 |
new file mode 100644
|
|
|
bca718 |
index 0000000..847a62d
|
|
|
bca718 |
--- /dev/null
|
|
|
bca718 |
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat.c
|
|
|
bca718 |
@@ -0,0 +1,31 @@
|
|
|
bca718 |
+/* Multiple versions of strcat. PowerPC64 version.
|
|
|
bca718 |
+ Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
bca718 |
+ This file is part of the GNU C Library.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
bca718 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
bca718 |
+ License as published by the Free Software Foundation; either
|
|
|
bca718 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
bca718 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
bca718 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
bca718 |
+ Lesser General Public License for more details.
|
|
|
bca718 |
+
|
|
|
bca718 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
bca718 |
+ License along with the GNU C Library; if not, see
|
|
|
bca718 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
bca718 |
+
|
|
|
bca718 |
+#ifndef NOT_IN_libc
|
|
|
bca718 |
+# include <string.h>
|
|
|
bca718 |
+# include <shlib-compat.h>
|
|
|
bca718 |
+# include "init-arch.h"
|
|
|
bca718 |
+
|
|
|
bca718 |
+extern __typeof (strcat) __strcat_ppc attribute_hidden;
|
|
|
bca718 |
+extern __typeof (strcat) __strcat_power7 attribute_hidden;
|
|
|
bca718 |
+
|
|
|
bca718 |
+libc_ifunc (strcat,
|
|
|
bca718 |
+ (hwcap & PPC_FEATURE_HAS_VSX)
|
|
|
bca718 |
+ ? __strcat_power7
|
|
|
bca718 |
+ : __strcat_ppc);
|
|
|
bca718 |
+#endif
|
|
|
bca718 |
diff --git a/sysdeps/powerpc/strcat.c b/sysdeps/powerpc/strcat.c
|
|
|
bca718 |
index 28575d0..393bee6 100644
|
|
|
bca718 |
--- a/sysdeps/powerpc/strcat.c
|
|
|
bca718 |
+++ b/sysdeps/powerpc/strcat.c
|
|
|
bca718 |
@@ -18,13 +18,16 @@
|
|
|
bca718 |
|
|
|
bca718 |
#include <string.h>
|
|
|
bca718 |
|
|
|
bca718 |
-#undef strcat
|
|
|
bca718 |
+#ifndef STRCAT
|
|
|
bca718 |
+# undef strcat
|
|
|
bca718 |
+# define STRCAT strcat
|
|
|
bca718 |
+#endif
|
|
|
bca718 |
|
|
|
bca718 |
/* Append SRC on the end of DEST. */
|
|
|
bca718 |
char *
|
|
|
bca718 |
-strcat (char *dest, const char *src)
|
|
|
bca718 |
+STRCAT(char *dest, const char *src)
|
|
|
bca718 |
{
|
|
|
bca718 |
strcpy (dest + strlen (dest), src);
|
|
|
bca718 |
return dest;
|
|
|
bca718 |
}
|
|
|
bca718 |
-libc_hidden_builtin_def (strcat)
|
|
|
bca718 |
+libc_hidden_builtin_def (STRCAT)
|