mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
S390: Optimize strspn and wcsspn.
This patch provides optimized versions of strspn and wcsspn with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/strspn-c.c: New File. * sysdeps/s390/multiarch/strspn-vx.S: Likewise. * sysdeps/s390/multiarch/strspn.c: Likewise. * sysdeps/s390/multiarch/wcsspn-c.c: Likewise. * sysdeps/s390/multiarch/wcsspn-vx.S: Likewise. * sysdeps/s390/multiarch/wcsspn.c: Likewise. * wcsmbs/wcsspn.c: Use WCSSPN if defined. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strspn and wcsspn functions. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for strspn, wcsspn. * string/test-strspn.c: Add wcsspn support. * wcsmbs/test-wcsspn.c: New File. * wcsmbs/Makefile (strop-tests): Add wcsspn. * benchtests/bench-strspn.c: Add wcsspn support. * benchtests/bench-wcsspn.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcsspn.
This commit is contained in:
committed by
Andreas Krebbel
parent
f40132d4bd
commit
f1ffad98be
@ -18,22 +18,49 @@
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_MAIN
|
||||
#define TEST_NAME "strspn"
|
||||
#ifndef WIDE
|
||||
# define TEST_NAME "strspn"
|
||||
#else
|
||||
# define TEST_NAME "wcsspn"
|
||||
#endif /* WIDE */
|
||||
#include "test-string.h"
|
||||
|
||||
typedef size_t (*proto_t) (const char *, const char *);
|
||||
size_t simple_strspn (const char *, const char *);
|
||||
size_t stupid_strspn (const char *, const char *);
|
||||
#ifndef WIDE
|
||||
# define STRSPN strspn
|
||||
# define CHAR char
|
||||
# define UCHAR unsigned char
|
||||
# define SIMPLE_STRSPN simple_strspn
|
||||
# define STUPID_STRSPN stupid_strspn
|
||||
# define STRLEN strlen
|
||||
# define STRCHR strchr
|
||||
# define BIG_CHAR CHAR_MAX
|
||||
# define SMALL_CHAR 127
|
||||
#else
|
||||
# include <wchar.h>
|
||||
# define STRSPN wcsspn
|
||||
# define CHAR wchar_t
|
||||
# define UCHAR wchar_t
|
||||
# define SIMPLE_STRSPN simple_wcsspn
|
||||
# define STUPID_STRSPN stupid_wcsspn
|
||||
# define STRLEN wcslen
|
||||
# define STRCHR wcschr
|
||||
# define BIG_CHAR WCHAR_MAX
|
||||
# define SMALL_CHAR 1273
|
||||
#endif /* WIDE */
|
||||
|
||||
IMPL (stupid_strspn, 0)
|
||||
IMPL (simple_strspn, 0)
|
||||
IMPL (strspn, 1)
|
||||
typedef size_t (*proto_t) (const CHAR *, const CHAR *);
|
||||
size_t SIMPLE_STRSPN (const CHAR *, const CHAR *);
|
||||
size_t STUPID_STRSPN (const CHAR *, const CHAR *);
|
||||
|
||||
IMPL (STUPID_STRSPN, 0)
|
||||
IMPL (SIMPLE_STRSPN, 0)
|
||||
IMPL (STRSPN, 1)
|
||||
|
||||
size_t
|
||||
simple_strspn (const char *s, const char *acc)
|
||||
SIMPLE_STRSPN (const CHAR *s, const CHAR *acc)
|
||||
{
|
||||
const char *r, *str = s;
|
||||
char c;
|
||||
const CHAR *r, *str = s;
|
||||
CHAR c;
|
||||
|
||||
while ((c = *s++) != '\0')
|
||||
{
|
||||
@ -47,9 +74,9 @@ simple_strspn (const char *s, const char *acc)
|
||||
}
|
||||
|
||||
size_t
|
||||
stupid_strspn (const char *s, const char *acc)
|
||||
STUPID_STRSPN (const CHAR *s, const CHAR *acc)
|
||||
{
|
||||
size_t ns = strlen (s), nacc = strlen (acc);
|
||||
size_t ns = STRLEN (s), nacc = STRLEN (acc);
|
||||
size_t i, j;
|
||||
|
||||
for (i = 0; i < ns; ++i)
|
||||
@ -64,7 +91,7 @@ stupid_strspn (const char *s, const char *acc)
|
||||
}
|
||||
|
||||
static void
|
||||
do_one_test (impl_t *impl, const char *s, const char *acc, size_t exp_res)
|
||||
do_one_test (impl_t *impl, const CHAR *s, const CHAR *acc, size_t exp_res)
|
||||
{
|
||||
size_t res = CALL (impl, s, acc);
|
||||
if (res != exp_res)
|
||||
@ -80,34 +107,34 @@ static void
|
||||
do_test (size_t align, size_t pos, size_t len)
|
||||
{
|
||||
size_t i;
|
||||
char *acc, *s;
|
||||
CHAR *acc, *s;
|
||||
|
||||
align &= 7;
|
||||
if (align + pos + 10 >= page_size || len > 240 || ! len)
|
||||
if ((align + pos + 10) * sizeof (CHAR) >= page_size || len > 240 || ! len)
|
||||
return;
|
||||
|
||||
acc = (char *) (buf2 + (random () & 255));
|
||||
s = (char *) (buf1 + align);
|
||||
acc = (CHAR *) (buf2) + (random () & 255);
|
||||
s = (CHAR *) (buf1) + align;
|
||||
|
||||
for (i = 0; i < len; ++i)
|
||||
{
|
||||
acc[i] = random () & 255;
|
||||
acc[i] = random () & BIG_CHAR;
|
||||
if (!acc[i])
|
||||
acc[i] = random () & 255;
|
||||
acc[i] = random () & BIG_CHAR;
|
||||
if (!acc[i])
|
||||
acc[i] = 1 + (random () & 127);
|
||||
acc[i] = 1 + (random () & SMALL_CHAR);
|
||||
}
|
||||
acc[len] = '\0';
|
||||
|
||||
for (i = 0; i < pos; ++i)
|
||||
s[i] = acc[random () % len];
|
||||
s[pos] = random () & 255;
|
||||
if (strchr (acc, s[pos]))
|
||||
s[pos] = random () & BIG_CHAR;
|
||||
if (STRCHR (acc, s[pos]))
|
||||
s[pos] = '\0';
|
||||
else
|
||||
{
|
||||
for (i = pos + 1; i < pos + 10; ++i)
|
||||
s[i] = random () & 255;
|
||||
s[i] = random () & BIG_CHAR;
|
||||
s[i] = '\0';
|
||||
}
|
||||
|
||||
@ -119,8 +146,8 @@ static void
|
||||
do_random_tests (void)
|
||||
{
|
||||
size_t i, j, n, align, pos, alen, len;
|
||||
unsigned char *p = buf1 + page_size - 512;
|
||||
unsigned char *acc;
|
||||
UCHAR *p = (UCHAR *) (buf1 + page_size) - 512;
|
||||
UCHAR *acc;
|
||||
|
||||
for (n = 0; n < ITERATIONS; n++)
|
||||
{
|
||||
@ -138,14 +165,14 @@ do_random_tests (void)
|
||||
len = random () & 511;
|
||||
if (len + align >= 512)
|
||||
len = 511 - align - (random () & 7);
|
||||
acc = buf2 + page_size - alen - 1 - (random () & 7);
|
||||
acc = (UCHAR *) (buf2 + page_size) - alen - 1 - (random () & 7);
|
||||
for (i = 0; i < alen; ++i)
|
||||
{
|
||||
acc[i] = random () & 255;
|
||||
acc[i] = random () & BIG_CHAR;
|
||||
if (!acc[i])
|
||||
acc[i] = random () & 255;
|
||||
acc[i] = random () & BIG_CHAR;
|
||||
if (!acc[i])
|
||||
acc[i] = 1 + (random () & 127);
|
||||
acc[i] = 1 + (random () & SMALL_CHAR);
|
||||
}
|
||||
acc[i] = '\0';
|
||||
j = (pos > len ? pos : len) + align + 64;
|
||||
@ -158,23 +185,23 @@ do_random_tests (void)
|
||||
p[i] = '\0';
|
||||
else if (i == pos + align)
|
||||
{
|
||||
p[i] = random () & 255;
|
||||
if (strchr ((char *) acc, p[i]))
|
||||
p[i] = random () & BIG_CHAR;
|
||||
if (STRCHR ((CHAR *) acc, p[i]))
|
||||
p[i] = '\0';
|
||||
}
|
||||
else if (i < align || i > pos + align)
|
||||
p[i] = random () & 255;
|
||||
p[i] = random () & BIG_CHAR;
|
||||
else
|
||||
p[i] = acc [random () % alen];
|
||||
}
|
||||
|
||||
FOR_EACH_IMPL (impl, 1)
|
||||
if (CALL (impl, (char *) (p + align),
|
||||
(char *) acc) != (pos < len ? pos : len))
|
||||
if (CALL (impl, (CHAR *) (p + align),
|
||||
(CHAR *) acc) != (pos < len ? pos : len))
|
||||
{
|
||||
error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %p, %zd, %zd, %zd) %zd != %zd",
|
||||
n, impl->name, align, acc, alen, pos, len,
|
||||
CALL (impl, (char *) (p + align), (char *) acc),
|
||||
CALL (impl, (CHAR *) (p + align), (CHAR *) acc),
|
||||
(pos < len ? pos : len));
|
||||
ret = 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user