From 07aedd78b095093e866efd4809a80090e2b91a0b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 24 Jun 2014 08:47:52 -0500 Subject: [PATCH] PowerPC: optimized memmove for POWER7/PPC32 This patch adds a optimized memmove for power7 by using the optimized power7 memcpy for forward copying. --- ChangeLog | 9 +++++ .../powerpc32/power4/multiarch/Makefile | 2 +- .../power4/multiarch/memmove-power7.c | 31 +++++++++++++++++ .../powerpc32/power4/multiarch/memmove-ppc.c | 34 +++++++++++++++++++ .../powerpc32/power4/multiarch/memmove.c | 34 +++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c diff --git a/ChangeLog b/ChangeLog index abead376a8..1c1d24b76f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2014-07-07 Adhemerval Zanella + * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile: Add memmove + multiarch objects. + * sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c: New + file: multiarch power7 memmove. + * sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c: New file: + multiarch default memmove. + * sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c: New file: + multiarch memove for powerpc32/power4. + * string/bcopy.c: Use full path to include memmove.c. * sysdeps/powerpc/powerpc64/multiarch/Makefile: Add memmove and bcopy multiarch objects. diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile index a465685494..a7d33b9273 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile @@ -11,7 +11,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \ wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \ wcscpy-power7 wcscpy-power6 wcscpy-ppc32 wordcopy-power7 \ - wordcopy-power6 wordcopy-ppc32 + wordcopy-power6 wordcopy-ppc32 memmove-power7 memmove-ppc CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c new file mode 100644 index 0000000000..2861071bad --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c @@ -0,0 +1,31 @@ +/* Power7 multiarch memmove. + 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; see the file COPYING.LIB. If + not, see . */ + +#include + +extern __typeof (memcpy) __memcpy_power7; +#define memcpy __memcpy_power7 + +extern __typeof (memmove) __memmove_power7; +#define MEMMOVE __memmove_power7 + +#undef libc_hidden_builtin_def +#define libc_hidden_builtin_def(name) + +#define MEMCPY_OK_FOR_FWD_MEMMOVE 1 +#include diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c new file mode 100644 index 0000000000..e323a4d736 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c @@ -0,0 +1,34 @@ +/* Power7 multiarch memmove. + 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; see the file COPYING.LIB. If + not, see . */ + +#include + +extern __typeof (memcpy) __memcpy_ppc; +#define memcpy __memcpy_ppc + +extern __typeof (memmove) __memmove_ppc; +#define MEMMOVE __memmove_ppc + +#if defined SHARED +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(name) \ + __hidden_ver1 (__memmove_ppc, __GI_memmove, __memmove_ppc); +#endif + +#define MEMCPY_OK_FOR_FWD_MEMMOVE 1 +#include diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c new file mode 100644 index 0000000000..10701484ff --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c @@ -0,0 +1,34 @@ +/* Multiple versions of memmove. PowerPC32 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 + . */ + +#if defined SHARED && !defined NOT_IN_libc +/* Redefine memmove so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +# include +# include "init-arch.h" + +extern __typeof (memmove) __memmove_ppc attribute_hidden; +extern __typeof (memmove) __memmove_power7 attribute_hidden; + +libc_ifunc (memmove, + (hwcap & PPC_FEATURE_HAS_VSX) + ? __memmove_power7 + : __memmove_ppc); +#else +# include +#endif