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

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

perf tools: Split out PE_VALUE_SYM parsing token to SW and HW tokens 



Spliting PE_VALUE_SYM token to PE_VALUE_SYM_HW and PE_VALUE_SYM_SW
tokens to separate hardware and software symbols.

This will be useful in upcomming patch where we want to be able to parse
out only hardware events.

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-6-git-send-email-jolsa@redhat.com


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

tools/perf/util/parse-events.l

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int sym(yyscan_t scanner, int type, int config) 
	YYSTYPE *yylval = parse_events_get_lval(scanner);



	yylval->num = (type << 16) + config;

	return PE_VALUE_SYM;

	return type == PERF_TYPE_HARDWARE ? PE_VALUE_SYM_HW : PE_VALUE_SYM_SW;

}



static int term(yyscan_t scanner, int type)

tools/perf/util/parse-events.y

+11 −4
Original line number Diff line number Diff line
@@ -26,14 +26,15 @@ do { \ 
%}



%token PE_START_EVENTS PE_START_TERMS

%token PE_VALUE PE_VALUE_SYM PE_RAW PE_TERM

%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM

%token PE_NAME

%token PE_MODIFIER_EVENT PE_MODIFIER_BP

%token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT

%token PE_PREFIX_MEM PE_PREFIX_RAW

%token PE_ERROR

%type <num> PE_VALUE

%type <num> PE_VALUE_SYM

%type <num> PE_VALUE_SYM_HW

%type <num> PE_VALUE_SYM_SW

%type <num> PE_RAW

%type <num> PE_TERM

%type <str> PE_NAME
@@ -41,6 +42,7 @@ do { \ 
%type <str> PE_NAME_CACHE_OP_RESULT

%type <str> PE_MODIFIER_EVENT

%type <str> PE_MODIFIER_BP

%type <num> value_sym

%type <head> event_config

%type <term> event_term

%type <head> event_pmu
@@ -109,8 +111,13 @@ PE_NAME '/' event_config '/' 
	$$ = list;

}



value_sym:

PE_VALUE_SYM_HW

|

PE_VALUE_SYM_SW



event_legacy_symbol:

PE_VALUE_SYM '/' event_config '/'

value_sym '/' event_config '/'

{

	struct parse_events_data__events *data = _data;

	struct list_head *list = NULL;
@@ -123,7 +130,7 @@ PE_VALUE_SYM '/' event_config '/' 
	$$ = list;

}

|

PE_VALUE_SYM sep_slash_dc

value_sym sep_slash_dc

{

	struct parse_events_data__events *data = _data;

	struct list_head *list = NULL;