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: Jiri Olsa <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Corey Ashford <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Stephane Eranian <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 75c7b0fca6d96baadc7b084c84a73d3f89ea3273..2fe15874e46e7fab700be86fbcd781ecd1b17a41 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -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)
 {

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 839230ceb18bd918b194d0fc719607445ad7bb00..ac9a6aacf2f53d54abbf02f17130ab42fc924dbc 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -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);

diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index cd88209e3c5876e96f26ef9046d2778554c18b9e..0f9914ae6bacb0b801650cb1c9449852b8a0ff1f 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -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;