AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

sparc: Implement memset/bzero ifunc selection in C

Browse Source 
This patch refactor the SPARC64 ifunc selector to a C implementation.
No functional change is expected, including ifunc resolution rules.

Checked on sparc64-linux-gnu, sparcv9-linux-gnu and x86_64-linux-gnu.

	* sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
	[$(subdir) = string] (sysdep_routines): Add memset-ultra1.
	* sysdeps/sparc/sparc64/multiarch/Makefile [$(subdir) = string]
	(sysdep_routines): Add memset-ultra1.
	* sysdeps/sparc/sparc32/sparcv9/multiarch/memset-ultra1.S: New
	file.
	* sysdeps/sparc/sparc32/sparcv9/multiarch/memset.c: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/multiarch/bzero.c: Likewise.
	* sysdeps/sparc/sparc64/multiarch/ifunc-memset.h: Likewise.
	* sysdeps/sparc/sparc64/multiarch/memset-ultra1.S: Likewise.
	* sysdeps/sparc/sparc64/multiarch/memset.c: Likewise.
	* sysdeps/sparc/sparc64/multiarch/bzero.c: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/multiarch/memset.S: Remove file.
	* sysdeps/sparc/sparc64/multiarch/memset.S: Likewise.

Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Adhemerval Zanella 2017-10-03 10:58:29 -03:00
parent 88684de7a6
commit 6905656404
12 changed files with 179 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
2017-11-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
[$(subdir) = string] (sysdep_routines): Add memset-ultra1.
* sysdeps/sparc/sparc64/multiarch/Makefile [$(subdir) = string]
(sysdep_routines): Add memset-ultra1.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memset-ultra1.S: New
file.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memset.c: Likewise.
* sysdeps/sparc/sparc32/sparcv9/multiarch/bzero.c: Likewise.
* sysdeps/sparc/sparc64/multiarch/ifunc-memset.h: Likewise.
* sysdeps/sparc/sparc64/multiarch/memset-ultra1.S: Likewise.
* sysdeps/sparc/sparc64/multiarch/memset.c: Likewise.
* sysdeps/sparc/sparc64/multiarch/bzero.c: Likewise.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memset.S: Remove file.
* sysdeps/sparc/sparc64/multiarch/memset.S: Likewise.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memcpy-ultra1.S: New
file.
* sysdeps/sparc/sparc32/sparcv9/multiarch/memcpy.c: Likewise.

2
sysdeps/sparc/sparc32/sparcv9/multiarch/Makefile
View File

@ -9,5 +9,5 @@ endif
ifeq ($(subdir),string)
sysdep_routines += memcpy-ultra3 memcpy-niagara1 memcpy-niagara2 \
memset-niagara1 memcpy-niagara4 memset-niagara4 \
memcpy-ultra1
memcpy-ultra1 memset-ultra1
endif

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

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

30
sysdeps/sparc/sparc32/sparcv9/multiarch/memset-ultra1.S Normal file
View File

@ -0,0 +1,30 @@
/* Default SPARC memset implementation.
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/>. */
#if IS_IN (libc)
# include <sysdep.h>
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name)
# undef weak_alias
# define weak_alias(x, y)
# define memset __memset_ultra1
# define __bzero __bzero_ultra1
# include <sysdeps/sparc/sparc32/sparcv9/memset.S>
#endif

4
sysdeps/sparc/sparc32/sparcv9/multiarch/memset.S
View File

@ -1,4 +0,0 @@
#define ASI_PNF 0x82
#define ASI_BLK_P 0xf0
#define XCC icc
#include <sparc64/multiarch/memset.S>

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

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

2
sysdeps/sparc/sparc64/multiarch/Makefile
View File

@ -9,7 +9,7 @@ endif
ifeq ($(subdir),string)
sysdep_routines += memcpy-ultra3 memcpy-niagara1 memcpy-niagara2 \
memset-niagara1 memcpy-niagara4 memset-niagara4 \
memcpy-ultra1
memcpy-ultra1 memset-ultra1
endif
ifeq ($(subdir),stdlib)

33
sysdeps/sparc/sparc64/multiarch/bzero.c Normal file
View File

@ -0,0 +1,33 @@
/* Multiple versions of bzero. SPARC64/Linux version.
All versions must be listed in ifunc-impl-list.c.
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/>. */
#if IS_IN (libc)
# define bzero __redirect_bzero
# include <string.h>
# undef bzero
# include <sparc-ifunc.h>
# define SYMBOL_NAME bzero
# include "ifunc-memset.h"
sparc_libc_ifunc_redirected (__redirect_bzero, __bzero, IFUNC_SELECTOR)
weak_alias (__bzero, bzero)
#endif

34
sysdeps/sparc/sparc64/multiarch/ifunc-memset.h Normal file
View File

