Skip to content

Commit

Permalink
S390: Optimize strncpy and wcsncpy.
Browse files Browse the repository at this point in the history 
This patch provides optimized versions of strncpy and wcsncpy with the z13
vector instructions.

ChangeLog:

	* sysdeps/s390/multiarch/strncpy-vx.S: New File.
	* sysdeps/s390/multiarch/strncpy.c: Likewise.
	* sysdeps/s390/multiarch/wcsncpy-c.c: Likewise.
	* sysdeps/s390/multiarch/wcsncpy-vx.S: Likewise.
	* sysdeps/s390/multiarch/wcsncpy.c: Likewise.
	* sysdeps/s390/s390-32/multiarch/strncpy.c: Likewise.
	* sysdeps/s390/s390-64/multiarch/strncpy.c: Likewise.
	* sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strncpy and
	wcsncpy functions.
	* wcsmbs/wcsncpy.c: Use WCSNCPY if defined.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Add ifunc test for strncpy, wcsncpy.
	* string/test-strncpy.c: Add wcsncpy support.
	* wcsmbs/test-wcsncpy.c: New File.
	* wcsmbs/Makefile (strop-tests): Add wcsncpy.
	* benchtests/bench-strncpy.c: Add wcsncpy support.
	* benchtests/bench-wcsncpy.c: New File.
	* benchtests/Makefile (wcsmbs-bench): Add wcsncpy
  • Loading branch information
Stefan Liebler authored and Andreas Krebbel committed Aug 26, 2015
1 parent 8ade3db commit d183b96
Show file tree
Hide file tree
Showing 17 changed files with 782 additions and 87 deletions.
21 changes: 21 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

* sysdeps/s390/multiarch/strncpy-vx.S: New File.
* sysdeps/s390/multiarch/strncpy.c: Likewise.
* sysdeps/s390/multiarch/wcsncpy-c.c: Likewise.
* sysdeps/s390/multiarch/wcsncpy-vx.S: Likewise.
* sysdeps/s390/multiarch/wcsncpy.c: Likewise.
* sysdeps/s390/s390-32/multiarch/strncpy.c: Likewise.
* sysdeps/s390/s390-64/multiarch/strncpy.c: Likewise.
* sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strncpy and
wcsncpy functions.
* wcsmbs/wcsncpy.c: Use WCSNCPY if defined.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Add ifunc test for strncpy, wcsncpy.
* string/test-strncpy.c: Add wcsncpy support.
* wcsmbs/test-wcsncpy.c: New File.
* wcsmbs/Makefile (strop-tests): Add wcsncpy.
* benchtests/bench-strncpy.c: Add wcsncpy support.
* benchtests/bench-wcsncpy.c: New File.
* benchtests/Makefile (wcsmbs-bench): Add wcsncpy

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

* sysdeps/s390/multiarch/stpcpy-c.c: 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 wcsnlen wcscpy wcpcpy
wcsmbs-bench := wcslen wcsnlen wcscpy wcpcpy wcsncpy
string-bench-all := $(string-bench) ${wcsmbs-bench}

# We have to generate locales
Expand Down
110 changes: 73 additions & 37 deletions benchtests/bench-strncpy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,56 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */

#ifdef WIDE
# include <wchar.h>
# define CHAR wchar_t
# define UCHAR wchar_t
# define BIG_CHAR WCHAR_MAX
# define SMALL_CHAR 1273
# define MEMCMP wmemcmp
# define MEMSET wmemset
# define STRNLEN wcsnlen
#else
# define CHAR char
# define UCHAR unsigned char
# define BIG_CHAR CHAR_MAX
# define SMALL_CHAR 127
# define MEMCMP memcmp
# define MEMSET memset
# define STRNLEN strnlen
#endif /* !WIDE */


#ifndef STRNCPY_RESULT
# define STRNCPY_RESULT(dst, len, n) dst
# define TEST_MAIN
# define TEST_NAME "strncpy"
# ifndef WIDE
# define TEST_NAME "strncpy"
# else
# define TEST_NAME "wcsncpy"
# endif /* WIDE */
# include "bench-string.h"

char *simple_strncpy (char *, const char *, size_t);
char *stupid_strncpy (char *, const char *, size_t);

IMPL (stupid_strncpy, 0)
IMPL (simple_strncpy, 0)
IMPL (strncpy, 1)

char *
simple_strncpy (char *dst, const char *src, size_t n)
# ifndef WIDE
# define SIMPLE_STRNCPY simple_strncpy
# define STUPID_STRNCPY stupid_strncpy
# define STRNCPY strncpy
# else
# define SIMPLE_STRNCPY simple_wcsncpy
# define STUPID_STRNCPY stupid_wcsncpy
# define STRNCPY wcsncpy
# endif /* WIDE */

CHAR *SIMPLE_STRNCPY (CHAR *, const CHAR *, size_t);
CHAR *STUPID_STRNCPY (CHAR *, const CHAR *, size_t);

