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

Commit 1d33d6dc authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

perf tools: Add support to specify hw event as PMU event term 



Add a way to specify hw event as PMU event term like:

 'cpu/event=cpu-cycles/u'
 'cpu/event=instructions,.../u'
 'cpu/cycles,.../u'

The 'event=cpu-cycles' term is replaced/translated by the hw events
term translation, which is exposed by sysfs 'events' group attribute.

Add parser bits, the rest is already handled by the PMU alias code.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1349873598-12583-8-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3fded963

tools/perf/util/parse-events.c

+18 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,24 @@ int parse_events__term_str(struct parse_events__term **term, 
			config, str, 0);

}



int parse_events__term_sym_hw(struct parse_events__term **term,

			      char *config, unsigned idx)

{

	struct event_symbol *sym;



	BUG_ON(idx >= PERF_COUNT_HW_MAX);

	sym = &event_symbols_hw[idx];



	if (config)

		return new_term(term, PARSE_EVENTS__TERM_TYPE_STR,

				PARSE_EVENTS__TERM_TYPE_USER, config,

				(char *) sym->symbol, 0);

	else

		return new_term(term, PARSE_EVENTS__TERM_TYPE_STR,

				PARSE_EVENTS__TERM_TYPE_USER,

				(char *) "event", (char *) sym->symbol, 0);

}



int parse_events__term_clone(struct parse_events__term **new,

			     struct parse_events__term *term)

{

tools/perf/util/parse-events.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ int parse_events__term_num(struct parse_events__term **_term, 
			   int type_term, char *config, u64 num);

int parse_events__term_str(struct parse_events__term **_term,

			   int type_term, char *config, char *str);

int parse_events__term_sym_hw(struct parse_events__term **term,

			      char *config, unsigned idx);

int parse_events__term_clone(struct parse_events__term **new,

			     struct parse_events__term *term);

void parse_events__free_terms(struct list_head *terms);

tools/perf/util/parse-events.y

+18 −0
Original line number Diff line number Diff line
@@ -352,6 +352,15 @@ PE_NAME '=' PE_VALUE 
	$$ = term;

}

|

PE_NAME '=' PE_VALUE_SYM_HW

{

	struct parse_events__term *term;

	int config = $3 & 255;



	ABORT_ON(parse_events__term_sym_hw(&term, $1, config));

	$$ = term;

}

|

PE_NAME

{

	struct parse_events__term *term;
@@ -361,6 +370,15 @@ PE_NAME 
	$$ = term;

}

|

PE_VALUE_SYM_HW

{

	struct parse_events__term *term;

	int config = $1 & 255;



	ABORT_ON(parse_events__term_sym_hw(&term, NULL, config));

	$$ = term;

}

|

PE_TERM '=' PE_NAME

{

	struct parse_events__term *term;