diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2015-08-26 10:26:20 +0200 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2015-08-26 10:26:20 +0200 |
| commit | fcf40ebe2682fd65d64f94d69a3df798960cf1b7 (patch) | |
| tree | 45b1b3ea6b9a5105a81ca6d7fe351b79a9042eb6 /wcsmbs | |
| parent | 9472f35a0a6dbbda82ce103aaf0f5013f5d46e34 (diff) | |
S390: Optimize strnlen and wcsnlen.
This patch provides optimized versions of strnlen and wcsnlen with the z13
vector instructions.
ChangeLog:
* sysdeps/s390/multiarch/strnlen-c.c: New File.
* sysdeps/s390/multiarch/strnlen-vx.S: Likewise.
* sysdeps/s390/multiarch/strnlen.c: Likewise.
* sysdeps/s390/multiarch/wcsnlen-c.c: Likewise.
* sysdeps/s390/multiarch/wcsnlen-vx.S: Likewise.
* sysdeps/s390/multiarch/wcsnlen.c: Likewise.
* sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strnlen and
wcsnlen functions.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Add ifunc test for strnlen, wcsnlen.
* wcsmbs/wcsnlen.c: Use WCSNLEN if defined.
* string/test-strnlen.c: Add wcsnlen support.
* wcsmbs/test-wcsnlen.c: New File.
* wcsmbs/Makefile (strop-tests): Add wcsnlen.
* benchtests/bench-strnlen.c: Add wcsnlen support.
* benchtests/bench-wcsnlen.c: New File.
* benchtests/Makefile (wcsmbs-bench): Add wcsnlen.
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/Makefile | 2 | ||||
| -rw-r--r-- | wcsmbs/test-wcsnlen.c | 20 | ||||
| -rw-r--r-- | wcsmbs/wcsnlen.c | 7 |
3 files changed, 27 insertions, 2 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 44a4494403..3858d7416f 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -42,7 +42,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ isoc99_swscanf isoc99_vswscanf \ mbrtoc16 c16rtomb -strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy +strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests)) diff --git a/wcsmbs/test-wcsnlen.c b/wcsmbs/test-wcsnlen.c new file mode 100644 index 0000000000..262ab3081f --- /dev/null +++ b/wcsmbs/test-wcsnlen.c @@ -0,0 +1,20 @@ +/* Test wcsnlen function. + Copyright (C) 2015 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 WIDE 1 +#include "../string/test-strnlen.c" diff --git a/wcsmbs/wcsnlen.c b/wcsmbs/wcsnlen.c index 2bee7057e3..e928ab6961 100644 --- a/wcsmbs/wcsnlen.c +++ b/wcsmbs/wcsnlen.c @@ -18,8 +18,11 @@ #include <wchar.h> +#ifdef WCSNLEN +# define __wcsnlen WCSNLEN +#endif -/* Copy SRC to DEST. */ +/* Return length of string S at most maxlen. */ size_t __wcsnlen (s, maxlen) const wchar_t *s; @@ -44,4 +47,6 @@ __wcsnlen (s, maxlen) return len; } +#ifndef WCSNLEN weak_alias (__wcsnlen, wcsnlen) +#endif |