Skip to content

Commit

Permalink
S390: Optimize strnlen and wcsnlen.
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
Stefan Liebler authored and Andreas Krebbel committed Aug 26, 2015
1 parent 9472f35 commit fcf40eb
Show file tree
Hide file tree
Showing 16 changed files with 572 additions and 63 deletions.
20 changes: 20 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

* 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.

2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

* sysdeps/s390/multiarch/Makefile: New File.
Expand Down
2 changes: 1 addition & 1 deletion benchtests/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ string-bench := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \
strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \
strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \
strcoll
wcsmbs-bench := wcslen
wcsmbs-bench := wcslen wcsnlen
string-bench-all := $(string-bench) ${wcsmbs-bench}

# We have to generate locales
Expand Down
71 changes: 46 additions & 25 deletions benchtests/bench-strnlen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,36 @@
<http://www.gnu.org/licenses/>. */

#define TEST_MAIN
#define TEST_NAME "strnlen"
#ifndef WIDE
# define TEST_NAME "strnlen"
#else
# define TEST_NAME "wcsnlen"
#endif /* WIDE */
#include "bench-string.h"

typedef size_t (*proto_t) (const char *, size_t);
size_t simple_strnlen (const char *, size_t);

IMPL (simple_strnlen, 0)
IMPL (strnlen, 1)
#ifndef WIDE
# define STRNLEN strnlen
# define CHAR char
# define BIG_CHAR CHAR_MAX
# define MIDDLE_CHAR 127
# define SIMPLE_STRNLEN simple_strnlen
#else
# include <wchar.h>
# define STRNLEN wcsnlen
# define CHAR wchar_t
# define BIG_CHAR WCHAR_MAX
# define MIDDLE_CHAR 1121
# define SIMPLE_STRNLEN simple_wcsnlen
#endif /* WIDE */

typedef size_t (*proto_t) (const CHAR *, size_t);
size_t SIMPLE_STRNLEN (const CHAR *, size_t);

IMPL (SIMPLE_STRNLEN, 0)
IMPL (STRNLEN, 1)

size_t
simple_strnlen (const char *s, size_t maxlen)
SIMPLE_STRNLEN (const CHAR *s, size_t maxlen)
{
size_t i;

Expand All @@ -36,7 +55,7 @@ simple_strnlen (const char *s, size_t maxlen)
}

static void
do_one_test (impl_t *impl, const char *s, size_t maxlen, size_t exp_len)
do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len)
{
size_t len = CALL (impl, s, maxlen), i, iters = INNER_LOOP_ITERS;
timing_t start, stop, cur;
Expand Down Expand Up @@ -66,18 +85,20 @@ do_test (size_t align, size_t len, size_t maxlen, int max_char)
{
size_t i;

align &= 7;
if (align + len >= page_size)
align &= 63;
if ((align + len) * sizeof (CHAR) >= page_size)
return;

CHAR *buf = (CHAR *) (buf1);

for (i = 0; i < len; ++i)
buf1[align + i] = 1 + 7 * i % max_char;
buf1[align + len] = 0;
buf[align + i] = 1 + 7 * i % max_char;
buf[align + len] = 0;

printf ("Length %4zd, alignment %2zd:", len, align);

FOR_EACH_IMPL (impl, 0)
do_one_test (impl, (char *) (buf1 + align), maxlen, MIN (len, maxlen));
do_one_test (impl, (CHAR *) (buf + align), maxlen, MIN (len, maxlen));

putchar ('\n');
}
Expand All @@ -96,34 +117,34 @@ test_main (void)

for (i = 1; i < 8; ++i)
{
do_test (0, i, i - 1, 127);
do_test (0, i, i, 127);
do_test (0, i, i + 1, 127);
do_test (0, i, i - 1, MIDDLE_CHAR);
do_test (0, i, i, MIDDLE_CHAR);
do_test (0, i, i + 1, MIDDLE_CHAR);
}

for (i = 1; i < 8; ++i)
{
do_test (i, i, i - 1, 127);
do_test (i, i, i, 127);
do_test (i, i, i + 1, 127);
do_test (i, i, i - 1, MIDDLE_CHAR);
do_test (i, i, i, MIDDLE_CHAR);
do_test (i, i, i + 1, MIDDLE_CHAR);
}

for (i = 2; i <= 10; ++i)
{
do_test (0, 1 << i, 5000, 127);
do_test (1, 1 << i, 5000, 127);
do_test (0, 1 << i, 5000, MIDDLE_CHAR);
do_test (1, 1 << i, 5000, MIDDLE_CHAR);
}

for (i = 1; i < 8; ++i)
do_test (0, i, 5000, 255);
do_test (0, i, 5000, BIG_CHAR);

for (i = 1; i < 8; ++i)
do_test (i, i, 5000, 255);
do_test (i, i, 5000, BIG_CHAR);

for (i = 2; i <= 10; ++i)
{
do_test (0, 1 << i, 5000, 255);
do_test (1, 1 << i, 5000, 255);
do_test (0, 1 << i, 5000, BIG_CHAR);
do_test (1, 1 << i, 5000, BIG_CHAR);
}

return ret;
Expand Down
20 changes: 20 additions & 0 deletions benchtests/bench-wcsnlen.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Measure wcsnlen functions.
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 "bench-strnlen.c"
87 changes: 54 additions & 33 deletions string/test-strnlen.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Test and measure strlen functions.
/* Test strlen functions.
Copyright (C) 1999-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Expand All @@ -18,17 +18,36 @@
<http://www.gnu.org/licenses/>. */

#define TEST_MAIN
#define TEST_NAME "strnlen"
#ifndef WIDE
# define TEST_NAME "strnlen"
#else
# define TEST_NAME "wcsnlen"
#endif /* !WIDE */
#include "test-string.h"

typedef size_t (*proto_t) (const char *, size_t);
size_t simple_strnlen (const char *, size_t);

IMPL (simple_strnlen, 0)
IMPL (strnlen, 1)
#ifndef WIDE
# define STRNLEN strnlen
# define CHAR char
# define BIG_CHAR CHAR_MAX
# define MIDDLE_CHAR 127
# define SIMPLE_STRNLEN simple_strnlen
#else
# include <wchar.h>
# define STRNLEN wcsnlen
# define CHAR wchar_t
# define BIG_CHAR WCHAR_MAX
# define MIDDLE_CHAR 1121
# define SIMPLE_STRNLEN simple_wcsnlen
#endif /* !WIDE */

typedef size_t (*proto_t) (const CHAR *, size_t);
size_t SIMPLE_STRNLEN (const CHAR *, size_t);

IMPL (SIMPLE_STRNLEN, 0)
IMPL (STRNLEN, 1)

size_t
simple_strnlen (const char *s, size_t maxlen)
SIMPLE_STRNLEN (const CHAR *s, size_t maxlen)
{
size_t i;

Expand All @@ -37,7 +56,7 @@ simple_strnlen (const char *s, size_t maxlen)
}

static void
do_one_test (impl_t *impl, const char *s, size_t maxlen, size_t exp_len)
do_one_test (impl_t *impl, const CHAR *s, size_t maxlen, size_t exp_len)
{
size_t len = CALL (impl, s, maxlen);
if (len != exp_len)
Expand All @@ -54,23 +73,25 @@ do_test (size_t align, size_t len, size_t maxlen, int max_char)
{
size_t i;

align &= 7;
if (align + len >= page_size)
align &= 63;
if ((align + len) * sizeof (CHAR) >= page_size)
return;

CHAR *buf = (CHAR *) (buf1);

for (i = 0; i < len; ++i)
buf1[align + i] = 1 + 7 * i % max_char;
buf1[align + len] = 0;
buf[align + i] = 1 + 11111 * i % max_char;
buf[align + len] = 0;

FOR_EACH_IMPL (impl, 0)
do_one_test (impl, (char *) (buf1 + align), maxlen, MIN (len, maxlen));
do_one_test (impl, (CHAR *) (buf + align), maxlen, MIN (len, maxlen));
}

static void
do_random_tests (void)
{
size_t i, j, n, align, len;
unsigned char *p = buf1 + page_size - 512;
CHAR *p = (CHAR *) (buf1 + page_size - 512 * sizeof (CHAR));

for (n = 0; n < ITERATIONS; n++)
{
Expand All @@ -97,25 +118,25 @@ do_random_tests (void)
FOR_EACH_IMPL (impl, 1)
{
if (len > 0
&& CALL (impl, (char *) (p + align), len - 1) != len - 1)
&& CALL (impl, (CHAR *) (p + align), len - 1) != len - 1)
{
error (0, 0, "Iteration %zd (limited) - wrong result in function %s (%zd) %zd != %zd, p %p",
n, impl->name, align,
CALL (impl, (char *) (p + align), len - 1), len - 1, p);
CALL (impl, (CHAR *) (p + align), len - 1), len - 1, p);
ret = 1;
}
if (CALL (impl, (char *) (p + align), len) != len)
if (CALL (impl, (CHAR *) (p + align), len) != len)
{
error (0, 0, "Iteration %zd (exact) - wrong result in function %s (%zd) %zd != %zd, p %p",
n, impl->name, align,
CALL (impl, (char *) (p + align), len), len, p);
CALL (impl, (CHAR *) (p + align), len), len, p);
ret = 1;
}
if (CALL (impl, (char *) (p + align), len + 1) != len)
if (CALL (impl, (CHAR *) (p + align), len + 1) != len)
{
error (0, 0, "Iteration %zd (long) - wrong result in function %s (%zd) %zd != %zd, p %p",
n, impl->name, align,
CALL (impl, (char *) (p + align), len + 1), len, p);
CALL (impl, (CHAR *) (p + align), len + 1), len, p);
ret = 1;
}
}
Expand All @@ -136,34 +157,34 @@ test_main (void)

