picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ARM: Make multiarch memcpy always use NEON when compiler does

Browse source
This commit is contained in:
Roland McGrath 2013-05-13 15:41:46 -07:00
parent 68fc074ca0
commit 5d5ef5dbfc
5 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ports/ChangeLog.arm
View file

@ -1,3 +1,15 @@
2013-05-13 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/armv7/multiarch/memcpy.S [__ARM_NEON__]: Don't define
memcpy here, just __memcpy_arm and __aeabi_memcpy*.
* sysdeps/arm/armv7/multiarch/memcpy_neon.S [__ARM_NEON__]:
Define memcpy here, not __memcpy_neon.
* sysdeps/arm/armv7/multiarch/memcpy_vfp.S [__ARM_NEON__]:
Define nothing here.
* sysdeps/arm/armv7/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list) [__ARM_NEON__]: Don't list __memcpy_vfp;
use memcpy name for NEON implementation.
2013-05-08 Will Newton <will.newton@linaro.org>
* sysdeps/arm/armv7/multiarch/Makefile: New file.

9
ports/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c
View file

@ -35,9 +35,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL (i, name, memcpy,
IFUNC_IMPL_ADD (array, i, memcpy, hwcap & HWCAP_ARM_NEON,
__memcpy_neon)
#ifdef __ARM_NEON__
memcpy
#else
__memcpy_neon
#endif
)
#ifndef __ARM_NEON__
IFUNC_IMPL_ADD (array, i, memcpy, hwcap & HWCAP_ARM_VFP,
__memcpy_vfp)
#endif
IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_arm));
return i;

15
ports/sysdeps/arm/armv7/multiarch/memcpy.S
View file

@ -22,27 +22,29 @@
#include <sysdep.h>
#include <rtld-global-offsets.h>
#if !defined NOT_IN_libc
#ifndef NOT_IN_libc
/* Under __ARM_NEON__, memcpy_neon.S defines the name memcpy. */
# ifndef __ARM_NEON__
.text
ENTRY(memcpy)
.type memcpy, %gnu_indirect_function
#ifdef __SOFTFP__
# ifdef __SOFTFP__
ldr r1, .Lmemcpy_arm
tst r0, #HWCAP_ARM_VFP
ldrne r1, .Lmemcpy_vfp
#else
# else
ldr r1, .Lmemcpy_vfp
#endif
# endif
tst r0, #HWCAP_ARM_NEON
ldrne r1, .Lmemcpy_neon
1:
add r0, r1, pc
DO_RET(lr)
#ifdef __SOFTFP__
# ifdef __SOFTFP__
.Lmemcpy_arm:
.long C_SYMBOL_NAME(__memcpy_arm) - 1b - PC_OFS
#endif
# endif
.Lmemcpy_neon:
.long C_SYMBOL_NAME(__memcpy_neon) - 1b - PC_OFS
.Lmemcpy_vfp:
@ -51,6 +53,7 @@ ENTRY(memcpy)
END(memcpy)
libc_hidden_builtin_def (memcpy)
#endif /* Not __ARM_NEON__. */
/* These versions of memcpy are defined not to clobber any VFP or NEON
registers so they must always call the ARM variant of the memcpy code. */

8
ports/sysdeps/arm/armv7/multiarch/memcpy_neon.S
View file

@ -1,3 +1,9 @@
#ifdef __ARM_NEON__
/* Under __ARM_NEON__, this file defines memcpy directly. */
libc_hidden_builtin_def (memcpy)
#else
# define memcpy __memcpy_neon
#endif
#define MEMCPY_NEON
#define memcpy __memcpy_neon
#include "memcpy_impl.S"

10
ports/sysdeps/arm/armv7/multiarch/memcpy_vfp.S
View file

@ -1,3 +1,7 @@
#define MEMCPY_VFP
#define memcpy __memcpy_vfp
#include "memcpy_impl.S"
/* Under __ARM_NEON__, memcpy_neon.S defines memcpy directly
and the __memcpy_vfp code will never be used. */
#ifndef __ARM_NEON__
# define MEMCPY_VFP
# define memcpy __memcpy_vfp
# include "memcpy_impl.S"
#endif