This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Consolidate *str benchtests.
- From: OndÅej BÃlka <neleai at seznam dot cz>
- To: libc-alpha at sourceware dot org
- Date: Fri, 6 Sep 2013 11:35:17 +0200
- Subject: [PATCH] Consolidate *str benchtests.
- Authentication-results: sourceware.org; auth=none
Hi, we continue with strstr, strcasestr, memmem cases.
Here we pick two sets of inputs, first is random which samples from 128
characters, second one are aaab needles in aaaa haystack.
OK to commit?
* benchtests/bench-str.h: New file.
* benchtests/bench-strstr.c: Use benchtests/bench-cmp.h.
* benchtests/bench-strcasestr.c: Likewise.
* benchtests/bench-memmem.c: Likewise.
---
benchtests/bench-memmem.c | 146 ++-----------------------------------
benchtests/bench-str.h | 125 +++++++++++++++++++++++++++++++
benchtests/bench-strcasestr.c | 162 ++---------------------------------------
benchtests/bench-strstr.c | 159 ++--------------------------------------
4 files changed, 140 insertions(+), 452 deletions(-)
create mode 100644 benchtests/bench-str.h
diff --git a/benchtests/bench-memmem.c b/benchtests/bench-memmem.c
index b8f8a8b..6ceaadc 100644
--- a/benchtests/bench-memmem.c
+++ b/benchtests/bench-memmem.c
@@ -16,149 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define TEST_MAIN
-#define TEST_NAME "memmem"
-#define BUF1PAGES 20
-#define ITERATIONS 500
-#include "bench-string.h"
-typedef char *(*proto_t) (const void *, size_t, const void *, size_t);
-void *simple_memmem (const void *, size_t, const void *, size_t);
+# define TEST_NAME "memmem"
-IMPL (simple_memmem, 0)
-IMPL (memmem, 1)
+#define PROTO typedef char *(*proto_t) (char *, size_t, const char *, size_t);
+#define IMPLS IMPL (memmem, 1)
-void *
-simple_memmem (const void *haystack, size_t haystack_len, const void *needle,
- size_t needle_len)
-{
- const char *begin;
- const char *const last_possible
- = (const char *) haystack + haystack_len - needle_len;
- if (needle_len == 0)
- /* The first occurrence of the empty string is deemed to occur at
- the beginning of the string. */
- return (void *) haystack;
+#define CALL2(impl, dst, src, len1, len2) CALL (impl, dst, len1, src, len2)
- /* Sanity check, otherwise the loop might search through the whole
- memory. */
- if (__builtin_expect (haystack_len < needle_len, 0))
- return NULL;
-
- for (begin = (const char *) haystack; begin <= last_possible; ++begin)
- if (begin[0] == ((const char *) needle)[0] &&
- !memcmp ((const void *) &begin[1],
- (const void *) ((const char *) needle + 1),
- needle_len - 1))
- return (void *) begin;
-
- return NULL;
-}
-
-static void
-do_one_test (impl_t *impl, const void *haystack, size_t haystack_len,
- const void *needle, size_t needle_len, const void *expected)
-{
- size_t i, iters = INNER_LOOP_ITERS;
- timing_t start, stop, cur;
-
- TIMING_NOW (start);
- for (i = 0; i < iters; ++i)
- {
- CALL (impl, haystack, haystack_len, needle, needle_len);
- }
- TIMING_NOW (stop);
-
- TIMING_DIFF (cur, start, stop);
-
- TIMING_PRINT_MEAN ((double) cur, (double) iters);
-}
-
-static void
-do_test (const char *str, size_t len, size_t idx)
-{
- char tmpbuf[len];
-
- memcpy (tmpbuf, buf1 + idx, len);
- memcpy (buf1 + idx, str, len);
-
- printf ("String %s, offset %zd:", str, idx);
-
- FOR_EACH_IMPL (impl, 0)
- do_one_test (impl, buf1, BUF1PAGES * page_size, str, len, buf1 + idx);
-
- memcpy (buf1 + idx, tmpbuf, len);
-
- putchar ('\n');
-}
-
-static void
-do_random_tests (void)
-{
- for (size_t n = 0; n < ITERATIONS; ++n)
- {
- char tmpbuf[32];
-
- size_t shift = random () % 11;
- size_t rel = random () % ((2 << (shift + 1)) * 64);
- size_t idx = MIN ((2 << shift) * 64 + rel, BUF1PAGES * page_size - 2);
- size_t len = random () % (sizeof (tmpbuf) - 1) + 1;
- len = MIN (len, BUF1PAGES * page_size - idx - 1);
- memcpy (tmpbuf, buf1 + idx, len);
- for (size_t i = random () % len / 2 + 1; i > 0; --i)
- {
- size_t off = random () % len;
- char ch = '0' + random () % 10;
-
- buf1[idx + off] = ch;
- }
-
- printf ("String %.*s, offset %zd:", (int) len, buf1 + idx, idx);
-
- FOR_EACH_IMPL (impl, 0)
- do_one_test (impl, buf1, BUF1PAGES * page_size, buf1 + idx, len,
- buf1 + idx);
-
- putchar ('\n');
-
- memcpy (buf1 + idx, tmpbuf, len);
- }
-}
-
-static const char *const strs[] =
- {
- "00000", "00112233", "0123456789", "0000111100001111",
- "00000111110000022222", "012345678901234567890",
- "abc0", "aaaa0", "abcabc0"
- };
-
-
-int
-test_main (void)
-{
- size_t i;
-
- test_init ();
-
- printf ("%23s", "");
- FOR_EACH_IMPL (impl, 0)
- printf ("\t%s", impl->name);
- putchar ('\n');
-
- for (i = 0; i < BUF1PAGES * page_size; ++i)
- buf1[i] = 60 + random () % 32;
-
- for (i = 0; i < sizeof (strs) / sizeof (strs[0]); ++i)
- for (size_t j = 0; j < 120; j += 7)
- {
- size_t len = strlen (strs[i]);
-
- do_test (strs[i], len, j);
- }
-
- do_random_tests ();
- return ret;
-}
-
-#include "../test-skeleton.c"
+#include "bench-str.h"
diff --git a/benchtests/bench-str.h b/benchtests/bench-str.h
new file mode 100644
index 0000000..e6dff7a
--- /dev/null
+++ b/benchtests/bench-str.h
@@ -0,0 +1,125 @@
+/* Measure memcpy, strcpy, stpcpy, ... functions.
+ Copyright (C) 2013 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 MEMCPY_RESULT(dst, len) dst
+#define MIN_PAGE_SIZE (1<<22)
+#define TEST_MAIN
+#include "bench-string.h"
+
+PROTO
+IMPLS
+
+static void
+do_one_test (impl_t *impl, size_t aligned, size_t len1, size_t len2)
+{
+ size_t i, iters = INNER_LOOP_ITERS;
+ timing_t start, stop, cur;
+ static unsigned int r_seed = 42;
+
+ char *dsts[INNER_LOOP_ITERS], *srcs[INNER_LOOP_ITERS];
+ for (i = 0; i < iters; ++i)
+ {
+ srcs[i] = ((char *) buf1) + rand_r (&r_seed)%(MIN_PAGE_SIZE/2);
+ dsts[i] = ((char *) buf2) + rand_r (&r_seed)%(MIN_PAGE_SIZE/2);
+ if (aligned) /* Align pointers. */
+ {
+ srcs[i] = srcs[i] - ((uintptr_t)srcs[i])%64;
+ dsts[i] = dsts[i] - ((uintptr_t)dsts[i])%64;
+ }
+ }
+
+ TIMING_NOW (start);
+ for (i = 0; i < iters; ++i)
+ {
+ dsts[i][len1] = 0;
+ srcs[i][len2 - 1] = 'b';
+ srcs[i][len2] = 0;
+ CALL2 (impl, dsts[i], srcs[i], len1, len2);
+ srcs[i][len2 - 1] = dsts[i][1];
+ srcs[i][len2] = dsts[i][0];
+ dsts[i][len1] = srcs[i][2];
+
+ }
+ TIMING_NOW (stop);
+
+ TIMING_DIFF (cur, start, stop);
+
+ TIMING_PRINT_MEAN ((double) cur, (double) iters);
+}
+
+static void
+do_test (size_t aligned, size_t len1, size_t len2)
+{
+ printf ("Haystack %6zd needle %6zd, aligned %c:", len1, len2, aligned ? 'y' : 'n' );
+
+ FOR_EACH_IMPL (impl, 0)
+ do_one_test (impl, aligned, len1, len2);
+
+ putchar ('\n');
+}
+
+int
+test_main (void)
+{
+ size_t i, j;
+ static unsigned int r_seed = 42;
+
+ test_init ();
+
+ for (i = 0; i < MIN_PAGE_SIZE; i++)
+ {
+ buf1[i] = rand_r (&r_seed) % 128 + 1;
+ buf2[i] = rand_r (&r_seed) % 128 + 1;
+ }
+
+#ifdef TEST_OVERLAP
+ buf1 = buf2;
+#endif
+
+ printf ("%23s", "");
+ FOR_EACH_IMPL (impl, 0)
+ printf ("\t%10s", impl->name);
+ putchar ('\n');
+ printf ("Random strings:\n");
+
+ for (j = 5; j < 30; j += 5)
+ {
+ for (i = 0; i < 18; ++i)
+ {
+ do_test (0, 1 << i, j);
+ do_test (1, 1 << i, j);
+ }
+ }
+
+ memset (buf1, 'a', MIN_PAGE_SIZE);
+ memset (buf2, 'a', MIN_PAGE_SIZE);
+
+ printf ("aaab in aaaaa");
+ for (j = 5; j < 30; j += 5)
+ {
+ for (i = 0; i < 18; ++i)
+ {
+ do_test (0, 1 << i, j);
+ do_test (1, 1 << i, j);
+ }
+ }
+
+ return ret;
+}
+
+#include "../test-skeleton.c"
diff --git a/benchtests/bench-strcasestr.c b/benchtests/bench-strcasestr.c
index 68b7e95..48d3a89 100644
--- a/benchtests/bench-strcasestr.c
+++ b/benchtests/bench-strcasestr.c
@@ -16,165 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define TEST_MAIN
-#define TEST_NAME "strcasestr"
-#include "bench-string.h"
+# define TEST_NAME "strcasestr"
-#define STRCASESTR simple_strcasestr
-#define NO_ALIAS
-#define __strncasecmp strncasecmp
-#include "../string/strcasestr.c"
+#define PROTO typedef char *(*proto_t) (char *, const char *);
+#define IMPLS IMPL (strcasestr, 1)
-static char *
-stupid_strcasestr (const char *s1, const char *s2)
-{
- ssize_t s1len = strlen (s1);
- ssize_t s2len = strlen (s2);
+#define CALL2(impl, dst, src, len1, len2) CALL (impl, dst, src)
- if (s2len > s1len)
- return NULL;
-
- for (ssize_t i = 0; i <= s1len - s2len; ++i)
- {
- size_t j;
- for (j = 0; j < s2len; ++j)
- if (tolower (s1[i + j]) != tolower (s2[j]))
- break;
- if (j == s2len)
- return (char *) s1 + i;
- }
-
- return NULL;
-}
-
-
-typedef char *(*proto_t) (const char *, const char *);
-
-IMPL (stupid_strcasestr, 0)
-IMPL (simple_strcasestr, 0)
-IMPL (strcasestr, 1)
-
-
-static void
-do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result)
-{
- size_t i, iters = INNER_LOOP_ITERS;
- timing_t start, stop, cur;
-
- TIMING_NOW (start);
- for (i = 0; i < iters; ++i)
- {
- CALL (impl, s1, s2);
- }
- 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 fail)
-{
- char *s1 = (char *) (buf1 + align1);
- char *s2 = (char *) (buf2 + align2);
-
- static const char d[] = "1234567890abcxyz";
-#define dl (sizeof (d) - 1)
- char *ss2 = s2;
- for (size_t l = len2; l > 0; l = l > dl ? l - dl : 0)
- {
- size_t t = l > dl ? dl : l;
- ss2 = mempcpy (ss2, d, t);
- }
- s2[len2] = '\0';
-
- if (fail)
- {
- char *ss1 = s1;
- for (size_t l = len1; l > 0; l = l > dl ? l - dl : 0)
- {
- size_t t = l > dl ? dl : l;
- memcpy (ss1, d, t);
- ++ss1[len2 > 7 ? 7 : len2 - 1];
- ss1 += t;
- }
- }
- else
- {
- memset (s1, '0', len1);
- for (size_t i = 0; i < len2; ++i)
- s1[len1 - len2 + i] = toupper (s2[i]);
- }
- s1[len1] = '\0';
-
- printf ("Length %4zd/%zd, alignment %2zd/%2zd, %s:",
- len1, len2, align1, align2, fail ? "fail" : "found");
-
- FOR_EACH_IMPL (impl, 0)
- do_one_test (impl, s1, s2, fail ? NULL : s1 + len1 - len2);
-
- putchar ('\n');
-}
-
-static int
-test_main (void)
-{
- test_init ();
-
- printf ("%23s", "");
- FOR_EACH_IMPL (impl, 0)
- printf ("\t%s", impl->name);
- putchar ('\n');
-
- for (size_t klen = 2; klen < 32; ++klen)
- for (size_t hlen = 2 * klen; hlen < 16 * klen; hlen += klen)
- {
- do_test (0, 0, hlen, klen, 0);
- do_test (0, 0, hlen, klen, 1);
- do_test (0, 3, hlen, klen, 0);
- do_test (0, 3, hlen, klen, 1);
- do_test (0, 9, hlen, klen, 0);
- do_test (0, 9, hlen, klen, 1);
- do_test (0, 15, hlen, klen, 0);
- do_test (0, 15, hlen, klen, 1);
-
- do_test (3, 0, hlen, klen, 0);
- do_test (3, 0, hlen, klen, 1);
- do_test (3, 3, hlen, klen, 0);
- do_test (3, 3, hlen, klen, 1);
- do_test (3, 9, hlen, klen, 0);
- do_test (3, 9, hlen, klen, 1);
- do_test (3, 15, hlen, klen, 0);
- do_test (3, 15, hlen, klen, 1);
-
- do_test (9, 0, hlen, klen, 0);
- do_test (9, 0, hlen, klen, 1);
- do_test (9, 3, hlen, klen, 0);
- do_test (9, 3, hlen, klen, 1);
- do_test (9, 9, hlen, klen, 0);
- do_test (9, 9, hlen, klen, 1);
- do_test (9, 15, hlen, klen, 0);
- do_test (9, 15, hlen, klen, 1);
-
- do_test (15, 0, hlen, klen, 0);
- do_test (15, 0, hlen, klen, 1);
- do_test (15, 3, hlen, klen, 0);
- do_test (15, 3, hlen, klen, 1);
- do_test (15, 9, hlen, klen, 0);
- do_test (15, 9, hlen, klen, 1);
- do_test (15, 15, hlen, klen, 0);
- do_test (15, 15, hlen, klen, 1);
- }
-
- do_test (0, 0, page_size - 1, 16, 0);
- do_test (0, 0, page_size - 1, 16, 1);
-
- return ret;
-}
-
-#include "../test-skeleton.c"
+#include "bench-str.h"
diff --git a/benchtests/bench-strstr.c b/benchtests/bench-strstr.c
index 528a5c0..1e99d62 100644
--- a/benchtests/bench-strstr.c
+++ b/benchtests/bench-strstr.c
@@ -16,162 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define TEST_MAIN
-#define TEST_NAME "strstr"
-#include "bench-string.h"
+# define TEST_NAME "strstr"
-#define STRSTR simple_strstr
-#include "../string/strstr.c"
+#define PROTO typedef char *(*proto_t) (char *, const char *);
+#define IMPLS IMPL (strstr, 1)
-static char *
-stupid_strstr (const char *s1, const char *s2)
-{
- ssize_t s1len = strlen (s1);
- ssize_t s2len = strlen (s2);
+#define CALL2(impl, dst, src, len1, len2) CALL (impl, dst, src)
- if (s2len > s1len)
- return NULL;
-
- for (ssize_t i = 0; i <= s1len - s2len; ++i)
- {
- size_t j;
- for (j = 0; j < s2len; ++j)
- if (s1[i + j] != s2[j])
- break;
- if (j == s2len)
- return (char *) s1 + i;
- }
-
- return NULL;
-}
-
-
-typedef char *(*proto_t) (const char *, const char *);
-
-IMPL (stupid_strstr, 0)
-IMPL (simple_strstr, 0)
-IMPL (strstr, 1)
-
-
-static void
-do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result)
-{
- size_t i, iters = INNER_LOOP_ITERS;
- timing_t start, stop, cur;
-
- TIMING_NOW (start);
- for (i = 0; i < iters; ++i)
- {
- CALL (impl, s1, s2);
- }
- 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 fail)
-{
- char *s1 = (char *) (buf1 + align1);
- char *s2 = (char *) (buf2 + align2);
-
- static const char d[] = "1234567890abcdef";
-#define dl (sizeof (d) - 1)
- char *ss2 = s2;
- for (size_t l = len2; l > 0; l = l > dl ? l - dl : 0)
- {
- size_t t = l > dl ? dl : l;
- ss2 = mempcpy (ss2, d, t);
- }
- s2[len2] = '\0';
-
- if (fail)
- {
- char *ss1 = s1;
- for (size_t l = len1; l > 0; l = l > dl ? l - dl : 0)
- {
- size_t t = l > dl ? dl : l;
- memcpy (ss1, d, t);
- ++ss1[len2 > 7 ? 7 : len2 - 1];
- ss1 += t;
- }
- }
- else
- {
- memset (s1, '0', len1);
- memcpy (s1 + len1 - len2, s2, len2);
- }
- s1[len1] = '\0';
-
- printf ("Length %4zd/%zd, alignment %2zd/%2zd, %s:",
- len1, len2, align1, align2, fail ? "fail" : "found");
-
- FOR_EACH_IMPL (impl, 0)
- do_one_test (impl, s1, s2, fail ? NULL : s1 + len1 - len2);
-
- putchar ('\n');
-}
-
-static int
-test_main (void)
-{
- test_init ();
-
- printf ("%23s", "");
- FOR_EACH_IMPL (impl, 0)
- printf ("\t%s", impl->name);
- putchar ('\n');
-
- for (size_t klen = 2; klen < 32; ++klen)
- for (size_t hlen = 2 * klen; hlen < 16 * klen; hlen += klen)
- {
- do_test (0, 0, hlen, klen, 0);
- do_test (0, 0, hlen, klen, 1);
- do_test (0, 3, hlen, klen, 0);
- do_test (0, 3, hlen, klen, 1);
- do_test (0, 9, hlen, klen, 0);
- do_test (0, 9, hlen, klen, 1);
- do_test (0, 15, hlen, klen, 0);
- do_test (0, 15, hlen, klen, 1);
-
- do_test (3, 0, hlen, klen, 0);
- do_test (3, 0, hlen, klen, 1);
- do_test (3, 3, hlen, klen, 0);
- do_test (3, 3, hlen, klen, 1);
- do_test (3, 9, hlen, klen, 0);
- do_test (3, 9, hlen, klen, 1);
- do_test (3, 15, hlen, klen, 0);
- do_test (3, 15, hlen, klen, 1);
-
- do_test (9, 0, hlen, klen, 0);
- do_test (9, 0, hlen, klen, 1);
- do_test (9, 3, hlen, klen, 0);
- do_test (9, 3, hlen, klen, 1);
- do_test (9, 9, hlen, klen, 0);
- do_test (9, 9, hlen, klen, 1);
- do_test (9, 15, hlen, klen, 0);
- do_test (9, 15, hlen, klen, 1);
-
- do_test (15, 0, hlen, klen, 0);
- do_test (15, 0, hlen, klen, 1);
- do_test (15, 3, hlen, klen, 0);
- do_test (15, 3, hlen, klen, 1);
- do_test (15, 9, hlen, klen, 0);
- do_test (15, 9, hlen, klen, 1);
- do_test (15, 15, hlen, klen, 0);
- do_test (15, 15, hlen, klen, 1);
- }
-
- do_test (0, 0, page_size - 1, 16, 0);
- do_test (0, 0, page_size - 1, 16, 1);
-
- return ret;
-}
-
-#include "../test-skeleton.c"
+#include "bench-str.h"
--
1.7.10.4