| From bb57e302ab52847af2d53a9ba15cbe39153ffc65 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 27 Sep 2019 16:35:45 -0700 |
| Subject: perf jevents: Fix period for Intel fixed counters |
| |
| From: Andi Kleen <ak@linux.intel.com> |
| |
| [ Upstream commit 6bdfd9f118bd59cf0f85d3bf4b72b586adea17c1 ] |
| |
| The Intel fixed counters use a special table to override the JSON |
| information. |
| |
| During this override the period information from the JSON file got |
| dropped, which results in inst_retired.any and similar running with |
| frequency mode instead of a period. |
| |
| Just specify the expected period in the table. |
| |
| Signed-off-by: Andi Kleen <ak@linux.intel.com> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Link: http://lore.kernel.org/lkml/20190927233546.11533-2-andi@firstfloor.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/pmu-events/jevents.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c |
| index d413761621b09..fa85e33762f72 100644 |
| --- a/tools/perf/pmu-events/jevents.c |
| +++ b/tools/perf/pmu-events/jevents.c |
| @@ -449,12 +449,12 @@ static struct fixed { |
| const char *name; |
| const char *event; |
| } fixed[] = { |
| - { "inst_retired.any", "event=0xc0" }, |
| - { "inst_retired.any_p", "event=0xc0" }, |
| - { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03" }, |
| - { "cpu_clk_unhalted.thread", "event=0x3c" }, |
| - { "cpu_clk_unhalted.core", "event=0x3c" }, |
| - { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" }, |
| + { "inst_retired.any", "event=0xc0,period=2000003" }, |
| + { "inst_retired.any_p", "event=0xc0,period=2000003" }, |
| + { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03,period=2000003" }, |
| + { "cpu_clk_unhalted.thread", "event=0x3c,period=2000003" }, |
| + { "cpu_clk_unhalted.core", "event=0x3c,period=2000003" }, |
| + { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1,period=2000003" }, |
| { NULL, NULL}, |
| }; |
| |
| -- |
| 2.20.1 |
| |
