diff options
author | Andi Kleen <ak@linux.intel.com> | 2016-09-15 18:24:54 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-10-03 20:52:00 -0400 |
commit | 0b1db474314c883d0bfc6720278667a6155e995a (patch) | |
tree | 4fd4b0157b80eaa7cf72ef2a16ea037c89ebf587 /tools | |
parent | e312bcf13053970c0f07ec2c02d7d9be1a036ce0 (diff) |
perf pmu-events: Fix fixed counters on Intel
The JSON event lists use a different encoding for fixed counters than
perf for instructions and cycles (ref-cycles is ok)
This lead to some common events like inst_retired.any or
cpu_clk_unhalted.thread not counting, when specified with their JSON
name.
Special case these events in the jevents conversion process. I prefer
to not touch the JSON files for this, as it's intended that standard
JSON files can be just dropped into the perf build without changes.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
[Fix minor compile error]
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/1473978296-20712-18-git-send-email-sukadev@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/pmu-events/jevents.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 13f4284721d5..04e106e799ac 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c | |||
@@ -306,6 +306,29 @@ static void print_events_table_suffix(FILE *outfp) | |||
306 | close_table = 0; | 306 | close_table = 0; |
307 | } | 307 | } |
308 | 308 | ||
309 | static struct fixed { | ||
310 | const char *name; | ||
311 | const char *event; | ||
312 | } fixed[] = { | ||
313 | { "inst_retired.any", "event=0xc0" }, | ||
314 | { "cpu_clk_unhalted.thread", "event=0x3c" }, | ||
315 | { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" }, | ||
316 | { NULL, NULL}, | ||
317 | }; | ||
318 | |||
319 | /* | ||
320 | * Handle different fixed counter encodings between JSON and perf. | ||
321 | */ | ||
322 | static char *real_event(const char *name, char *event) | ||
323 | { | ||
324 | int i; | ||
325 | |||
326 | for (i = 0; fixed[i].name; i++) | ||
327 | if (!strcasecmp(name, fixed[i].name)) | ||
328 | return (char *)fixed[i].event; | ||
329 | return event; | ||
330 | } | ||
331 | |||
309 | /* Call func with each event in the json file */ | 332 | /* Call func with each event in the json file */ |
310 | int json_events(const char *fn, | 333 | int json_events(const char *fn, |
311 | int (*func)(void *data, char *name, char *event, char *desc, | 334 | int (*func)(void *data, char *name, char *event, char *desc, |
@@ -392,7 +415,7 @@ int json_events(const char *fn, | |||
392 | addfield(map, &event, ",", msr->pname, msrval); | 415 | addfield(map, &event, ",", msr->pname, msrval); |
393 | fixname(name); | 416 | fixname(name); |
394 | 417 | ||
395 | err = func(data, name, event, desc, long_desc); | 418 | err = func(data, name, real_event(name, event), desc, long_desc); |
396 | free(event); | 419 | free(event); |
397 | free(desc); | 420 | free(desc); |
398 | free(name); | 421 | free(name); |