@ -0,0 +1,34 @@
/* Common definition for memset/bzero implementation.
All versions must be listed in ifunc-impl-list.c.
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 <ifunc-init.h>
extern __typeof (REDIRECT_NAME) OPTIMIZE (niagara4) attribute_hidden;
extern __typeof (REDIRECT_NAME) OPTIMIZE (niagara1) attribute_hidden;
extern __typeof (REDIRECT_NAME) OPTIMIZE (ultra1) attribute_hidden;
static inline void *
IFUNC_SELECTOR (int hwcap)
{
if (hwcap & HWCAP_SPARC_CRYPTO)
return OPTIMIZE (niagara4);
if (hwcap & HWCAP_SPARC_BLKINIT)
return OPTIMIZE (niagara1);
return OPTIMIZE (ultra1);
}

30
sysdeps/sparc/sparc64/multiarch/memset-ultra1.S Normal file
View File

@ -0,0 +1,30 @@
/* Default SPARC64 memset implementation.
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/>. */
#if IS_IN (libc)
# include <sysdep.h>
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name)
# undef weak_alias
# define weak_alias(x, y)
# define memset __memset_ultra1
# define __bzero __bzero_ultra1
# include <sysdeps/sparc/sparc64/memset.S>
#endif

124
sysdeps/sparc/sparc64/multiarch/memset.S
View File

@ -1,124 +0,0 @@
/* Multiple versions of memset and bzero
All versions must be listed in ifunc-impl-list.c.
Copyright (C) 2010-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>
#if IS_IN (libc)
.text
ENTRY(memset)
.type memset, @gnu_indirect_function
# ifdef SHARED
SETUP_PIC_REG_LEAF(o3, o5)
# endif
set HWCAP_SPARC_CRYPTO, %o1
andcc %o0, %o1, %g0
be 1f
andcc %o0, HWCAP_SPARC_BLKINIT, %g0
# ifdef SHARED
sethi %gdop_hix22(__memset_niagara4), %o1
xor %o1, %gdop_lox10(__memset_niagara4), %o1
# else
set __memset_niagara4, %o1
# endif
ba 10f
nop
1: be 9f
nop
# ifdef SHARED
sethi %gdop_hix22(__memset_niagara1), %o1
xor %o1, %gdop_lox10(__memset_niagara1), %o1
# else
set __memset_niagara1, %o1
# endif
ba 10f
nop
9:
# ifdef SHARED
sethi %gdop_hix22(__memset_ultra1), %o1
xor %o1, %gdop_lox10(__memset_ultra1), %o1
# else
set __memset_ultra1, %o1
# endif
10:
# ifdef SHARED
add %o3, %o1, %o1
# endif
retl
mov %o1, %o0
END(memset)
ENTRY(__bzero)
.type bzero, @gnu_indirect_function
# ifdef SHARED
SETUP_PIC_REG_LEAF(o3, o5)
# endif
set HWCAP_SPARC_CRYPTO, %o1
andcc %o0, %o1, %g0
be 1f
andcc %o0, HWCAP_SPARC_BLKINIT, %g0
# ifdef SHARED
sethi %gdop_hix22(__bzero_niagara4), %o1
xor %o1, %gdop_lox10(__bzero_niagara4), %o1
# else
set __bzero_niagara4, %o1
# endif
ba 10f
nop
1: be 9f
nop
# ifdef SHARED
sethi %gdop_hix22(__bzero_niagara1), %o1
xor %o1, %gdop_lox10(__bzero_niagara1), %o1
# else
set __bzero_niagara1, %o1
# endif
ba 10f
nop
9:
# ifdef SHARED
sethi %gdop_hix22(__bzero_ultra1), %o1
xor %o1, %gdop_lox10(__bzero_ultra1), %o1
# else
set __bzero_ultra1, %o1
# endif
10:
# ifdef SHARED
add %o3, %o1, %o1
# endif
retl
mov %o1, %o0
END(__bzero)
weak_alias (__bzero, bzero)
# undef weak_alias
# define weak_alias(a, b)
libc_hidden_builtin_def (memset)
#undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name)
#define memset __memset_ultra1
#define __bzero __bzero_ultra1
#endif
#include "../memset.S"

33
sysdeps/sparc/sparc64/multiarch/memset.c Normal file
View File

@ -0,0 +1,33 @@
/* Multiple versions of memset. SPARC64/Linux version.
All versions must be listed in ifunc-impl-list.c.
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/>. */
#if IS_IN (libc)
# define memset __redirect_memset
# include <string.h>
# undef memset
# include <sparc-ifunc.h>
# define SYMBOL_NAME memset
# include "ifunc-memset.h"
sparc_libc_ifunc_redirected (__redirect_memset, memset, IFUNC_SELECTOR)
sparc_ifunc_redirected_hidden_def (__redirect_memset, memset)
#endif