Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 323724
b: refs/heads/master
c: ac2ba9f
h: refs/heads/master
v: v3
  • Loading branch information
Robert Richter authored and Arnaldo Carvalho de Melo committed Aug 22, 2012
1 parent 0251451 commit f94ca0d
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9bfbbc6d1e6b4d055860231e232b807911bf8325
refs/heads/master: ac2ba9f36bb400755e411309f3e76dbf308a10e7
13 changes: 7 additions & 6 deletions trunk/tools/perf/util/parse-events-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,13 @@ static int test__checkevent_breakpoint_modifier(struct perf_evlist *evlist)
{
struct perf_evsel *evsel = perf_evlist__first(evlist);


TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong name",
!strcmp(perf_evsel__name(evsel), "mem:0x0:rw:u"));
!strcmp(perf_evsel__name(evsel), "mem:0:u"));

return test__checkevent_breakpoint(evlist);
}
Expand All @@ -320,7 +321,7 @@ static int test__checkevent_breakpoint_x_modifier(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong name",
!strcmp(perf_evsel__name(evsel), "mem:0x0:x:k"));
!strcmp(perf_evsel__name(evsel), "mem:0:x:k"));

return test__checkevent_breakpoint_x(evlist);
}
Expand All @@ -334,7 +335,7 @@ static int test__checkevent_breakpoint_r_modifier(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong name",
!strcmp(perf_evsel__name(evsel), "mem:0x0:r:hp"));
!strcmp(perf_evsel__name(evsel), "mem:0:r:hp"));

return test__checkevent_breakpoint_r(evlist);
}
Expand All @@ -348,7 +349,7 @@ static int test__checkevent_breakpoint_w_modifier(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong name",
!strcmp(perf_evsel__name(evsel), "mem:0x0:w:up"));
!strcmp(perf_evsel__name(evsel), "mem:0:w:up"));

return test__checkevent_breakpoint_w(evlist);
}
Expand All @@ -362,7 +363,7 @@ static int test__checkevent_breakpoint_rw_modifier(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong name",
!strcmp(perf_evsel__name(evsel), "mem:0x0:rw:kp"));
!strcmp(perf_evsel__name(evsel), "mem:0:rw:kp"));

return test__checkevent_breakpoint_rw(evlist);
}
Expand Down Expand Up @@ -437,7 +438,7 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
TEST_ASSERT_VAL("wrong config", 2 == evsel->attr.config);
TEST_ASSERT_VAL("wrong name",
!strcmp(perf_evsel__name(evsel), "raw 0x2:u"));
!strcmp(perf_evsel__name(evsel), "cpu/config=2/u"));

return 0;
}
Expand Down
12 changes: 12 additions & 0 deletions trunk/tools/perf/util/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,18 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)
return 0;
}

int parse_events_name(struct list_head *list, char *name)
{
struct perf_evsel *evsel;

list_for_each_entry(evsel, list, node) {
if (!evsel->name)
evsel->name = strdup(name);
}

return 0;
}

static int parse_events__scanner(const char *str, void *data, int start_token)
{
YY_BUFFER_STATE buffer;
Expand Down
1 change: 1 addition & 0 deletions trunk/tools/perf/util/parse-events.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ int parse_events__term_clone(struct parse_events__term **new,
void parse_events__free_terms(struct list_head *terms);
int parse_events__modifier_event(struct list_head *list, char *str, bool add);
int parse_events__modifier_group(struct list_head *list, char *event_mod);
int parse_events_name(struct list_head *list, char *name);
int parse_events_add_tracepoint(struct list_head **list, int *idx,
char *sys, char *event);
int parse_events_add_numeric(struct list_head **list, int *idx,
Expand Down
50 changes: 40 additions & 10 deletions trunk/tools/perf/util/parse-events.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ static int term(yyscan_t scanner, int type)
%}

%x mem
%s config
%x event

group [^,{}/]*[{][^}]*[}][^,{}/]*
event_pmu [^,{}/]+[/][^/]*[/][^,{}/]*
event [^,{}/]+

num_dec [0-9]+
num_hex 0x[a-fA-F0-9]+
Expand All @@ -84,14 +90,40 @@ modifier_bp [rwx]{1,3}
{
int start_token;

start_token = (int) parse_events_get_extra(yyscanner);
start_token = parse_events_get_extra(yyscanner);

if (start_token == PE_START_TERMS)
BEGIN(config);
else if (start_token == PE_START_EVENTS)
BEGIN(event);

if (start_token) {
parse_events_set_extra(NULL, yyscanner);
return start_token;
}
}
%}

