Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b1fdce authored by Ingo Molnar's avatar Ingo Molnar Committed by Arnaldo Carvalho de Melo
Browse files

perf bench mem: Improve user visible strings 



 - fix various typos in user visible output strings
 - make the output consistent (wrt. capitalization and spelling)
 - offer the list of routines to benchmark on '-r help'.

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-11-git-send-email-mingo@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a69b4f74

tools/perf/bench/mem-functions.c

+17 −12
Original line number Original line Diff line number Diff line
@@ -32,13 +32,17 @@ static int cycles_fd; 
static const struct option options[] = {

static const struct option options[] = {

	OPT_STRING('l', "size", &size_str, "1MB",

	OPT_STRING('l', "size", &size_str, "1MB",

		    "Specify the size of the memory buffers. "

		    "Specify the size of the memory buffers. "

		    "Available units: B, KB, MB, GB and TB (upper and lower)"),

		    "Available units: B, KB, MB, GB and TB (case insensitive)"),



	OPT_STRING('r', "routine", &routine_str, "all",

	OPT_STRING('r', "routine", &routine_str, "all",

		    "Specify the routine to run, \"all\" runs all available routines"),

		    "Specify the routine to run, \"all\" runs all available routines, \"help\" lists them"),



	OPT_INTEGER('i', "iterations", &iterations,

	OPT_INTEGER('i', "iterations", &iterations,

		    "repeat memcpy() invocation this number of times"),

		    "Repeat the function this number of times"),



	OPT_BOOLEAN('c', "cycles", &use_cycles,

	OPT_BOOLEAN('c', "cycles", &use_cycles,

		    "Use a cycles event instead of gettimeofday() to measure performance"),

		    "Use a cycles event instead of gettimeofday() to measure performance"),



	OPT_END()

	OPT_END()

};

};
@@ -106,13 +110,13 @@ static double timeval2double(struct timeval *ts) 




#define print_bps(x) do {						\

#define print_bps(x) do {						\

		if (x < K)						\

		if (x < K)						\

			printf(" %14lf B/Sec\n", x);			\

			printf(" %14lf bytes/sec\n", x);		\

		else if (x < K * K)					\

		else if (x < K * K)					\

			printf(" %14lfd KB/Sec\n", x / K);		\

			printf(" %14lfd KB/sec\n", x / K);		\

		else if (x < K * K * K)					\

		else if (x < K * K * K)					\

			printf(" %14lf MB/Sec\n", x / K / K);		\

			printf(" %14lf MB/sec\n", x / K / K);		\

		else							\

		else							\

			printf(" %14lf GB/Sec\n", x / K / K / K);	\

			printf(" %14lf GB/sec\n", x / K / K / K);	\

	} while (0)

	} while (0)





struct bench_mem_info {

struct bench_mem_info {
@@ -128,10 +132,10 @@ static void __bench_mem_routine(struct bench_mem_info *info, int r_idx, size_t s 
	double result_bps = 0.0;

	double result_bps = 0.0;

	u64 result_cycles = 0;

	u64 result_cycles = 0;





	printf("Routine %s (%s)\n", r->name, r->desc);

	printf("# Routine '%s' (%s)\n", r->name, r->desc);





	if (bench_format == BENCH_FORMAT_DEFAULT)

	if (bench_format == BENCH_FORMAT_DEFAULT)

		printf("# Copying %s Bytes ...\n\n", size_str);

		printf("# Copying %s bytes ...\n\n", size_str);





	if (use_cycles) {

	if (use_cycles) {

		result_cycles = info->do_cycles(r, size);

		result_cycles = info->do_cycles(r, size);
@@ -142,7 +146,7 @@ static void __bench_mem_routine(struct bench_mem_info *info, int r_idx, size_t s 
	switch (bench_format) {

	switch (bench_format) {

	case BENCH_FORMAT_DEFAULT:

	case BENCH_FORMAT_DEFAULT:

		if (use_cycles) {

		if (use_cycles) {

			printf(" %14lf cycles/Byte\n", (double)result_cycles/size_total);

			printf(" %14lf cycles/byte\n", (double)result_cycles/size_total);

		} else {

		} else {

			print_bps(result_bps);

			print_bps(result_bps);

		}

		}
@@ -192,8 +196,9 @@ static int bench_mem_common(int argc, const char **argv, struct bench_mem_info * 
			break;

			break;

	}

	}

	if (!info->routines[i].name) {

	if (!info->routines[i].name) {

		if (strcmp(routine_str, "help") && strcmp(routine_str, "h"))

			printf("Unknown routine: %s\n", routine_str);

			printf("Unknown routine: %s\n", routine_str);

		printf("Available routines...\n");

		printf("Available routines:\n");

		for (i = 0; info->routines[i].name; i++) {

		for (i = 0; info->routines[i].name; i++) {

			printf("\t%s ... %s\n",

			printf("\t%s ... %s\n",

			       info->routines[i].name, info->routines[i].desc);

			       info->routines[i].name, info->routines[i].desc);

tools/perf/builtin-bench.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,9 +49,9 @@ static struct bench sched_benchmarks[] = { 
};

};





static struct bench mem_benchmarks[] = {

static struct bench mem_benchmarks[] = {

	{ "memcpy",	"Benchmark for memcpy()",			bench_mem_memcpy	},

	{ "memcpy",	"Benchmark for memcpy() functions",		bench_mem_memcpy	},

	{ "memset",	"Benchmark for memset() tests",			bench_mem_memset	},

	{ "memset",	"Benchmark for memset() functions",		bench_mem_memset	},

	{ "all",	"Test all memory benchmarks",			NULL			},

	{ "all",	"Test all memory access benchmarks",		NULL			},

	{ NULL,		NULL,						NULL			}

	{ NULL,		NULL,						NULL			}

};

};