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

Commit 1dc12760 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Split event symbols arrays to hw and sw parts 



It'll be convenient in upcoming patch to access hw event symbols
strings via enum perf_hw_id indexes. In order not to duplicate
the data, creating two separate arrays:

  event_symbols_hw for enum perf_hw_id events
  event_symbols_sw for enum perf_sw_ids events

Changing the current event list code to follow the change.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1341352848-11833-7-git-send-email-jolsa@redhat.com


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

tools/perf/util/parse-events.c

+117 −57
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#define MAX_NAME_LEN 100



struct event_symbol {

	u8		type;

	u64		config;

	const char	*symbol;

	const char	*alias;

};
@@ -30,30 +28,86 @@ extern int parse_events_debug; 
#endif

int parse_events_parse(void *data, void *scanner);



#define CHW(x) .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_##x

#define CSW(x) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_##x



static struct event_symbol event_symbols[] = {

  { CHW(CPU_CYCLES),			"cpu-cycles",			"cycles"		},

  { CHW(STALLED_CYCLES_FRONTEND),	"stalled-cycles-frontend",	"idle-cycles-frontend"	},

  { CHW(STALLED_CYCLES_BACKEND),	"stalled-cycles-backend",	"idle-cycles-backend"	},

  { CHW(INSTRUCTIONS),			"instructions",			""			},

  { CHW(CACHE_REFERENCES),		"cache-references",		""			},

  { CHW(CACHE_MISSES),			"cache-misses",			""			},

  { CHW(BRANCH_INSTRUCTIONS),		"branch-instructions",		"branches"		},

  { CHW(BRANCH_MISSES),			"branch-misses",		""			},

  { CHW(BUS_CYCLES),			"bus-cycles",			""			},

  { CHW(REF_CPU_CYCLES),		"ref-cycles",			""			},



  { CSW(CPU_CLOCK),			"cpu-clock",			""			},

  { CSW(TASK_CLOCK),			"task-clock",			""			},

  { CSW(PAGE_FAULTS),			"page-faults",			"faults"		},

  { CSW(PAGE_FAULTS_MIN),		"minor-faults",			""			},

  { CSW(PAGE_FAULTS_MAJ),		"major-faults",			""			},

  { CSW(CONTEXT_SWITCHES),		"context-switches",		"cs"			},

  { CSW(CPU_MIGRATIONS),		"cpu-migrations",		"migrations"		},

  { CSW(ALIGNMENT_FAULTS),		"alignment-faults",		""			},

  { CSW(EMULATION_FAULTS),		"emulation-faults",		""			},

static struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = {

	[PERF_COUNT_HW_CPU_CYCLES] = {

		.symbol = "cpu-cycles",

		.alias  = "cycles",

	},

	[PERF_COUNT_HW_INSTRUCTIONS] = {

		.symbol = "instructions",

		.alias  = "",

	},

	[PERF_COUNT_HW_CACHE_REFERENCES] = {

		.symbol = "cache-references",

		.alias  = "",

	},

	[PERF_COUNT_HW_CACHE_MISSES] = {

		.symbol = "cache-misses",

		.alias  = "",

	},

	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = {

		.symbol = "branch-instructions",

		.alias  = "branches",

	},

	[PERF_COUNT_HW_BRANCH_MISSES] = {

		.symbol = "branch-misses",

		.alias  = "",

	},

	[PERF_COUNT_HW_BUS_CYCLES] = {

		.symbol = "bus-cycles",

		.alias  = "",

	},

	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = {

		.symbol = "stalled-cycles-frontend",

		.alias  = "idle-cycles-frontend",

	},

	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = {

		.symbol = "stalled-cycles-backend",

		.alias  = "idle-cycles-backend",

	},

	[PERF_COUNT_HW_REF_CPU_CYCLES] = {

		.symbol = "ref-cycles",

		.alias  = "",

	},

};



static struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = {

	[PERF_COUNT_SW_CPU_CLOCK] = {

		.symbol = "cpu-clock",

		.alias  = "",

	},

	[PERF_COUNT_SW_TASK_CLOCK] = {

		.symbol = "task-clock",

		.alias  = "",

	},

	[PERF_COUNT_SW_PAGE_FAULTS] = {

		.symbol = "page-faults",

		.alias  = "faults",

	},

	[PERF_COUNT_SW_CONTEXT_SWITCHES] = {

		.symbol = "context-switches",

		.alias  = "cs",

	},

	[PERF_COUNT_SW_CPU_MIGRATIONS] = {

		.symbol = "cpu-migrations",

		.alias  = "migrations",

	},

	[PERF_COUNT_SW_PAGE_FAULTS_MIN] = {

		.symbol = "minor-faults",

		.alias  = "",

	},

	[PERF_COUNT_SW_PAGE_FAULTS_MAJ] = {

		.symbol = "major-faults",

		.alias  = "",

	},

	[PERF_COUNT_SW_ALIGNMENT_FAULTS] = {

		.symbol = "alignment-faults",

		.alias  = "",

	},

	[PERF_COUNT_SW_EMULATION_FAULTS] = {

		.symbol = "emulation-faults",

		.alias  = "",

	},

};



#define __PERF_EVENT_FIELD(config, name) \
@@ -824,16 +878,13 @@ int is_valid_tracepoint(const char *event_string) 
	return 0;

}



