perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05 in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
		
	
			
		
			
				
	
	
		
			248 lines
		
	
	
	
		
			4.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			248 lines
		
	
	
	
		
			4.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *
 | 
						|
 * builtin-bench.c
 | 
						|
 *
 | 
						|
 * General benchmarking subsystem provided by perf
 | 
						|
 *
 | 
						|
 * Copyright (C) 2009, Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
/*
 | 
						|
 *
 | 
						|
 * Available subsystem list:
 | 
						|
 *  sched ... scheduler and IPC mechanism
 | 
						|
 *  mem   ... memory access performance
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include "perf.h"
 | 
						|
#include "util/util.h"
 | 
						|
#include "util/parse-options.h"
 | 
						|
#include "builtin.h"
 | 
						|
#include "bench/bench.h"
 | 
						|
 | 
						|
#include <stdio.h>
 | 
						|
#include <stdlib.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
struct bench_suite {
 | 
						|
	const char *name;
 | 
						|
	const char *summary;
 | 
						|
	int (*fn)(int, const char **, const char *);
 | 
						|
};
 | 
						|
						\
 | 
						|
/* sentinel: easy for help */
 | 
						|
#define suite_all { "all", "Test all benchmark suites", NULL }
 | 
						|
 | 
						|
static struct bench_suite sched_suites[] = {
 | 
						|
	{ "messaging",
 | 
						|
	  "Benchmark for scheduler and IPC mechanisms",
 | 
						|
	  bench_sched_messaging },
 | 
						|
	{ "pipe",
 | 
						|
	  "Flood of communication over pipe() between two processes",
 | 
						|
	  bench_sched_pipe      },
 | 
						|
	suite_all,
 | 
						|
	{ NULL,
 | 
						|
	  NULL,
 | 
						|
	  NULL                  }
 | 
						|
};
 | 
						|
 | 
						|
static struct bench_suite mem_suites[] = {
 | 
						|
	{ "memcpy",
 | 
						|
	  "Simple memory copy in various ways",
 | 
						|
	  bench_mem_memcpy },
 | 
						|
	{ "memset",
 | 
						|
	  "Simple memory set in various ways",
 | 
						|
	  bench_mem_memset },
 | 
						|
	suite_all,
 | 
						|
	{ NULL,
 | 
						|
	  NULL,
 | 
						|
	  NULL             }
 | 
						|
};
 | 
						|
 | 
						|
struct bench_subsys {
 | 
						|
	const char *name;
 | 
						|
	const char *summary;
 | 
						|
	struct bench_suite *suites;
 | 
						|
};
 | 
						|
 | 
						|
static struct bench_subsys subsystems[] = {
 | 
						|
	{ "sched",
 | 
						|
	  "scheduler and IPC mechanism",
 | 
						|
	  sched_suites },
 | 
						|
	{ "mem",
 | 
						|
	  "memory access performance",
 | 
						|
	  mem_suites },
 | 
						|
	{ "all",		/* sentinel: easy for help */
 | 
						|
	  "all benchmark subsystem",
 | 
						|
	  NULL },
 | 
						|
	{ NULL,
 | 
						|
	  NULL,
 | 
						|
	  NULL       }
 | 
						|
};
 | 
						|
 | 
						|
static void dump_suites(int subsys_index)
 | 
						|
{
 | 
						|
	int i;
 | 
						|
 | 
						|
	printf("# List of available suites for %s...\n\n",
 | 
						|
	       subsystems[subsys_index].name);
 | 
						|
 | 
						|
	for (i = 0; subsystems[subsys_index].suites[i].name; i++)
 | 
						|
		printf("%14s: %s\n",
 | 
						|
		       subsystems[subsys_index].suites[i].name,
 | 
						|
		       subsystems[subsys_index].suites[i].summary);
 | 
						|
 | 
						|
	printf("\n");
 | 
						|
	return;
 | 
						|
}
 | 
						|
 | 
						|
static const char *bench_format_str;
 | 
						|
int bench_format = BENCH_FORMAT_DEFAULT;
 | 
						|
 | 
						|
static const struct option bench_options[] = {
 | 
						|
	OPT_STRING('f', "format", &bench_format_str, "default",
 | 
						|
		    "Specify format style"),
 | 
						|
	OPT_END()
 | 
						|
};
 | 
						|
 | 
						|
static const char * const bench_usage[] = {
 | 
						|
	"perf bench [<common options>] <subsystem> <suite> [<options>]",
 | 
						|
	NULL
 | 
						|
};
 | 
						|
 | 
						|
static void print_usage(void)
 | 
						|
{
 | 
						|
	int i;
 | 
						|
 | 
						|
	printf("Usage: \n");
 | 
						|
	for (i = 0; bench_usage[i]; i++)
 | 
						|
		printf("\t%s\n", bench_usage[i]);
 | 
						|
	printf("\n");
 | 
						|
 | 
						|
	printf("# List of available subsystems...\n\n");
 | 
						|
 | 
						|
	for (i = 0; subsystems[i].name; i++)
 | 
						|
		printf("%14s: %s\n",
 | 
						|
		       subsystems[i].name, subsystems[i].summary);
 | 
						|
	printf("\n");
 | 
						|
}
 | 
						|
 | 
						|
