diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | benchtests/Makefile | 2 | ||||
| -rw-r--r-- | benchtests/bench-memchr.c | 8 | ||||
| -rw-r--r-- | benchtests/bench-memrchr-ifunc.c | 20 | ||||
| -rw-r--r-- | benchtests/bench-memrchr.c | 40 |
5 files changed, 74 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d67993ad91..b107551fad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-09-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com> + + * benchtests/Makefile: Add memrchr benchmark. + * benchtests/bench-memchr.c (USE_AS_MEMRCHR): Add define to use + benchmark as memrchr. + * benchtests/bench-memrchr-ifunc.c: New file. + * benchtests/bench-memrchr.c: New file. + 2013-09-06 Will Newton <will.newton@linaro.org> * benchtests/Makefile (string-bench): Add memcpy. diff --git a/benchtests/Makefile b/benchtests/Makefile index 6037e5c4ff..9cb4ff9006 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -28,7 +28,7 @@ string-bench := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \ mempcpy memset rawmemchr stpcpy stpncpy strcasecmp strcasestr \ strcat strchr strchrnul strcmp strcpy strcspn strlen \ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \ - strspn strstr strcpy_chk stpcpy_chk + strspn strstr strcpy_chk stpcpy_chk memrchr string-bench-ifunc := $(addsuffix -ifunc, $(string-bench)) string-bench-all := $(string-bench) $(string-bench-ifunc) diff --git a/benchtests/bench-memchr.c b/benchtests/bench-memchr.c index db099ad543..30c472c131 100644 --- a/benchtests/bench-memchr.c +++ b/benchtests/bench-memchr.c @@ -16,9 +16,10 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#define TEST_MAIN -#define TEST_NAME "memchr" -#include "bench-string.h" +#ifndef USE_AS_MEMRCHR +# define TEST_MAIN +# define TEST_NAME "memchr" +# include "bench-string.h" typedef char *(*proto_t) (const char *, int, size_t); char *simple_memchr (const char *, int, size_t); @@ -34,6 +35,7 @@ simple_memchr (const char *s, int c, size_t n) return (char *) s - 1; return NULL; } +#endif static void do_one_test (impl_t *impl, const char *s, int c, size_t n, char *exp_res) diff --git a/benchtests/bench-memrchr-ifunc.c b/benchtests/bench-memrchr-ifunc.c new file mode 100644 index 0000000000..fff8f018d9 --- /dev/null +++ b/benchtests/bench-memrchr-ifunc.c @@ -0,0 +1,20 @@ +/* Measure IFUNC implementations of memrchr function. + 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 TEST_IFUNC 1 +#include "bench-memrchr.c" diff --git a/benchtests/bench-memrchr.c b/benchtests/bench-memrchr.c new file mode 100644 index 0000000000..96a597f22e --- /dev/null +++ b/benchtests/bench-memrchr.c @@ -0,0 +1,40 @@ +/* Measure memrchr 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 TEST_MAIN +#define TEST_NAME "memrchr" +#include "bench-string.h" + +typedef char *(*proto_t) (const char *, int, size_t); +char *simple_memrchr (const char *, int, size_t); + +IMPL (simple_memrchr, 0) +IMPL (memrchr, 1) + +char * +simple_memrchr (const char *s, int c, size_t n) +{ + s = s + n; + while (n--) + if (*--s == (char) c) + return (char *) s; + return NULL; +} + +#define USE_AS_MEMRCHR +#include "bench-memchr.c" |