for (i = 1; i < 8; ++i)
{
do_test (0, i, i - 1, 127);
do_test (0, i, i, 127);
do_test (0, i, i + 1, 127);
do_test (0, i, i - 1, MIDDLE_CHAR);
do_test (0, i, i, MIDDLE_CHAR);
do_test (0, i, i + 1, MIDDLE_CHAR);
}

for (i = 1; i < 8; ++i)
{
do_test (i, i, i - 1, 127);
do_test (i, i, i, 127);
do_test (i, i, i + 1, 127);
do_test (i, i, i - 1, MIDDLE_CHAR);
do_test (i, i, i, MIDDLE_CHAR);
do_test (i, i, i + 1, MIDDLE_CHAR);
}

for (i = 2; i <= 10; ++i)
{
do_test (0, 1 << i, 5000, 127);
do_test (1, 1 << i, 5000, 127);
do_test (0, 1 << i, 5000, MIDDLE_CHAR);
do_test (1, 1 << i, 5000, MIDDLE_CHAR);
}

for (i = 1; i < 8; ++i)
do_test (0, i, 5000, 255);
do_test (0, i, 5000, BIG_CHAR);

for (i = 1; i < 8; ++i)
do_test (i, i, 5000, 255);
do_test (i, i, 5000, BIG_CHAR);

for (i = 2; i <= 10; ++i)
{
do_test (0, 1 << i, 5000, 255);
do_test (1, 1 << i, 5000, 255);
do_test (0, 1 << i, 5000, BIG_CHAR);
do_test (1, 1 << i, 5000, BIG_CHAR);
}

do_random_tests ();
Expand Down
6 changes: 4 additions & 2 deletions sysdeps/s390/multiarch/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
ifeq ($(subdir),string)
sysdep_routines += strlen strlen-vx strlen-c
sysdep_routines += strlen strlen-vx strlen-c \
strnlen strnlen-vx strnlen-c
endif

ifeq ($(subdir),wcsmbs)
sysdep_routines += wcslen wcslen-vx wcslen-c
sysdep_routines += wcslen wcslen-vx wcslen-c \
wcsnlen wcsnlen-vx wcsnlen-c
endif
3 changes: 3 additions & 0 deletions sysdeps/s390/multiarch/ifunc-impl-list.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_VX_IMPL (strlen);
IFUNC_VX_IMPL (wcslen);

IFUNC_VX_IMPL (strnlen);
IFUNC_VX_IMPL (wcsnlen);

#endif /* HAVE_S390_VX_ASM_SUPPORT */

return i;
Expand Down
Loading

0 comments on commit fcf40eb

Please sign in to comment.