Re: [PATCH 23/25] sparc: refactor cpu_relax to C

[Adhemerval Zanella <adhemerval.zanella@linaro.org>]

If no one opposes it, I will commit it shortly. 

On 26/10/2017 17:06, Adhemerval Zanella wrote:
> 	* sysdeps/sparc/sparc64/cpu_relax.c: New file.
> 	* sysdeps/sparc/sparc32/sparcv9/cpu_relax.c: Likewise.
> 	* sysdeps/sparc/sparc64/cpu_relax.S: Remove file.
> 	* sysdeps/sparc/sparc32/sparcv9/cpu_relax.S: Likewise.
> 
> Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
>  ChangeLog                                 |  5 +++
>  sysdeps/sparc/sparc32/sparcv9/cpu_relax.S |  1 -
>  sysdeps/sparc/sparc32/sparcv9/cpu_relax.c |  1 +
>  sysdeps/sparc/sparc64/cpu_relax.S         | 67 -------------------------------
>  sysdeps/sparc/sparc64/cpu_relax.c         | 38 ++++++++++++++++++
>  5 files changed, 44 insertions(+), 68 deletions(-)
>  delete mode 100644 sysdeps/sparc/sparc32/sparcv9/cpu_relax.S
>  create mode 100644 sysdeps/sparc/sparc32/sparcv9/cpu_relax.c
>  delete mode 100644 sysdeps/sparc/sparc64/cpu_relax.S
>  create mode 100644 sysdeps/sparc/sparc64/cpu_relax.c
> 
> diff --git a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S
> deleted file mode 100644
> index 41a5e72..0000000
> --- a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/sparc/sparc64/cpu_relax.S>
> diff --git a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.c b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.c
> new file mode 100644
> index 0000000..1670cf6
> --- /dev/null
> +++ b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.c
> @@ -0,0 +1 @@
> +#include <sysdeps/sparc/sparc64/cpu_relax.c>
> diff --git a/sysdeps/sparc/sparc64/cpu_relax.S b/sysdeps/sparc/sparc64/cpu_relax.S
> deleted file mode 100644
> index 5271164..0000000
> --- a/sysdeps/sparc/sparc64/cpu_relax.S
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/* CPU strand yielding for busy loops.
> -   Copyright (C) 2012-2017 Free Software Foundation, Inc.
> -   Contributed by David S. Miller (davem@davemloft.net)
> -   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>
> -
> -	.text
> -__cpu_relax_generic:
> -	rd	%ccr, %g0
> -	rd	%ccr, %g0
> -	rd	%ccr, %g0
> -	retl
> -	 nop
> -	.size	__cpu_relax_generic,.-__cpu_relax_generic
> -
> -__cpu_relax_pause:
> -	wr	%g0, 128, %asr27
> -	retl
> -	 nop
> -	.size	__cpu_relax_pause,.-__cpu_relax_pause
> -
> -ENTRY(__cpu_relax)
> -	.type	__cpu_relax, @gnu_indirect_function
> -# ifdef SHARED
> -	SETUP_PIC_REG_LEAF(o3, o5)
> -# endif
> -	set	HWCAP_SPARC_PAUSE, %o1
> -	andcc	%o0, %o1, %g0
> -	be	1f
> -	 nop
> -# ifdef SHARED
> -	sethi	%gdop_hix22(__cpu_relax_pause), %o1
> -	xor	%o1, %gdop_lox10(__cpu_relax_pause), %o1
> -# else
> -	set	__cpu_relax_pause, %o1
> -# endif
> -	ba	10f
> -	 nop
> -1:
> -# ifdef SHARED
> -	sethi	%gdop_hix22(__cpu_relax_generic), %o1
> -	xor	%o1, %gdop_lox10(__cpu_relax_generic), %o1
> -# else
> -	set	__cpu_relax_generic, %o1
> -# endif
> -10:
> -# ifdef SHARED
> -	add	%o3, %o1, %o1
> -# endif
> -	retl
> -	 mov	%o1, %o0
> -END(__cpu_relax)
> diff --git a/sysdeps/sparc/sparc64/cpu_relax.c b/sysdeps/sparc/sparc64/cpu_relax.c
> new file mode 100644
> index 0000000..388e76c
> --- /dev/null
> +++ b/sysdeps/sparc/sparc64/cpu_relax.c
> @@ -0,0 +1,38 @@
> +/* CPU strand yielding for busy loops.  Linux/sparc64 version.
> +   Copyright (C) 2017 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 <sparc-ifunc.h>
> +
> +static void
> +__cpu_relax_generic (void)
> +{
> +  asm volatile ("rd %ccr, %g0;"
> +		"rd %ccr, %g0;"
> +		"rd %ccr, %g0");
> +}
> +
> +static void
> +__cpu_relax_pause (void)
> +{
> +  asm volatile ("wr %g0, 128, %asr27;");
> +}
> +
> +sparc_libc_ifunc (__cpu_relax,
> +		  hwcap & HWCAP_SPARC_PAUSE
> +		  ? __cpu_relax_pause
> +		  : __cpu_relax_generic)
>