From e28bcd427b21b6c74021ca65736dd66474b09013 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 13 Dec 2013 14:54:08 -0500 Subject: PowerPC: multiarch wordcopy for PowerPC64 --- ChangeLog | 17 +++++ string/wordcopy.c | 36 +++++---- sysdeps/powerpc/powerpc64/multiarch/Makefile | 5 +- .../powerpc/powerpc64/multiarch/wordcopy-power6.c | 19 +++++ .../powerpc/powerpc64/multiarch/wordcopy-power7.c | 19 +++++ .../powerpc/powerpc64/multiarch/wordcopy-ppc64.c | 18 +++++ sysdeps/powerpc/powerpc64/multiarch/wordcopy.c | 86 ++++++++++++++++++++++ 7 files changed, 183 insertions(+), 17 deletions(-) create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy.c diff --git a/ChangeLog b/ChangeLog index 036548d1b6..ca6bd1bca6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2013-12-13 Adhemerval Zanella + + * string/wordcopy.c (_wordcopy_fwd_aligned): Add define to + redefine function name. + (_wordcopy_fwd_dest_aligned): Likewise. + (_wordcopy_bwd_aligned): Likewise. + (_wordcopy_bwd_dest_aligned): Likewise. + * sysdeps/powerpc/powerpc64/multiarch/Makefile: Add wordcopy + multiarch implementations. + * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c + (__libc_ifunc_impl_list): Likewise. + * sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c: New file. + * sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c: New file. + * sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c: New file. + * sysdeps/powerpc/powerpc64/multiarch/wordcopy.c : New file: + multiarch wcscpy for PPC64. + 2013-12-13 Adhemerval Zanella * sysdeps/powerpc/powerpc64/multiarch/Makefile: Add wcscpy diff --git a/string/wordcopy.c b/string/wordcopy.c index 726894b6e4..51c1fad0ec 100644 --- a/string/wordcopy.c +++ b/string/wordcopy.c @@ -26,11 +26,12 @@ block beginning at DSTP with LEN `op_t' words (not LEN bytes!). Both SRCP and DSTP should be aligned for memory operations on `op_t's. */ +#ifndef WORDCOPY_FWD_ALIGNED +# define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned +#endif + void -_wordcopy_fwd_aligned (dstp, srcp, len) - long int dstp; - long int srcp; - size_t len; +WORDCOPY_FWD_ALIGNED (long int dstp, long int srcp, size_t len) { op_t a0, a1; @@ -134,11 +135,12 @@ _wordcopy_fwd_aligned (dstp, srcp, len) DSTP should be aligned for memory operations on `op_t's, but SRCP must *not* be aligned. */ +#ifndef WORDCOPY_FWD_DEST_ALIGNED +# define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned +#endif + void -_wordcopy_fwd_dest_aligned (dstp, srcp, len) - long int dstp; - long int srcp; - size_t len; +WORDCOPY_FWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len) { op_t a0, a1, a2, a3; int sh_1, sh_2; @@ -221,11 +223,12 @@ _wordcopy_fwd_dest_aligned (dstp, srcp, len) (not LEN bytes!). Both SRCP and DSTP should be aligned for memory operations on `op_t's. */ +#ifndef WORDCOPY_BWD_ALIGNED +# define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned +#endif + void -_wordcopy_bwd_aligned (dstp, srcp, len) - long int dstp; - long int srcp; - size_t len; +WORDCOPY_BWD_ALIGNED (long int dstp, long int srcp, size_t len) { op_t a0, a1; @@ -329,11 +332,12 @@ _wordcopy_bwd_aligned (dstp, srcp, len) words (not LEN bytes!). DSTP should be aligned for memory operations on `op_t', but SRCP must *not* be aligned. */ +#ifndef WORDCOPY_BWD_DEST_ALIGNED +# define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned +#endif + void -_wordcopy_bwd_dest_aligned (dstp, srcp, len) - long int dstp; - long int srcp; - size_t len; +WORDCOPY_BWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len) { op_t a0, a1, a2, a3; int sh_1, sh_2; diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile index 3a787ef47e..b1180224fe 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile @@ -11,7 +11,8 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strncmp-power4 strncmp-ppc64 strchr-power7 strchr-ppc64 \ strchrnul-power7 strchrnul-ppc64 wcschr-power7 \ wcschr-power6 wcschr-ppc64 wcsrchr-power7 wcsrchr-power6 \ - wcsrchr-ppc64 wcscpy-power7 wcscpy-power6 wcscpy-ppc64 + wcsrchr-ppc64 wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \ + wordcopy-power7 wordcopy-power6 wordcopy-ppc64 CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops @@ -21,4 +22,6 @@ CFLAGS-wcsrchr-power7.c += -mcpu=power7 CFLAGS-wcsrchr-power6.c += -mcpu=power6 CFLAGS-wcscpy-power7.c += -mcpu=power7 CFLAGS-wcscpy-power6.c += -mcpu=power6 +CFLAGS-wordcopy-power7.c += -mcpu=power7 +CFLAGS-wordcopy-power6.c += -mcpu=power6 endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c new file mode 100644 index 0000000000..671d6d9564 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c @@ -0,0 +1,19 @@ +/* wordcopy routines for powerpc64/power6. + 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; see the file COPYING.LIB. If + not, see . */ + +#include diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c new file mode 100644 index 0000000000..fb690503c7 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c @@ -0,0 +1,19 @@ +/* wordcopy routines for powerpc64/power7. + 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; see the file COPYING.LIB. If + not, see . */ + +#include diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c new file mode 100644 index 0000000000..c5830a63f1 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c @@ -0,0 +1,18 @@ +/* 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 + . */ + +#include diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c new file mode 100644 index 0000000000..78233dce66 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c @@ -0,0 +1,86 @@ +/* Multiple versions of wordcopy functions. + 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 + . */ + +#ifndef NOT_IN_libc +# include +# include +# include +# include "init-arch.h" + +extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc +attribute_hidden; +extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6 +attribute_hidden; +extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7 +attribute_hidden; + +libc_ifunc (_wordcopy_fwd_aligned, + (hwcap & PPC_FEATURE_HAS_VSX) + ? _wordcopy_fwd_aligned_power7 : + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_fwd_aligned_power6 + : _wordcopy_fwd_aligned_ppc); + + +extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc +attribute_hidden; +extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6 +attribute_hidden; +extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7 +attribute_hidden; + +libc_ifunc (_wordcopy_fwd_dest_aligned, + (hwcap & PPC_FEATURE_HAS_VSX) + ? _wordcopy_fwd_dest_aligned_power7 : + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_fwd_dest_aligned_power6 + : _wordcopy_fwd_dest_aligned_ppc); + + +extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc +attribute_hidden; +extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6 +attribute_hidden; +extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7 +attribute_hidden; + +libc_ifunc (_wordcopy_bwd_aligned, + (hwcap & PPC_FEATURE_HAS_VSX) + ? _wordcopy_bwd_aligned_power7 : + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_bwd_aligned_power6 + : _wordcopy_bwd_aligned_ppc); + + +extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc +attribute_hidden; +extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6 +attribute_hidden; +extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7 +attribute_hidden; + +libc_ifunc (_wordcopy_bwd_dest_aligned, + (hwcap & PPC_FEATURE_HAS_VSX) + ? _wordcopy_bwd_dest_aligned_power7 : + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_bwd_dest_aligned_power6 + : _wordcopy_bwd_dest_aligned_ppc); + +#else +#include +#endif -- cgit v1.2.3