Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c022c7f6 authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

perf jevents: Fix period for Intel fixed counters 



[ 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: default avatarAndi 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5ecf35ed

tools/perf/pmu-events/jevents.c

+6 −6
Original line number Diff line number Diff line
@@ -446,12 +446,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},

};