|
@@ -48,6 +48,7 @@ static inc_group_count(struct list_head *list,
|
|
|
%token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
|
|
|
%token PE_ERROR
|
|
|
%token PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT
|
|
|
+%token PE_ARRAY_ALL PE_ARRAY_RANGE
|
|
|
%type <num> PE_VALUE
|
|
|
%type <num> PE_VALUE_SYM_HW
|
|
|
%type <num> PE_VALUE_SYM_SW
|
|
@@ -83,6 +84,9 @@ static inc_group_count(struct list_head *list,
|
|
|
%type <head> group_def
|
|
|
%type <head> group
|
|
|
%type <head> groups
|
|
|
+%type <array> array
|
|
|
+%type <array> array_term
|
|
|
+%type <array> array_terms
|
|
|
|
|
|
%union
|
|
|
{
|
|
@@ -94,6 +98,7 @@ static inc_group_count(struct list_head *list,
|
|
|
char *sys;
|
|
|
char *event;
|
|
|
} tracepoint_name;
|
|
|
+ struct parse_events_array array;
|
|
|
}
|
|
|
%%
|
|
|
|
|
@@ -572,6 +577,86 @@ PE_TERM
|
|
|
ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1, &@1, NULL));
|
|
|
$$ = term;
|
|
|
}
|
|
|
+|
|
|
|
+PE_NAME array '=' PE_NAME
|
|
|
+{
|
|
|
+ struct parse_events_term *term;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
|
|
|
+ $1, $4, &@1, &@4));
|
|
|
+
|
|
|
+ term->array = $2;
|
|
|
+ $$ = term;
|
|
|
+}
|
|
|
+|
|
|
|
+PE_NAME array '=' PE_VALUE
|
|
|
+{
|
|
|
+ struct parse_events_term *term;
|
|
|
+
|
|
|
+ ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
|
|
|
+ $1, $4, &@1, &@4));
|
|
|
+ term->array = $2;
|
|
|
+ $$ = term;
|
|
|
+}
|
|
|
+
|
|
|
+array:
|
|
|
+'[' array_terms ']'
|
|
|
+{
|
|
|
+ $$ = $2;
|
|
|
+}
|
|
|
+|
|
|
|
+PE_ARRAY_ALL
|
|
|
+{
|
|
|
+ $$.nr_ranges = 0;
|
|
|
+ $$.ranges = NULL;
|
|
|
+}
|
|
|
+
|
|
|
+array_terms:
|
|
|
+array_terms ',' array_term
|
|
|
+{
|
|
|
+ struct parse_events_array new_array;
|
|
|
+
|
|
|
+ new_array.nr_ranges = $1.nr_ranges + $3.nr_ranges;
|
|
|
+ new_array.ranges = malloc(sizeof(new_array.ranges[0]) *
|
|
|
+ new_array.nr_ranges);
|
|
|
+ ABORT_ON(!new_array.ranges);
|
|
|
+ memcpy(&new_array.ranges[0], $1.ranges,
|
|
|
+ $1.nr_ranges * sizeof(new_array.ranges[0]));
|
|
|
+ memcpy(&new_array.ranges[$1.nr_ranges], $3.ranges,
|
|
|
+ $3.nr_ranges * sizeof(new_array.ranges[0]));
|
|
|
+ free($1.ranges);
|
|
|
+ free($3.ranges);
|
|
|
+ $$ = new_array;
|
|
|
+}
|
|
|
+|
|
|
|
+array_term
|
|
|
+
|
|
|
+array_term:
|
|
|
+PE_VALUE
|
|
|
+{
|
|
|
+ struct parse_events_array array;
|
|
|
+
|
|
|
+ array.nr_ranges = 1;
|
|
|
+ array.ranges = malloc(sizeof(array.ranges[0]));
|
|
|
+ ABORT_ON(!array.ranges);
|
|
|
+ array.ranges[0].start = $1;
|
|
|
+ array.ranges[0].length = 1;
|
|
|
+ $$ = array;
|
|
|
+}
|
|
|
+|
|
|
|
+PE_VALUE PE_ARRAY_RANGE PE_VALUE
|
|
|
+{
|
|
|
+ struct parse_events_array array;
|
|
|
+
|
|
|
+ ABORT_ON($3 < $1);
|
|
|
+ array.nr_ranges = 1;
|
|
|
+ array.ranges = malloc(sizeof(array.ranges[0]));
|
|
|
+ ABORT_ON(!array.ranges);
|
|
|
+ array.ranges[0].start = $1;
|
|
|
+ array.ranges[0].length = $3 - $1 + 1;
|
|
|
+ $$ = array;
|
|
|
+}
|
|
|
|
|
|
sep_dc: ':' |
|
|
|
|