<event>{

{group} {
BEGIN(INITIAL); yyless(0);
}

{event_pmu} |
{event} {
str(yyscanner, PE_EVENT_NAME);
BEGIN(INITIAL); yyless(0);
return PE_EVENT_NAME;
}

. |
<<EOF>> {
BEGIN(INITIAL); yyless(0);
}

}

cpu-cycles|cycles { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES); }
stalled-cycles-frontend|idle-cycles-frontend { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND); }
stalled-cycles-backend|idle-cycles-backend { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_BACKEND); }
Expand Down Expand Up @@ -127,18 +159,16 @@ speculative-read|speculative-load |
refs|Reference|ops|access |
misses|miss { return str(yyscanner, PE_NAME_CACHE_OP_RESULT); }

/*
* These are event config hardcoded term names to be specified
* within xxx/.../ syntax. So far we dont clash with other names,
* so we can put them here directly. In case the we have a conflict
* in future, this needs to go into '//' condition block.
*/
<config>{
config { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG); }
config1 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG1); }
config2 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG2); }
name { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NAME); }
period { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD); }
branch_type { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE); }
, { return ','; }
"/" { BEGIN(INITIAL); return '/'; }
}

mem: { BEGIN(mem); return PE_PREFIX_MEM; }
r{num_raw_hex} { return raw(yyscanner); }
Expand All @@ -147,11 +177,11 @@ r{num_raw_hex} { return raw(yyscanner); }

{modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); }
{name} { return str(yyscanner, PE_NAME); }
"/" { return '/'; }
"/" { BEGIN(config); return '/'; }
- { return '-'; }
, { return ','; }
, { BEGIN(event); return ','; }
: { return ':'; }
"{" { return '{'; }
"{" { BEGIN(event); return '{'; }
"}" { return '}'; }
= { return '='; }
\n { }
Expand Down
20 changes: 18 additions & 2 deletions trunk/tools/perf/util/parse-events.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ do { \

%token PE_START_EVENTS PE_START_TERMS
%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM
%token PE_EVENT_NAME
%token PE_NAME
%token PE_MODIFIER_EVENT PE_MODIFIER_BP
%token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT
Expand All @@ -42,6 +43,7 @@ do { \
%type <str> PE_NAME_CACHE_OP_RESULT
%type <str> PE_MODIFIER_EVENT
%type <str> PE_MODIFIER_BP
%type <str> PE_EVENT_NAME
%type <num> value_sym
%type <head> event_config
%type <term> event_term
Expand All @@ -53,6 +55,8 @@ do { \
%type <head> event_legacy_numeric
%type <head> event_legacy_raw
%type <head> event_def
%type <head> event_mod
%type <head> event_name
%type <head> event
%type <head> events
%type <head> group_def
Expand Down Expand Up @@ -143,8 +147,10 @@ events ',' event
|
event

event:
event_def PE_MODIFIER_EVENT
event: event_mod

event_mod:
event_name PE_MODIFIER_EVENT
{
struct list_head *list = $1;

Expand All @@ -157,6 +163,16 @@ event_def PE_MODIFIER_EVENT
$$ = list;
}
|
event_name

event_name:
PE_EVENT_NAME event_def
{
ABORT_ON(parse_events_name($2, $1));
free($1);
$$ = $2;
}
|
event_def

event_def: event_pmu |
Expand Down

0 comments on commit f94ca0d

Please sign in to comment.