Commit 5dd93304 authored by Ingo Molnar's avatar Ingo Molnar Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarIngo 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 13b1fdce

tools/perf/bench/mem-functions.c

+19 −19
Original line number Diff line number Diff line
@@ -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 = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE