Re: [PATCH 19/21] PowerPC: multiarch wordcopy support for PPC64

[Steven Munroe <munroesj at linux dot vnet dot ibm dot comcom>]

On Tue, 2013-12-10 at 10:30 -0200, Adhemerval Zanella wrote:
> 2013-12-09  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
> 
> 	* 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.
> 
> --
> 
> diff --git a/string/wordcopy.c b/string/wordcopy.c
> index 726894b..51c1fad 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;

Expected to see these macros defined for power6/power7 somewhere in this
patch, but I don't see that. Where does this happen?


> diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
> index 3a787ef..b118022 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 0000000..671d6d9
> --- /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 <http://www.gnu.org/licenses/>.  */
> +
> +#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c
> new file mode 100644
> index 0000000..fb69050
> --- /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 <http://www.gnu.org/licenses/>.  */
> +
> +#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power7.c>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
> new file mode 100644
> index 0000000..c5830a6
> --- /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
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c>
> diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
> new file mode 100644
> index 0000000..78233dc
> --- /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
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#ifndef NOT_IN_libc
> +# include <stddef.h>
> +# include <memcopy.h>
> +# include <shlib-compat.h>
> +# 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 <sysdeps/powerpc/power4/wordcopy.c>
> +#endif
>