Messages in this thread Patch in this message | | | Date | Tue, 20 Oct 2015 00:46:50 -0700 | From | tip-bot for Ingo Molnar <> | Subject | [tip:perf/core] perf bench mem: Reorganize the code a bit |
| |
Commit-ID: 5dd93304a5d386c73c0a59117752acdca67f857d Gitweb: http://git.kernel.org/tip/5dd93304a5d386c73c0a59117752acdca67f857d Author: Ingo Molnar <mingo@kernel.org> AuthorDate: Mon, 19 Oct 2015 10:04:27 +0200 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Mon, 19 Oct 2015 16:07:19 -0300
perf bench mem: Reorganize the code a bit
Reorder functions a bit, so that we synchronize the layout of the memcpy() and memset() portions of the code.
This improves the code, especially after we'll add an strlcpy() variant as well.
Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1445241870-24854-12-git-send-email-mingo@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/bench/mem-functions.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c index 318da34..8d980d4 100644 --- a/tools/perf/bench/mem-functions.c +++ b/tools/perf/bench/mem-functions.c @@ -58,25 +58,6 @@ struct routine { } fn; }; -struct routine memcpy_routines[] = { - { .name = "default", - .desc = "Default memcpy() provided by glibc", - .fn.memcpy = memcpy }, - -#ifdef HAVE_ARCH_X86_64_SUPPORT -# define MEMCPY_FN(_fn, _name, _desc) {.name = _name, .desc = _desc, .fn.memcpy = _fn}, -# include "mem-memcpy-x86-64-asm-def.h" -# undef MEMCPY_FN -#endif - - { NULL, } -}; - -static const char * const bench_mem_memcpy_usage[] = { - "perf bench mem memcpy <options>", - NULL -}; - static struct perf_event_attr cycle_attr = { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES @@ -278,6 +259,25 @@ static double do_memcpy_gettimeofday(const struct routine *r, size_t size) return (double)(((double)size * iterations) / timeval2double(&tv_diff)); } +struct routine memcpy_routines[] = { + { .name = "default", + .desc = "Default memcpy() provided by glibc", + .fn.memcpy = memcpy }, + +#ifdef HAVE_ARCH_X86_64_SUPPORT +# define MEMCPY_FN(_fn, _name, _desc) {.name = _name, .desc = _desc, .fn.memcpy = _fn}, +# include "mem-memcpy-x86-64-asm-def.h" +# undef MEMCPY_FN +#endif + + { NULL, } +}; + +static const char * const bench_mem_memcpy_usage[] = { + "perf bench mem memcpy <options>", + NULL +}; + int bench_mem_memcpy(int argc, const char **argv, const char *prefix __maybe_unused) { struct bench_mem_info info = {
| |