static int bench_str2int(const char *str)
 | 
						|
{
 | 
						|
	if (!str)
 | 
						|
		return BENCH_FORMAT_DEFAULT;
 | 
						|
 | 
						|
	if (!strcmp(str, BENCH_FORMAT_DEFAULT_STR))
 | 
						|
		return BENCH_FORMAT_DEFAULT;
 | 
						|
	else if (!strcmp(str, BENCH_FORMAT_SIMPLE_STR))
 | 
						|
		return BENCH_FORMAT_SIMPLE;
 | 
						|
 | 
						|
	return BENCH_FORMAT_UNKNOWN;
 | 
						|
}
 | 
						|
 | 
						|
static void all_suite(struct bench_subsys *subsys)	  /* FROM HERE */
 | 
						|
{
 | 
						|
	int i;
 | 
						|
	const char *argv[2];
 | 
						|
	struct bench_suite *suites = subsys->suites;
 | 
						|
 | 
						|
	argv[1] = NULL;
 | 
						|
	/*
 | 
						|
	 * TODO:
 | 
						|
	 * preparing preset parameters for
 | 
						|
	 * embedded, ordinary PC, HPC, etc...
 | 
						|
	 * will be helpful
 | 
						|
	 */
 | 
						|
	for (i = 0; suites[i].fn; i++) {
 | 
						|
		printf("# Running %s/%s benchmark...\n",
 | 
						|
		       subsys->name,
 | 
						|
		       suites[i].name);
 | 
						|
 | 
						|
		argv[1] = suites[i].name;
 | 
						|
		suites[i].fn(1, argv, NULL);
 | 
						|
		printf("\n");
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void all_subsystem(void)
 | 
						|
{
 | 
						|
	int i;
 | 
						|
	for (i = 0; subsystems[i].suites; i++)
 | 
						|
		all_suite(&subsystems[i]);
 | 
						|
}
 | 
						|
 | 
						|
int cmd_bench(int argc, const char **argv, const char *prefix __maybe_unused)
 | 
						|
{
 | 
						|
	int i, j, status = 0;
 | 
						|
 | 
						|
	if (argc < 2) {
 | 
						|
		/* No subsystem specified. */
 | 
						|
		print_usage();
 | 
						|
		goto end;
 | 
						|
	}
 | 
						|
 | 
						|
	argc = parse_options(argc, argv, bench_options, bench_usage,
 | 
						|
			     PARSE_OPT_STOP_AT_NON_OPTION);
 | 
						|
 | 
						|
	bench_format = bench_str2int(bench_format_str);
 | 
						|
	if (bench_format == BENCH_FORMAT_UNKNOWN) {
 | 
						|
		printf("Unknown format descriptor:%s\n", bench_format_str);
 | 
						|
		goto end;
 | 
						|
	}
 | 
						|
 | 
						|
	if (argc < 1) {
 | 
						|
		print_usage();
 | 
						|
		goto end;
 | 
						|
	}
 | 
						|
 | 
						|
	if (!strcmp(argv[0], "all")) {
 | 
						|
		all_subsystem();
 | 
						|
		goto end;
 | 
						|
	}
 | 
						|
 | 
						|
	for (i = 0; subsystems[i].name; i++) {
 | 
						|
		if (strcmp(subsystems[i].name, argv[0]))
 | 
						|
			continue;
 | 
						|
 | 
						|
		if (argc < 2) {
 | 
						|
			/* No suite specified. */
 | 
						|
			dump_suites(i);
 | 
						|
			goto end;
 | 
						|
		}
 | 
						|
 | 
						|
		if (!strcmp(argv[1], "all")) {
 | 
						|
			all_suite(&subsystems[i]);
 | 
						|
			goto end;
 | 
						|
		}
 | 
						|
 | 
						|
		for (j = 0; subsystems[i].suites[j].name; j++) {
 | 
						|
			if (strcmp(subsystems[i].suites[j].name, argv[1]))
 | 
						|
				continue;
 | 
						|
 | 
						|
			if (bench_format == BENCH_FORMAT_DEFAULT)
 | 
						|
				printf("# Running %s/%s benchmark...\n",
 | 
						|
				       subsystems[i].name,
 | 
						|
				       subsystems[i].suites[j].name);
 | 
						|
			status = subsystems[i].suites[j].fn(argc - 1,
 | 
						|
							    argv + 1, prefix);
 | 
						|
			goto end;
 | 
						|
		}
 | 
						|
 | 
						|
		if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) {
 | 
						|
			dump_suites(i);
 | 
						|
			goto end;
 | 
						|
		}
 | 
						|
 | 
						|
		printf("Unknown suite:%s for %s\n", argv[1], argv[0]);
 | 
						|
		status = 1;
 | 
						|
		goto end;
 | 
						|
	}
 | 
						|
 | 
						|
	printf("Unknown subsystem:%s\n", argv[0]);
 | 
						|
	status = 1;
 | 
						|
 | 
						|
end:
 | 
						|
	return status;
 | 
						|
}
 |