mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
d626a24f23
This patch provides optimized versions of strcat and wcscat with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/strcat-c.c: New File. * sysdeps/s390/multiarch/strcat-vx.S: Likewise. * sysdeps/s390/multiarch/strcat.c: Likewise. * sysdeps/s390/multiarch/wcscat-c.c: Likewise. * sysdeps/s390/multiarch/wcscat-vx.S: Likewise. * sysdeps/s390/multiarch/wcscat.c: Likewise. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strcat and wcscat functions. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for strcat, wcscat. * string/strcat.c (STRCAT): Define and use macro. * wcsmbs/wcscat.c: Use WCSCAT if defined. * string/test-strcat.c: Add wcscat support. * wcsmbs/test-wcscat.c: New File. * wcsmbs/Makefile (strop-tests): Add wcscat. * benchtests/bench-strcat.c: Add wcscat support. * benchtests/bench-wcscat.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcscat.
175 lines
4.0 KiB
C
175 lines
4.0 KiB
C
/* Measure strcat functions.
|
|
Copyright (C) 2013-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 TEST_MAIN
|
|
#ifndef WIDE
|
|
# define TEST_NAME "strcat"
|
|
#else
|
|
# define TEST_NAME "wcscat"
|
|
#endif /* WIDE */
|
|
#include "bench-string.h"
|
|
|
|
#ifndef WIDE
|
|
# define STRCAT strcat
|
|
# define CHAR char
|
|
# define sfmt "s"
|
|
# define SIMPLE_STRCAT simple_strcat
|
|
# define STRLEN strlen
|
|
# define STRCMP strcmp
|
|
# define BIG_CHAR CHAR_MAX
|
|
# define SMALL_CHAR 127
|
|
#else
|
|
# include <wchar.h>
|
|
# define STRCAT wcscat
|
|
# define CHAR wchar_t
|
|
# define sfmt "ls"
|
|
# define SIMPLE_STRCAT simple_wcscat
|
|
# define STRLEN wcslen
|
|
# define STRCMP wcscmp
|
|
# define BIG_CHAR WCHAR_MAX
|
|
# define SMALL_CHAR 1273
|
|
#endif /* WIDE */
|
|
|
|
|
|
typedef CHAR *(*proto_t) (CHAR *, const CHAR *);
|
|
CHAR *SIMPLE_STRCAT (CHAR *, const CHAR *);
|
|
|
|
IMPL (SIMPLE_STRCAT, 0)
|
|
IMPL (STRCAT, 1)
|
|
|
|
CHAR *
|
|
SIMPLE_STRCAT (CHAR *dst, const CHAR *src)
|
|
{
|
|
CHAR *ret = dst;
|
|
while (*dst++ != '\0');
|
|
--dst;
|
|
while ((*dst++ = *src++) != '\0');
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
do_one_test (impl_t *impl, CHAR *dst, const CHAR *src)
|
|
{
|
|
size_t k = STRLEN (dst), i, iters = INNER_LOOP_ITERS;
|
|
timing_t start, stop, cur;
|
|
|
|
if (CALL (impl, dst, src) != dst)
|
|
{
|
|
error (0, 0, "Wrong result in function %s %p %p", impl->name,
|
|
CALL (impl, dst, src), dst);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
if (STRCMP (dst + k, src) != 0)
|
|
{
|
|
error (0, 0, "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"",
|
|
impl->name, dst, src);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
TIMING_NOW (start);
|
|
for (i = 0; i < iters; ++i)
|
|
{
|
|
dst[k] = '\0';
|
|
CALL (impl, dst, src);
|
|
}
|
|
TIMING_NOW (stop);
|
|
|
|
TIMING_DIFF (cur, start, stop);
|
|
|
|
TIMING_PRINT_MEAN ((double) cur, (double) iters);
|
|
}
|
|
|
|
static void
|
|
do_test (size_t align1, size_t align2, size_t len1, size_t len2, int max_char)
|
|
{
|
|
size_t i;
|
|
CHAR *s1, *s2;
|
|
|
|
align1 &= 7;
|
|
if ((align1 + len1) * sizeof (CHAR) >= page_size)
|
|
return;
|
|
|
|
align2 &= 7;
|
|
if ((align2 + len1 + len2) * sizeof (CHAR) >= page_size)
|
|
return;
|
|
|
|
s1 = (CHAR *) (buf1) + align1;
|
|
s2 = (CHAR *) (buf2) + align2;
|
|
|
|
for (i = 0; i < len1; ++i)
|
|
s1[i] = 32 + 23 * i % (max_char - 32);
|
|
s1[len1] = '\0';
|
|
|
|
for (i = 0; i < len2; i++)
|
|
s2[i] = 32 + 23 * i % (max_char - 32);
|
|
|
|
printf ("Length %4zd/%4zd, alignment %2zd/%2zd:", len1, len2, align1, align2);
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
s2[len2] = '\0';
|
|
do_one_test (impl, s2, s1);
|
|
}
|
|
|
|
putchar ('\n');
|
|
}
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
size_t i;
|
|
|
|
test_init ();
|
|
|
|
printf ("%28s", "");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
printf ("\t%s", impl->name);
|
|
putchar ('\n');
|
|
|
|
for (i = 0; i < 16; ++i)
|
|
{
|
|
do_test (0, 0, i, i, SMALL_CHAR);
|
|
do_test (0, 0, i, i, BIG_CHAR);
|
|
do_test (0, i, i, i, SMALL_CHAR);
|
|
do_test (i, 0, i, i, BIG_CHAR);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (0, 0, 8 << i, 8 << i, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, 8 << i, SMALL_CHAR);
|
|
do_test (0, 0, 8 << i, 2 << i, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, 2 << i, SMALL_CHAR);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (i, 2 * i, 8 << i, 1, SMALL_CHAR);
|
|
do_test (2 * i, i, 8 << i, 1, BIG_CHAR);
|
|
do_test (i, i, 8 << i, 10, SMALL_CHAR);
|
|
do_test (i, i, 8 << i, 10, BIG_CHAR);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#include "../test-skeleton.c"
|