diff options
Diffstat (limited to 'benchtests')
| -rw-r--r-- | benchtests/Makefile | 2 | ||||
| -rw-r--r-- | benchtests/bench-strcat.c | 88 | ||||
| -rw-r--r-- | benchtests/bench-wcscat.c | 20 |
3 files changed, 78 insertions, 32 deletions
diff --git a/benchtests/Makefile b/benchtests/Makefile index c3531a9954..7c724fbda6 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -36,7 +36,7 @@ string-bench := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \ strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \ strcoll -wcsmbs-bench := wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy +wcsmbs-bench := wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat string-bench-all := $(string-bench) ${wcsmbs-bench} # We have to generate locales diff --git a/benchtests/bench-strcat.c b/benchtests/bench-strcat.c index 7dd79fb6a1..1abf6d3d06 100644 --- a/benchtests/bench-strcat.c +++ b/benchtests/bench-strcat.c @@ -17,19 +17,45 @@ <http://www.gnu.org/licenses/>. */ #define TEST_MAIN -#define TEST_NAME "strcat" +#ifndef WIDE +# define TEST_NAME "strcat" +#else +# define TEST_NAME "wcscat" +#endif /* WIDE */ #include "bench-string.h" -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) +#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; + CHAR *ret = dst; while (*dst++ != '\0'); --dst; while ((*dst++ = *src++) != '\0'); @@ -37,9 +63,9 @@ simple_strcat (char *dst, const char *src) } static void -do_one_test (impl_t *impl, char *dst, const char *src) +do_one_test (impl_t *impl, CHAR *dst, const CHAR *src) { - 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) != dst) @@ -50,9 +76,9 @@ do_one_test (impl_t *impl, char *dst, const char *src) return; } - if (strcmp (dst + k, src) != 0) + if (STRCMP (dst + k, src) != 0) { - error (0, 0, "Wrong result in function %s dst \"%s\" src \"%s\"", + error (0, 0, "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"", impl->name, dst, src); ret = 1; return; @@ -75,18 +101,18 @@ 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; + CHAR *s1, *s2; align1 &= 7; - if (align1 + len1 >= page_size) + if ((align1 + len1) * sizeof (CHAR) >= page_size) return; align2 &= 7; - if (align2 + len1 + len2 >= page_size) + if ((align2 + len1 + len2) * 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); @@ -120,26 +146,26 @@ test_main (void) for (i = 0; i < 16; ++i) { - do_test (0, 0, i, i, 127); - do_test (0, 0, i, i, 255); - do_test (0, i, i, i, 127); - do_test (i, 0, i, i, 255); + 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, 127); - do_test (8 - i, 2 * i, 8 << i, 8 << i, 127); - do_test (0, 0, 8 << i, 2 << i, 127); - do_test (8 - i, 2 * i, 8 << i, 2 << i, 127); + 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, 127); - do_test (2 * i, i, 8 << i, 1, 255); - do_test (i, i, 8 << i, 10, 127); - do_test (i, i, 8 << i, 10, 255); + 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; diff --git a/benchtests/bench-wcscat.c b/benchtests/bench-wcscat.c new file mode 100644 index 0000000000..cd0dbc00d6 --- /dev/null +++ b/benchtests/bench-wcscat.c @@ -0,0 +1,20 @@ +/* Measure wcscat functions. + Copyright (C) 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 WIDE 1 +#include "bench-strcat.c" |