diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | benchtests/Makefile | 2 | ||||
| -rw-r--r-- | benchtests/bench-memcpy-large.c | 123 | ||||
| -rw-r--r-- | benchtests/bench-memmove-large.c | 123 | ||||
| -rw-r--r-- | benchtests/bench-memset-large.c | 134 | ||||
| -rw-r--r-- | benchtests/bench-string.h | 4 |
6 files changed, 393 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3eaf80737e..4ba9309333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2016-04-06 H.J. Lu <hongjiu.lu@intel.com> + + * benchtests/Makefile (string-benchset): Add memcpy-large, + memmove-large and memset-large. + * benchtests/bench-memcpy-large.c: New file. + * benchtests/bench-memmove-large.c: Likewise. + * benchtests/bench-memmove-large.c: Likewise. + * benchtests/bench-string.h (TIMEOUT): Don't redefine. + 2016-04-05 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S: Force diff --git a/benchtests/Makefile b/benchtests/Makefile index a37d6666ec..020ab98374 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -38,7 +38,7 @@ string-benchset := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \ strcat strchr strchrnul strcmp strcpy strcspn strlen \ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \ strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \ - strcoll + strcoll memcpy-large memmove-large memset-large wcsmbs-benchset := wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat \ wcscmp wcsncmp wcschr wcschrnul wcsrchr wcsspn wcspbrk wcscspn \ wmemchr wmemset wmemcmp diff --git a/benchtests/bench-memcpy-large.c b/benchtests/bench-memcpy-large.c new file mode 100644 index 0000000000..1ef670ed93 --- /dev/null +++ b/benchtests/bench-memcpy-large.c @@ -0,0 +1,123 @@ +/* Measure memcpy functions with large data sizes. + Copyright (C) 2016 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 MEMCPY_RESULT +# define MEMCPY_RESULT(dst, len) dst +# define START_SIZE (64 * 1024) +# define MIN_PAGE_SIZE (getpagesize () + 32 * 1024 * 1024) +# define TEST_MAIN +# define TEST_NAME "memcpy" +# define TIMEOUT (20 * 60) +# include "bench-string.h" + +IMPL (memcpy, 1) +#endif + +typedef char *(*proto_t) (char *, const char *, size_t); + +static void +do_one_test (impl_t *impl, char *dst, const char *src, + size_t len) +{ + size_t i, iters = 16; + timing_t start, stop, cur; + + /* Must clear the destination buffer updated by the previous run. */ + for (i = 0; i < len; i++) + dst[i] = 0; + + if (CALL (impl, dst, src, len) != MEMCPY_RESULT (dst, len)) + { + error (0, 0, "Wrong result in function %s %p %p", impl->name, + CALL (impl, dst, src, len), MEMCPY_RESULT (dst, len)); + ret = 1; + return; + } + + if (memcmp (dst, src, len) != 0) + { + error (0, 0, "Wrong result in function %s dst \"%s\" src \"%s\"", + impl->name, dst, src); + ret = 1; + return; + } + + TIMING_NOW (start); + for (i = 0; i < iters; ++i) + { + CALL (impl, dst, src, len); + } + 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 len) +{ + size_t i, j; + char *s1, *s2; + + align1 &= 63; + if (align1 + len >= page_size) + return; + + align2 &= 63; + if (align2 + len >= page_size) + return; + + s1 = (char *) (buf1 + align1); + s2 = (char *) (buf2 + align2); + + for (i = 0, j = 1; i < len; i++, j += 23) + s1[i] = j; + + printf ("Length %4zd, alignment %2zd/%2zd:", len, align1, align2); + + FOR_EACH_IMPL (impl, 0) + do_one_test (impl, s2, s1, len); + + putchar ('\n'); +} + +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 = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1) + { + do_test (0, 0, i + 7); + do_test (0, 3, i + 15); + do_test (3, 0, i + 31); + do_test (3, 5, i + 63); + } + + return ret; +} + +#include "../test-skeleton.c" diff --git a/benchtests/bench-memmove-large.c b/benchtests/bench-memmove-large.c new file mode 100644 index 0000000000..b8f11c1f19 --- /dev/null +++ b/benchtests/bench-memmove-large.c @@ -0,0 +1,123 @@ +/* Measure memmove functions with large data sizes. + Copyright (C) 2016 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 BASE_PAGE_SIZE (1024 * 1024) +#define START_SIZE (4 * 1024) +#define MIN_PAGE_SIZE (getpagesize () + 16 * 1024 * 1024) +#define TEST_MAIN +#define TEST_NAME "memmove" +#define TIMEOUT (20 * 60) +#include "bench-string.h" + +IMPL (memmove, 1) + +typedef char *(*proto_t) (char *, const char *, size_t); + +static void +do_one_test (impl_t *impl, char *dst, char *src, const char *orig_src, + size_t len) +{ + size_t i, iters = 16; + timing_t start, stop, cur; + + /* This also clears the destination buffer updated by the previous + run. */ + memcpy (src, orig_src, len); + + char *res = CALL (impl, dst, src, len); + if (res != dst) + { + error (0, 0, "Wrong result in function %s %p %p", impl->name, + res, dst); + ret = 1; + return; + } + + if (memcmp (dst, orig_src, len) != 0) + { + error (0, 0, "Wrong result in function %s dst \"%s\" src \"%s\"", + impl->name, dst, src); + ret = 1; + return; + } + + TIMING_NOW (start); + for (i = 0; i < iters; ++i) + { + CALL (impl, dst, src, len); + } + 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 len) +{ + size_t i, j; + char *s1, *s2; + + align1 &= 127; + if (align1 + len >= page_size) + return; + + align2 &= 127; + if (align2 + len >= page_size) + return; + + s1 = (char *) (buf1 + align1); + s2 = (char *) (buf2 + align2); + + for (i = 0, j = 1; i < len; i++, j += 23) + s1[i] = j; + + printf ("Length %4zd, alignment %2zd/%2zd:", len, align1, align2); + + FOR_EACH_IMPL (impl, 0) + do_one_test (impl, s2, (char *) (buf2 + align1), s1, len); + + putchar ('\n'); +} + +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 = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1) + { + do_test (0, 64, i + 7); + do_test (0, 3, i + 15); + do_test (3, 0, i + 31); + do_test (3, 7, i + 63); + do_test (9, 5, i + 127); + } + + return ret; +} + +#include "../test-skeleton.c" diff --git a/benchtests/bench-memset-large.c b/benchtests/bench-memset-large.c new file mode 100644 index 0000000000..e694b929e8 --- /dev/null +++ b/benchtests/bench-memset-large.c @@ -0,0 +1,134 @@ +/* Measure memset functions with large data sizes. + Copyright (C) 2016 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 TEST_MAIN +#ifndef WIDE +# define TEST_NAME "memset" +#else +# define TEST_NAME "wmemset" +#endif /* WIDE */ +#define START_SIZE (128 * 1024) +#define MIN_PAGE_SIZE (getpagesize () + 64 * 1024 * 1024) +#define TIMEOUT (20 * 60) +#include "bench-string.h" + +#ifndef WIDE +# define MEMSET memset +# define CHAR char +# define SIMPLE_MEMSET simple_memset +# define MEMCMP memcmp +#else +# include <wchar.h> +# define MEMSET wmemset +# define CHAR wchar_t +# define SIMPLE_MEMSET simple_wmemset +# define MEMCMP wmemcmp +#endif /* WIDE */ + +#include <assert.h> + +IMPL (MEMSET, 1) + +typedef CHAR *(*proto_t) (CHAR *, int, size_t); + +CHAR * +inhibit_loop_to_libcall +SIMPLE_MEMSET (CHAR *s, int c, size_t n) +{ + CHAR *r = s, *end = s + n; + while (r < end) + *r++ = c; + return s; +} + +static void +do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n) +{ + size_t i, iters = 16; + timing_t start, stop, cur; + CHAR *tstbuf = malloc (n * sizeof (*s)); + assert (tstbuf != NULL); + + /* Must clear the destination buffer updated by the previous run. */ + for (i = 0; i < n; i++) + s[i] = 0; + + CHAR *res = CALL (impl, s, c, n); + if (res != s + || SIMPLE_MEMSET (tstbuf, c, n) != tstbuf + || MEMCMP (s, tstbuf, n) != 0) + { + error (0, 0, "Wrong result in function %s", impl->name); + ret = 1; + free (tstbuf); + return; + } + + TIMING_NOW (start); + for (i = 0; i < iters; ++i) + { + CALL (impl, s, c, n); + } + TIMING_NOW (stop); + + TIMING_DIFF (cur, start, stop); + + TIMING_PRINT_MEAN ((double) cur, (double) iters); + + free (tstbuf); +} + +static void +do_test (size_t align, int c, size_t len) +{ + align &= 63; + if ((align + len) * sizeof (CHAR) > page_size) + return; + + printf ("Length %4zd, alignment %2zd, c %2d:", len, align, c); + + FOR_EACH_IMPL (impl, 0) + do_one_test (impl, (CHAR *) (buf1) + align, c, len); + + putchar ('\n'); +} + +int +test_main (void) +{ + size_t i; + int c; + + test_init (); + + printf ("%24s", ""); + FOR_EACH_IMPL (impl, 0) + printf ("\t%s", impl->name); + putchar ('\n'); + + c = 65; + for (i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1) + { + do_test (0, c, i); + do_test (3, c, i); + } + + return ret; +} + +#include "../test-skeleton.c" diff --git a/benchtests/bench-string.h b/benchtests/bench-string.h index be4c6189ba..9c5371ec77 100644 --- a/benchtests/bench-string.h +++ b/benchtests/bench-string.h @@ -56,7 +56,9 @@ extern impl_t __start_impls[], __stop_impls[]; # define TEST_FUNCTION test_main () -# define TIMEOUT (4 * 60) +# ifndef TIMEOUT +# define TIMEOUT (4 * 60) +# endif # define OPT_ITERATIONS 10000 # define OPT_RANDOM 10001 # define OPT_SEED 10002 |