mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
S390: Optimize strpbrk and wcspbrk.
This patch provides optimized versions of strpbrk and wcspbrk with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/strpbrk-c.c: New File. * sysdeps/s390/multiarch/strpbrk-vx.S: Likewise. * sysdeps/s390/multiarch/strpbrk.c: Likewise. * sysdeps/s390/multiarch/wcspbrk-c.c: Likewise. * sysdeps/s390/multiarch/wcspbrk-vx.S: Likewise. * sysdeps/s390/multiarch/wcspbrk.c: Likewise. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strpbrk and wcspbrk functions. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for strpbrk, wcspbrk. * wcsmbs/wcspbrk.c: Use WCSPBRK if defined. * string/test-strpbrk.c: Add wcspbrk support. * wcsmbs/test-wcspbrk.c: New File. * wcsmbs/Makefile (strop-tests): Add wcspbrk. * benchtests/bench-strpbrk.c: Add wcspbrk support. * benchtests/bench-wcspbrk.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcspbrk.
This commit is contained in:
Stefan Liebler
committed by
Andreas Krebbel
Andreas Krebbel
parent
f1ffad98be
commit
f0ba659847
@ -17,50 +17,82 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef WIDE
|
||||
# define CHAR char
|
||||
# define UCHAR unsigned char
|
||||
# define STRLEN strlen
|
||||
# define STRCHR strchr
|
||||
# define BIG_CHAR CHAR_MAX
|
||||
# define SMALL_CHAR 127
|
||||
#else
|
||||
# include <wchar.h>
|
||||
# define CHAR wchar_t
|
||||
# define UCHAR wchar_t
|
||||
# define STRLEN wcslen
|
||||
# define STRCHR wcschr
|
||||
# define BIG_CHAR WCHAR_MAX
|
||||
# define SMALL_CHAR 1273
|
||||
#endif /* WIDE */
|
||||
|
||||
#ifndef STRPBRK_RESULT
|
||||
# define STRPBRK_RESULT(s, pos) ((s)[(pos)] ? (s) + (pos) : NULL)
|
||||
# define RES_TYPE char *
|
||||
# define RES_TYPE CHAR *
|
||||
# define TEST_MAIN
|
||||
# define TEST_NAME "strpbrk"
|
||||
# ifndef WIDE
|
||||
# define TEST_NAME "strpbrk"
|
||||
# else
|
||||
# define TEST_NAME "wcspbrk"
|
||||
# endif /* WIDE */
|
||||
# include "test-string.h"
|
||||
|
||||
typedef char *(*proto_t) (const char *, const char *);
|
||||
char *simple_strpbrk (const char *, const char *);
|
||||
char *stupid_strpbrk (const char *, const char *);
|
||||
# ifndef WIDE
|
||||
# define STRPBRK strpbrk
|
||||
# define SIMPLE_STRPBRK simple_strpbrk
|
||||
# define STUPID_STRPBRK stupid_strpbrk
|
||||
# else
|
||||
# include <wchar.h>
|
||||
# define STRPBRK wcspbrk
|
||||
# define SIMPLE_STRPBRK simple_wcspbrk
|
||||
# define STUPID_STRPBRK stupid_wcspbrk
|
||||
# endif /* WIDE */
|
||||
|
||||
IMPL (stupid_strpbrk, 0)
|
||||
IMPL (simple_strpbrk, 0)
|
||||
IMPL (strpbrk, 1)
|
||||
typedef CHAR *(*proto_t) (const CHAR *, const CHAR *);
|
||||
CHAR *SIMPLE_STRPBRK (const CHAR *, const CHAR *);
|
||||
CHAR *STUPID_STRPBRK (const CHAR *, const CHAR *);
|
||||
|
||||
char *
|
||||
simple_strpbrk (const char *s, const char *rej)
|
||||
IMPL (STUPID_STRPBRK, 0)
|
||||
IMPL (SIMPLE_STRPBRK, 0)
|
||||
IMPL (STRPBRK, 1)
|
||||
|
||||
CHAR *
|
||||
SIMPLE_STRPBRK (const CHAR *s, const CHAR *rej)
|
||||
{
|
||||
const char *r;
|
||||
char c;
|
||||
const CHAR *r;
|
||||
CHAR c;
|
||||
|
||||
while ((c = *s++) != '\0')
|
||||
for (r = rej; *r != '\0'; ++r)
|
||||
if (*r == c)
|
||||
return (char *) s - 1;
|
||||
return (CHAR *) s - 1;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *
|
||||
stupid_strpbrk (const char *s, const char *rej)
|
||||
CHAR *
|
||||
STUPID_STRPBRK (const CHAR *s, const CHAR *rej)
|
||||
{
|
||||
size_t ns = strlen (s), nrej = strlen (rej);
|
||||
size_t ns = STRLEN (s), nrej = STRLEN (rej);
|
||||
size_t i, j;
|
||||
|
||||
for (i = 0; i < ns; ++i)
|
||||
for (j = 0; j < nrej; ++j)
|
||||
if (s[i] == rej[j])
|
||||
return (char *) s + i;
|
||||
return (CHAR *) s + i;
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
#endif /* !STRPBRK_RESULT */
|
||||
|
||||
static void
|
||||
do_one_test (impl_t *impl, const char *s, const char *rej, RES_TYPE exp_res)
|
||||
do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE exp_res)
|
||||
{
|
||||
RES_TYPE res = CALL (impl, s, rej);
|
||||
if (res != exp_res)
|
||||
@ -78,35 +110,35 @@ do_test (size_t align, size_t pos, size_t len)
|
||||
size_t i;
|
||||
int c;
|
||||
RES_TYPE result;
|
||||
char *rej, *s;
|
||||
CHAR *rej, *s;
|
||||
|
||||
align &= 7;
|
||||
if (align + pos + 10 >= page_size || len > 240)
|
||||
if ((align + pos + 10) * sizeof (CHAR) >= page_size || len > 240)
|
||||
return;
|
||||
|
||||
rej = (char *) (buf2 + (random () & 255));
|
||||
s = (char *) (buf1 + align);
|
||||
rej = (CHAR *) (buf2) + (random () & 255);
|
||||
s = (CHAR *) (buf1) + align;
|
||||
|
||||
for (i = 0; i < len; ++i)
|
||||
{
|
||||
rej[i] = random () & 255;
|
||||
rej[i] = random () & BIG_CHAR;
|
||||
if (!rej[i])
|
||||
rej[i] = random () & 255;
|
||||
rej[i] = random () & BIG_CHAR;
|
||||
if (!rej[i])
|
||||
rej[i] = 1 + (random () & 127);
|
||||
rej[i] = 1 + (random () & SMALL_CHAR);
|
||||
}
|
||||
rej[len] = '\0';
|
||||
for (c = 1; c <= 255; ++c)
|
||||
if (strchr (rej, c) == NULL)
|
||||
for (c = 1; c <= BIG_CHAR; ++c)
|
||||
if (STRCHR (rej, c) == NULL)
|
||||
break;
|
||||
|
||||
for (i = 0; i < pos; ++i)
|
||||
{
|
||||
s[i] = random () & 255;
|
||||
if (strchr (rej, s[i]))
|
||||
s[i] = random () & BIG_CHAR;
|
||||
if (STRCHR (rej, s[i]))
|
||||
{
|
||||
s[i] = random () & 255;
|
||||
if (strchr (rej, s[i]))
|
||||
s[i] = random () & BIG_CHAR;
|
||||
if (STRCHR (rej, s[i]))
|
||||
s[i] = c;
|
||||
}
|
||||
}
|
||||
@ -114,7 +146,7 @@ do_test (size_t align, size_t pos, size_t len)
|
||||
if (s[pos])
|
||||
{
|
||||
for (i = pos + 1; i < pos + 10; ++i)
|
||||
s[i] = random () & 255;
|
||||
s[i] = random () & BIG_CHAR;
|
||||
s[i] = '\0';
|
||||
}
|
||||
result = STRPBRK_RESULT (s, pos);
|
||||
@ -129,8 +161,8 @@ do_random_tests (void)
|
||||
size_t i, j, n, align, pos, len, rlen;
|
||||
RES_TYPE result;
|
||||
int c;
|
||||
unsigned char *p = buf1 + page_size - 512;
|
||||
unsigned char *rej;
|
||||
UCHAR *p = (UCHAR *) (buf1 + page_size) - 512;
|
||||
UCHAR *rej;
|
||||
|
||||
for (n = 0; n < ITERATIONS; n++)
|
||||
{
|
||||
@ -147,18 +179,18 @@ do_random_tests (void)
|
||||
rlen = random () & 63;
|
||||
else
|
||||
rlen = random () & 15;
|
||||
rej = buf2 + page_size - rlen - 1 - (random () & 7);
|
||||
rej = (UCHAR *) (buf2 + page_size) - rlen - 1 - (random () & 7);
|
||||
for (i = 0; i < rlen; ++i)
|
||||
{
|
||||
rej[i] = random () & 255;
|
||||
rej[i] = random () & BIG_CHAR;
|
||||
if (!rej[i])
|
||||
rej[i] = random () & 255;
|
||||
rej[i] = random () & BIG_CHAR;
|
||||
if (!rej[i])
|
||||
rej[i] = 1 + (random () & 127);
|
||||
rej[i] = 1 + (random () & SMALL_CHAR);
|
||||
}
|
||||
rej[i] = '\0';
|
||||
for (c = 1; c <= 255; ++c)
|
||||
if (strchr ((char *) rej, c) == NULL)
|
||||
for (c = 1; c <= BIG_CHAR; ++c)
|
||||
if (STRCHR ((CHAR *) rej, c) == NULL)
|
||||
break;
|
||||
j = (pos > len ? pos : len) + align + 64;
|
||||
if (j > 512)
|
||||
@ -171,27 +203,27 @@ do_random_tests (void)
|
||||
else if (i == pos + align)
|
||||
p[i] = rej[random () % (rlen + 1)];
|
||||
else if (i < align || i > pos + align)
|
||||
p[i] = random () & 255;
|
||||
p[i] = random () & BIG_CHAR;
|
||||
else
|
||||
{
|
||||
p[i] = random () & 255;
|
||||
if (strchr ((char *) rej, p[i]))
|
||||
p[i] = random () & BIG_CHAR;
|
||||
if (STRCHR ((CHAR *) rej, p[i]))
|
||||
{
|
||||
p[i] = random () & 255;
|
||||
if (strchr ((char *) rej, p[i]))
|
||||
p[i] = random () & BIG_CHAR;
|
||||
if (STRCHR ((CHAR *) rej, p[i]))
|
||||
p[i] = c;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
result = STRPBRK_RESULT ((char *) (p + align), pos < len ? pos : len);
|
||||
result = STRPBRK_RESULT ((CHAR *) (p + align), pos < len ? pos : len);
|
||||
|
||||
FOR_EACH_IMPL (impl, 1)
|
||||
if (CALL (impl, (char *) (p + align), (char *) rej) != result)
|
||||
if (CALL (impl, (CHAR *) (p + align), (CHAR *) rej) != result)
|
||||
{
|
||||
error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %p, %zd, %zd, %zd) %p != %p",
|
||||
n, impl->name, align, rej, rlen, pos, len,
|
||||
(void *) CALL (impl, (char *) (p + align), (char *) rej),
|
||||
(void *) CALL (impl, (CHAR *) (p + align), (CHAR *) rej),
|
||||
(void *) result);
|
||||
ret = 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user