OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sparc: refactor cpu_relax to C 

* 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>
This commit is contained in:
Adhemerval Zanella 2017-10-14 09:47:08 -03:00
parent 1c051a9b09
commit 2a14526bfa
5 changed files with 44 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2017-12-01 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* 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.
* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile
(libm-sysdep_routines): Add s_nearbyintf-generic and
s_nearbyint-generic.

1
sysdeps/sparc/sparc32/sparcv9/cpu_relax.S
View File

@ -1 +0,0 @@
#include <sysdeps/sparc/sparc64/cpu_relax.S>

1
sysdeps/sparc/sparc32/sparcv9/cpu_relax.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/sparc/sparc64/cpu_relax.c>

67
sysdeps/sparc/sparc64/cpu_relax.S
View File

@ -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)

38
sysdeps/sparc/sparc64/cpu_relax.c Normal file
View File

@ -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)