x86-64: Move wcsnlen.S to multiarch/wcsnlen-sse4_1.S
Since wcsnlen.S uses pminud which is the part of SSE4.1, move wcsnlen.S to multiarch/wcsnlen-sse4_1.S. * sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add wcsnlen-sse4_1 and wcsnlen-c. * sysdeps/x86_64/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Test __wcsnlen_sse4_1 and __wcsnlen_sse2. * sysdeps/x86_64/multiarch/ifunc-sse4_1.h: New file. * sysdeps/x86_64/multiarch/wcsnlen-c.c: Likewise. * sysdeps/x86_64/multiarch/wcsnlen-sse4_1.S: Likewise. * sysdeps/x86_64/multiarch/wcsnlen.c: Likewise. * sysdeps/x86_64/wcsnlen.S: Removed.
This commit is contained in:
H.J. Lu
parent
4bf7abaeb3
commit
d4cc385c6e
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2017-06-06 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add
|
||||
wcsnlen-sse4_1 and wcsnlen-c.
|
||||
* sysdeps/x86_64/multiarch/ifunc-impl-list.c
|
||||
(__libc_ifunc_impl_list): Test __wcsnlen_sse4_1 and
|
||||
__wcsnlen_sse2.
|
||||
* sysdeps/x86_64/multiarch/ifunc-sse4_1.h: New file.
|
||||
* sysdeps/x86_64/multiarch/wcsnlen-c.c: Likewise.
|
||||
* sysdeps/x86_64/multiarch/wcsnlen-sse4_1.S: Likewise.
|
||||
* sysdeps/x86_64/multiarch/wcsnlen.c: Likewise.
|
||||
* sysdeps/x86_64/wcsnlen.S: Removed.
|
||||
|
||||
2017-06-06 Stefan Liebler <stli@linux.vnet.ibm.com>
|
||||
|
||||
* sysdeps/s390/nptl/pthread_spin_init.c: Delete File.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@ endif
|
|||
ifeq ($(subdir),wcsmbs)
|
||||
sysdep_routines += wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c \
|
||||
wmemcmp-avx2-movbe \
|
||||
wcscpy-ssse3 wcscpy-c
|
||||
wcscpy-ssse3 wcscpy-c \
|
||||
wcsnlen-sse4_1 wcsnlen-c
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),debug)
|
||||
|
|
|
|||
|
|
@ -296,6 +296,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|||
__wcscpy_ssse3)
|
||||
IFUNC_IMPL_ADD (array, i, wcscpy, 1, __wcscpy_sse2))
|
||||
|
||||
/* Support sysdeps/x86_64/multiarch/wcsnlen.c. */
|
||||
IFUNC_IMPL (i, name, wcsnlen,
|
||||
IFUNC_IMPL_ADD (array, i, wcsnlen,
|
||||
HAS_CPU_FEATURE (SSE4_1),
|
||||
__wcsnlen_sse4_1)
|
||||
IFUNC_IMPL_ADD (array, i, wcsnlen, 1, __wcsnlen_sse2))
|
||||
|
||||
/* Support sysdeps/x86_64/multiarch/wmemcmp.S. */
|
||||
IFUNC_IMPL (i, name, wmemcmp,
|
||||
IFUNC_IMPL_ADD (array, i, wmemcmp,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
/* Common definition for ifunc selections optimized with SSE2 and SSE4.1.
|
||||
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 <init-arch.h>
|
||||
|
||||
extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden;
|
||||
extern __typeof (REDIRECT_NAME) OPTIMIZE (sse4_1) attribute_hidden;
|
||||
|
||||
static inline void *
|
||||
IFUNC_SELECTOR (void)
|
||||
{
|
||||
const struct cpu_features* cpu_features = __get_cpu_features ();
|
||||
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, SSE4_1))
|
||||
return OPTIMIZE (sse4_1);
|
||||
|
||||
return OPTIMIZE (sse2);
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#if IS_IN (libc)
|
||||
# include <wchar.h>
|
||||
|
||||
# define WCSNLEN __wcsnlen_sse2
|
||||
|
||||
extern __typeof (wcsnlen) __wcsnlen_sse2;
|
||||
#endif
|
||||
|
||||
#include "wcsmbs/wcsnlen.c"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
#define AS_WCSLEN
|
||||
#define AS_STRNLEN
|
||||
#define strlen __wcsnlen_sse4_1
|
||||
|
||||
#include "../strlen.S"
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
/* Multiple versions of wcsnlen.
|
||||
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/>. */
|
||||
|
||||
/* Define multiple versions only for the definition in libc. */
|
||||
#if IS_IN (libc)
|
||||
# define __wcsnlen __redirect_wcsnlen
|
||||
# include <wchar.h>
|
||||
# undef __wcsnlen
|
||||
|
||||
# define SYMBOL_NAME wcsnlen
|
||||
# include "ifunc-sse4_1.h"
|
||||
|
||||
libc_ifunc_redirected (__redirect_wcsnlen, __wcsnlen, IFUNC_SELECTOR ());
|
||||
weak_alias (__wcsnlen, wcsnlen);
|
||||
#endif
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#define AS_WCSLEN
|
||||
#define AS_STRNLEN
|
||||
#define strlen __wcsnlen
|
||||
|
||||
#include "strlen.S"
|
||||
|
||||
weak_alias(__wcsnlen, wcsnlen)
|
||||
Loading…
Reference in New Issue