mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
f0ba659847
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.
207 lines
4.4 KiB
C
207 lines
4.4 KiB
C
/* Measure strpbrk 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/>. */
|
|
|
|
#ifndef WIDE
|
|
# define CHAR 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 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 TEST_MAIN
|
|
# ifndef WIDE
|
|
# define TEST_NAME "strpbrk"
|
|
# else
|
|
# define TEST_NAME "wcspbrk"
|
|
# endif /* WIDE */
|
|
# include "bench-string.h"
|
|
|
|
# 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 */
|
|
|
|
typedef CHAR *(*proto_t) (const CHAR *, const CHAR *);
|
|
CHAR *SIMPLE_STRPBRK (const CHAR *, const CHAR *);
|
|
CHAR *STUPID_STRPBRK (const CHAR *, const CHAR *);
|
|
|
|
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;
|
|
|
|
while ((c = *s++) != '\0')
|
|
for (r = rej; *r != '\0'; ++r)
|
|
if (*r == c)
|
|
return (CHAR *) s - 1;
|
|
return NULL;
|
|
}
|
|
|
|
CHAR *
|
|
STUPID_STRPBRK (const CHAR *s, const CHAR *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 NULL;
|
|
}
|
|
#endif /* !STRPBRK_RESULT */
|
|
|
|
static void
|
|
do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE exp_res)
|
|
{
|
|
RES_TYPE res = CALL (impl, s, rej);
|
|
size_t i, iters = INNER_LOOP_ITERS;
|
|
timing_t start, stop, cur;
|
|
|
|
if (res != exp_res)
|
|
{
|
|
error (0, 0, "Wrong result in function %s %p %p", impl->name,
|
|
(void *) res, (void *) exp_res);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
TIMING_NOW (start);
|
|
for (i = 0; i < iters; ++i)
|
|
{
|
|
CALL (impl, s, rej);
|
|
}
|
|
TIMING_NOW (stop);
|
|
|
|
TIMING_DIFF (cur, start, stop);
|
|
|
|
TIMING_PRINT_MEAN ((double) cur, (double) iters);
|
|
}
|
|
|
|
static void
|
|
do_test (size_t align, size_t pos, size_t len)
|
|
{
|
|
size_t i;
|
|
int c;
|
|
RES_TYPE result;
|
|
CHAR *rej, *s;
|
|
|
|
align &= 7;
|
|
if ((align + pos + 10) * sizeof (CHAR) >= page_size || len > 240)
|
|
return;
|
|
|
|
rej = (CHAR *) (buf2) + (random () & 255);
|
|
s = (CHAR *) (buf1) + align;
|
|
|
|
for (i = 0; i < len; ++i)
|
|
{
|
|
rej[i] = random () & BIG_CHAR;
|
|
if (!rej[i])
|
|
rej[i] = random () & BIG_CHAR;
|
|
if (!rej[i])
|
|
rej[i] = 1 + (random () & SMALL_CHAR);
|
|
}
|
|
rej[len] = '\0';
|
|
for (c = 1; c <= BIG_CHAR; ++c)
|
|
if (STRCHR (rej, c) == NULL)
|
|
break;
|
|
|
|
for (i = 0; i < pos; ++i)
|
|
{
|
|
s[i] = random () & BIG_CHAR;
|
|
if (STRCHR (rej, s[i]))
|
|
{
|
|
s[i] = random () & BIG_CHAR;
|
|
if (STRCHR (rej, s[i]))
|
|
s[i] = c;
|
|
}
|
|
}
|
|
s[pos] = rej[random () % (len + 1)];
|
|
if (s[pos])
|
|
{
|
|
for (i = pos + 1; i < pos + 10; ++i)
|
|
s[i] = random () & BIG_CHAR;
|
|
s[i] = '\0';
|
|
}
|
|
result = STRPBRK_RESULT (s, pos);
|
|
|
|
printf ("Length %4zd, alignment %2zd, rej len %2zd:", pos, align, len);
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
do_one_test (impl, s, rej, result);
|
|
|
|
putchar ('\n');
|
|
}
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
size_t i;
|
|
|
|
test_init ();
|
|
|
|
printf ("%32s", "");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
printf ("\t%s", impl->name);
|
|
putchar ('\n');
|
|
|
|
for (i = 0; i < 32; ++i)
|
|
{
|
|
do_test (0, 512, i);
|
|
do_test (i, 512, i);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (0, 16 << i, 4);
|
|
do_test (i, 16 << i, 4);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
do_test (i, 64, 10);
|
|
|
|
for (i = 0; i < 64; ++i)
|
|
do_test (0, i, 6);
|
|
|
|
return ret;
|
|
}
|
|
|
|
#include "../test-skeleton.c"
|