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>
This commit is contained in:
parent
e312bcf130
commit
0b1db47431
|
@ -306,6 +306,29 @@ static void print_events_table_suffix(FILE *outfp)
|
||||||
close_table = 0;
|
close_table = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct fixed {
|
||||||
|
const char *name;
|
||||||
|
const char *event;
|
||||||
|
} fixed[] = {
|
||||||
|
{ "inst_retired.any", "event=0xc0" },
|
||||||
|
{ "cpu_clk_unhalted.thread", "event=0x3c" },
|
||||||
|
{ "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" },
|
||||||
|
{ NULL, NULL},
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handle different fixed counter encodings between JSON and perf.
|
||||||
|
*/
|
||||||
|
static char *real_event(const char *name, char *event)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; fixed[i].name; i++)
|
||||||
|
if (!strcasecmp(name, fixed[i].name))
|
||||||
|
return (char *)fixed[i].event;
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
/* Call func with each event in the json file */
|
/* Call func with each event in the json file */
|
||||||
int json_events(const char *fn,
|
int json_events(const char *fn,
|
||||||
int (*func)(void *data, char *name, char *event, char *desc,
|
int (*func)(void *data, char *name, char *event, char *desc,
|
||||||
|
@ -392,7 +415,7 @@ int json_events(const char *fn,
|
||||||
addfield(map, &event, ",", msr->pname, msrval);
|
addfield(map, &event, ",", msr->pname, msrval);
|
||||||
fixname(name);
|
fixname(name);
|
||||||
|
|
||||||
err = func(data, name, event, desc, long_desc);
|
err = func(data, name, real_event(name, event), desc, long_desc);
|
||||||
free(event);
|
free(event);
|
||||||
free(desc);
|
free(desc);
|
||||||
free(name);
|
free(name);
|
||||||
|
|
Loading…
Reference in a new issue