IMPL (STUPID_STRNCPY, 0)
IMPL (SIMPLE_STRNCPY, 0)
IMPL (STRNCPY, 1)

CHAR *
SIMPLE_STRNCPY (CHAR *dst, const CHAR *src, size_t n)
{
char *ret = dst;
CHAR *ret = dst;
while (n--)
if ((*dst++ = *src++) == '\0')
{
Expand All @@ -43,10 +76,10 @@ simple_strncpy (char *dst, const char *src, size_t n)
return ret;
}

char *
stupid_strncpy (char *dst, const char *src, size_t n)
CHAR *
STUPID_STRNCPY (CHAR *dst, const CHAR *src, size_t n)
{
size_t nc = strnlen (src, n);
size_t nc = STRNLEN (src, n);
size_t i;

for (i = 0; i < nc; ++i)
Expand All @@ -55,12 +88,12 @@ stupid_strncpy (char *dst, const char *src, size_t n)
dst[i] = '\0';
return dst;
}
#endif
#endif /* !STRNCPY_RESULT */

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

static void
do_one_test (impl_t *impl, char *dst, const char *src, size_t len, size_t n)
do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t len, size_t n)
{
size_t i, iters = INNER_LOOP_ITERS;
timing_t start, stop, cur;
Expand All @@ -73,7 +106,7 @@ do_one_test (impl_t *impl, char *dst, const char *src, size_t len, size_t n)
return;
}

if (memcmp (dst, src, len > n ? n : len) != 0)
if (memcmp (dst, src, (len > n ? n : len) * sizeof (CHAR)) != 0)
{
error (0, 0, "Wrong result in function %s", impl->name);
ret = 1;
Expand Down Expand Up @@ -109,23 +142,26 @@ static void
do_test (size_t align1, size_t align2, size_t len, size_t n, int max_char)
{
size_t i;
char *s1, *s2;
CHAR *s1, *s2;

/* For wcsncpy: align1 and align2 here mean alignment not in bytes,
but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)). */
align1 &= 7;
if (align1 + len >= page_size)
if ((align1 + len) * sizeof (CHAR) >= page_size)
return;

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

s1 = (char *) (buf1 + align1);
s2 = (char *) (buf2 + align2);
s1 = (CHAR *) (buf1) + align1;
s2 = (CHAR *) (buf2) + align2;

for (i = 0; i < len; ++i)
s1[i] = 32 + 23 * i % (max_char - 32);
s1[len] = 0;
for (i = len + 1; i + align1 < page_size && i < len + 64; ++i)
for (i = len + 1; (i + align1) * sizeof (CHAR) < page_size && i < len + 64;
++i)
s1[i] = 32 + 32 * i % (max_char - 32);

printf ("Length %4zd, n %4zd, alignment %2zd/%2zd:", len, n, align1, align2);
Expand All @@ -150,22 +186,22 @@ test_main (void)

for (i = 1; i < 8; ++i)
{
do_test (i, i, 16, 16, 127);
do_test (i, i, 16, 16, 255);
do_test (i, 2 * i, 16, 16, 127);
do_test (2 * i, i, 16, 16, 255);
do_test (8 - i, 2 * i, 1 << i, 2 << i, 127);
do_test (2 * i, 8 - i, 2 << i, 1 << i, 127);
do_test (8 - i, 2 * i, 1 << i, 2 << i, 255);
do_test (2 * i, 8 - i, 2 << i, 1 << i, 255);
do_test (i, i, 16, 16, SMALL_CHAR);
do_test (i, i, 16, 16, BIG_CHAR);
do_test (i, 2 * i, 16, 16, SMALL_CHAR);
do_test (2 * i, i, 16, 16, BIG_CHAR);
do_test (8 - i, 2 * i, 1 << i, 2 << i, SMALL_CHAR);
do_test (2 * i, 8 - i, 2 << i, 1 << i, SMALL_CHAR);
do_test (8 - i, 2 * i, 1 << i, 2 << i, BIG_CHAR);
do_test (2 * i, 8 - i, 2 << i, 1 << i, BIG_CHAR);
}

for (i = 1; i < 8; ++i)
{
do_test (0, 0, 4 << i, 8 << i, 127);
do_test (0, 0, 16 << i, 8 << i, 127);
do_test (8 - i, 2 * i, 4 << i, 8 << i, 127);
do_test (8 - i, 2 * i, 16 << i, 8 << i, 127);
do_test (0, 0, 4 << i, 8 << i, SMALL_CHAR);
do_test (0, 0, 16 << i, 8 << i, SMALL_CHAR);
do_test (8 - i, 2 * i, 4 << i, 8 << i, SMALL_CHAR);
do_test (8 - i, 2 * i, 16 << i, 8 << i, SMALL_CHAR);
}

return ret;
Expand Down
20 changes: 20 additions & 0 deletions benchtests/bench-wcsncpy.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Measure wcsncpy 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-strncpy.c"
Loading

0 comments on commit d183b96

Please sign in to comment.