aboutsummaryrefslogtreecommitdiff
path: root/benchtests/bench-strncat.c
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.vnet.ibm.com>2015-08-26 10:26:22 +0200
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2015-08-26 10:26:22 +0200
commite1fe91180e4e29549f35f8ecd705b0bb4f208606 (patch)
treee67c5c8c4e0a0c124aaaf692dea8da515f2a85b9 /benchtests/bench-strncat.c
parentd626a24f235dbd4c446b241211a9a264a1eedb9e (diff)
downloadglibc-e1fe91180e4e29549f35f8ecd705b0bb4f208606.zip
glibc-e1fe91180e4e29549f35f8ecd705b0bb4f208606.tar.gz
glibc-e1fe91180e4e29549f35f8ecd705b0bb4f208606.tar.bz2
S390: Optimize strncat wcsncat.
This patch provides optimized versions of strncat and wcsncat with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/strncat-c.c: New File. * sysdeps/s390/multiarch/strncat-vx.S: Likewise. * sysdeps/s390/multiarch/strncat.c: Likewise. * sysdeps/s390/multiarch/wcsncat-c.c: Likewise. * sysdeps/s390/multiarch/wcsncat-vx.S: Likewise. * sysdeps/s390/multiarch/wcsncat.c: Likewise. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strncat and wcsncat functions. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for strncat, wcsncat. * wcsmbs/wcsncat.c (WCSNCAT): Define and use macro. * string/test-strncat.c: Add wcsncat support. * wcsmbs/test-wcsncat.c: New File. * wcsmbs/Makefile (strop-tests): Add wcsncat. * benchtests/bench-strncat.c: Add wcsncat support. * benchtests/bench-wcsncat.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcsncat.
Diffstat (limited to 'benchtests/bench-strncat.c')
-rw-r--r--benchtests/bench-strncat.c97
1 files changed, 61 insertions, 36 deletions
diff --git a/benchtests/bench-strncat.c b/benchtests/bench-strncat.c
index 85a3135..8f3339d 100644
--- a/benchtests/bench-strncat.c
+++ b/benchtests/bench-strncat.c
@@ -17,33 +17,58 @@
<http://www.gnu.org/licenses/>. */
#define TEST_MAIN
-#define TEST_NAME "strncat"
+#ifndef WIDE
+# define TEST_NAME "strncat"
+#else
+# define TEST_NAME "wcsncat"
+#endif /* WIDE */
#include "bench-string.h"
-typedef char *(*proto_t) (char *, const char *, size_t);
-char *stupid_strncat (char *, const char *, size_t);
-char *simple_strncat (char *, const char *, size_t);
-
-IMPL (stupid_strncat, 0)
-IMPL (strncat, 2)
-
-char *
-stupid_strncat (char *dst, const char *src, size_t n)
+#ifndef WIDE
+# define STRNCAT strncat
+# define CHAR char
+# define SIMPLE_STRNCAT simple_strncat
+# define STUPID_STRNCAT stupid_strncat
+# define STRLEN strlen
+# define MEMCMP memcmp
+# define BIG_CHAR CHAR_MAX
+# define SMALL_CHAR 127
+#else
+# include <wchar.h>
+# define STRNCAT wcsncat
+# define CHAR wchar_t
+# define SIMPLE_STRNCAT simple_wcsncat
+# define STUPID_STRNCAT stupid_wcsncat
+# define STRLEN wcslen
+# define MEMCMP wmemcmp
+# define BIG_CHAR WCHAR_MAX
+# define SMALL_CHAR 1273
+#endif /* WIDE */
+
+typedef CHAR *(*proto_t) (CHAR *, const CHAR *, size_t);
+CHAR *STUPID_STRNCAT (CHAR *, const CHAR *, size_t);
+CHAR *SIMPLE_STRNCAT (CHAR *, const CHAR *, size_t);
+
+IMPL (STUPID_STRNCAT, 0)
+IMPL (STRNCAT, 2)
+
+CHAR *
+STUPID_STRNCAT (CHAR *dst, const CHAR *src, size_t n)
{
- char *ret = dst;
+ CHAR *ret = dst;
while (*dst++ != '\0');
--dst;
while (n--)
- if ( (*dst++ = *src++) == '\0')
+ if ((*dst++ = *src++) == '\0')
return ret;
*dst = '\0';
return ret;
}
static void
-do_one_test (impl_t *impl, char *dst, const char *src, size_t n)
+do_one_test (impl_t *impl, CHAR *dst, const CHAR *src, size_t n)
{
- size_t k = strlen (dst), i, iters = INNER_LOOP_ITERS;
+ size_t k = STRLEN (dst), i, iters = INNER_LOOP_ITERS;
timing_t start, stop, cur;
if (CALL (impl, dst, src, n) != dst)
@@ -54,10 +79,10 @@ do_one_test (impl_t *impl, char *dst, const char *src, size_t n)
return;
}
- size_t len = strlen (src);
- if (memcmp (dst + k, src, len + 1 > n ? n : len + 1) != 0)
+ size_t len = STRLEN (src);
+ if (MEMCMP (dst + k, src, len + 1 > n ? n : len + 1) != 0)
{
- error (0, 0, "Incorrect cancatination in function %s",
+ error (0, 0, "Incorrect concatenation in function %s",
impl->name);
ret = 1;
return;
@@ -88,20 +113,20 @@ do_test (size_t align1, size_t align2, size_t len1, size_t len2,
size_t n, int max_char)
{
size_t i;
- char *s1, *s2;
+ CHAR *s1, *s2;
align1 &= 7;
- if (align1 + len1 >= page_size)
+ if ((align1 + len1) * sizeof (CHAR) >= page_size)
return;
- if (align1 + n > page_size)
+ if ((align1 + n) * sizeof (CHAR) > page_size)
return;
align2 &= 7;
- if (align2 + len1 + len2 >= page_size)
+ if ((align2 + len1 + len2) * sizeof (CHAR) >= page_size)
return;
- if (align2 + len1 + n > page_size)
+ if ((align2 + len1 + n) * 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 < len1; ++i)
s1[i] = 32 + 23 * i % (max_char - 32);
@@ -136,25 +161,25 @@ main (void)
for (n = 2; n <= 2048; n*=4)
{
- do_test (0, 2, 2, 2, n, 127);
- do_test (0, 0, 4, 4, n, 127);
- do_test (4, 0, 4, 4, n, 255);
- do_test (0, 0, 8, 8, n, 127);
- do_test (0, 8, 8, 8, n, 127);
+ do_test (0, 2, 2, 2, n, SMALL_CHAR);
+ do_test (0, 0, 4, 4, n, SMALL_CHAR);
+ do_test (4, 0, 4, 4, n, BIG_CHAR);
+ do_test (0, 0, 8, 8, n, SMALL_CHAR);
+ do_test (0, 8, 8, 8, n, SMALL_CHAR);
for (i = 1; i < 8; ++i)
{
- do_test (0, 0, 8 << i, 8 << i, n, 127);
- do_test (8 - i, 2 * i, 8 << i, 8 << i, n, 127);
- do_test (0, 0, 8 << i, 2 << i, n, 127);
- do_test (8 - i, 2 * i, 8 << i, 2 << i, n, 127);
+ do_test (0, 0, 8 << i, 8 << i, n, SMALL_CHAR);
+ do_test (8 - i, 2 * i, 8 << i, 8 << i, n, SMALL_CHAR);
+ do_test (0, 0, 8 << i, 2 << i, n, SMALL_CHAR);
+ do_test (8 - i, 2 * i, 8 << i, 2 << i, n, SMALL_CHAR);
}
for (i = 1; i < 8; ++i)
{
- do_test (i, 2 * i, 8 << i, 1, n, 127);
- do_test (2 * i, i, 8 << i, 1, n, 255);
- do_test (i, i, 8 << i, 10, n, 127);
+ do_test (i, 2 * i, 8 << i, 1, n, SMALL_CHAR);
+ do_test (2 * i, i, 8 << i, 1, n, BIG_CHAR);
+ do_test (i, i, 8 << i, 10, n, SMALL_CHAR);
}
}