void print_events_type(u8 type)

static void __print_events_type(u8 type, struct event_symbol *syms,

				unsigned max)

{

	struct event_symbol *syms = event_symbols;

	unsigned int i;

	char name[64];

	unsigned i;



	for (i = 0; i < ARRAY_SIZE(event_symbols); i++, syms++) {

		if (type != syms->type)

			continue;



	for (i = 0; i < max ; i++, syms++) {

		if (strlen(syms->alias))

			snprintf(name, sizeof(name),  "%s OR %s",

				 syms->symbol, syms->alias);
@@ -845,6 +896,14 @@ void print_events_type(u8 type) 
	}

}



void print_events_type(u8 type)

{

	if (type == PERF_TYPE_SOFTWARE)

		__print_events_type(type, event_symbols_sw, PERF_COUNT_SW_MAX);

	else

		__print_events_type(type, event_symbols_hw, PERF_COUNT_HW_MAX);

}



int print_hwcache_events(const char *event_glob)

{

	unsigned int type, op, i, printed = 0;
@@ -872,26 +931,13 @@ int print_hwcache_events(const char *event_glob) 
	return printed;

}



/*

 * Print the help text for the event symbols:

 */

void print_events(const char *event_glob)

static void print_symbol_events(const char *event_glob, unsigned type,

				struct event_symbol *syms, unsigned max)

{

	unsigned int i, type, prev_type = -1, printed = 0, ntypes_printed = 0;

	struct event_symbol *syms = event_symbols;

	unsigned i, printed = 0;

	char name[MAX_NAME_LEN];



	printf("\n");

	printf("List of pre-defined events (to be used in -e):\n");



	for (i = 0; i < ARRAY_SIZE(event_symbols); i++, syms++) {

		type = syms->type;



		if (type != prev_type && printed) {

			printf("\n");

			printed = 0;

			ntypes_printed++;

		}

	for (i = 0; i < max; i++, syms++) {



		if (event_glob != NULL && 

		    !(strglobmatch(syms->symbol, event_glob) ||
@@ -902,17 +948,31 @@ void print_events(const char *event_glob) 
			snprintf(name, MAX_NAME_LEN, "%s OR %s", syms->symbol, syms->alias);

		else

			strncpy(name, syms->symbol, MAX_NAME_LEN);

		printf("  %-50s [%s]\n", name,

			event_type_descriptors[type]);



		prev_type = type;

		++printed;

		printf("  %-50s [%s]\n", name, event_type_descriptors[type]);



		printed++;

	}



	if (ntypes_printed) {

		printed = 0;

	if (printed)

		printf("\n");

}



/*

 * Print the help text for the event symbols:

 */

void print_events(const char *event_glob)

{



	printf("\n");

	printf("List of pre-defined events (to be used in -e):\n");



	print_symbol_events(event_glob, PERF_TYPE_HARDWARE,

			    event_symbols_hw, PERF_COUNT_HW_MAX);



	print_symbol_events(event_glob, PERF_TYPE_SOFTWARE,

			    event_symbols_sw, PERF_COUNT_SW_MAX);



	print_hwcache_events(event_glob);



	if (event_glob != NULL)