Re: [PATCH] perf tools: Fix wrong filter_band* values for uncore events

From: Arnaldo Carvalho de Melo
Date: Wed Oct 10 2018 - 08:58:21 EST


Em Wed, Oct 10, 2018 at 10:03:39AM +0200, Jiri Olsa escreveu:
> On Tue, Oct 09, 2018 at 02:18:39PM -0700, Andi Kleen wrote:
> > On Tue, Oct 09, 2018 at 12:01:44PM +0200, Jiri Olsa wrote:
> > > On Wed, Oct 03, 2018 at 07:45:50AM -0700, Andi Kleen wrote:
> > > > > note there's couple of changes that actually changed
> > > > > the number completely, like:
> > > > >
> > > > > - "Filter": "edge=1,filter_band2=4000",
> > > > > + "Filter": "edge=1,filter_band2=30",
> > > >
> > > > Thanks. Looks good. I'll fix the scripts to generate the uncore events.
> > >
> > > hi,
> > > any idea when you could post an update for this?
> >
> > Can just use your patch for the existing event lists. You can add
> >
> > Acked-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> >
> > I was mainly worried about future updates, but it doesn't seem to be a problem.
>
> ok, attaching patch with full changelog
>
> thanks,
> jirka

Ok, queuing this up in perf/urgent.

Thanks,

- Arnaldo

>
> ---
> Michael reported that he could not stat following event:
>
> $ perf stat -e unc_p_freq_ge_1200mhz_cycles -a -- ls
> event syntax error: '..e_1200mhz_cycles'
> \___ value too big for format, maximum is 255
> Run 'perf list' for a list of valid events
>
> The event is unwrapped into:
> uncore_pcu/event=0xb,filter_band0=1200/
>
> where filter_band0 format says it's one byte only:
>
> # cat uncore_pcu/format/filter_band0
> config1:0-7
>
> while json files specifies bigger number:
>
> "Filter": "filter_band0=1200",
>
> all the filter_band* formats show 1 byte width:
>
> # cat uncore_pcu/format/filter_band1
> config1:8-15
> # cat uncore_pcu/format/filter_band2
> config1:16-23
> # cat uncore_pcu/format/filter_band3
> config1:24-31
>
> The reason of the issue is that filter_band* values are
> supposed to be in 100Mhz units.. it's stated in the json
> help for the events, like:
>
> filter_band3=XXX, with XXX in 100Mhz units
>
> This patch divides the filter_band* values by 100,
> plus there's couple of changes that actually change
> the number completely, like:
>
> - "Filter": "edge=1,filter_band2=4000",
> + "Filter": "edge=1,filter_band2=30",
>
> Reported-by: Michael Petlan <mpetlan@xxxxxxxxxx>
> Acked-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> Link: http://lkml.kernel.org/n/tip-ujl4yzkexf3i10fjw24maa9e@xxxxxxxxxxxxxx
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
> .../arch/x86/ivytown/uncore-power.json | 16 ++++++++--------
> .../arch/x86/jaketown/uncore-power.json | 16 ++++++++--------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json b/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
> index d40498f2cb1e..635c09fda1d9 100644
> --- a/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
> @@ -188,7 +188,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xb",
> "EventName": "UNC_P_FREQ_GE_1200MHZ_CYCLES",
> - "Filter": "filter_band0=1200",
> + "Filter": "filter_band0=12",
> "MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_1200mhz_cycles %",
> "PerPkg": "1",
> @@ -199,7 +199,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xc",
> "EventName": "UNC_P_FREQ_GE_2000MHZ_CYCLES",
> - "Filter": "filter_band1=2000",
> + "Filter": "filter_band1=20",
> "MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_2000mhz_cycles %",
> "PerPkg": "1",
> @@ -210,7 +210,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xd",
> "EventName": "UNC_P_FREQ_GE_3000MHZ_CYCLES",
> - "Filter": "filter_band2=3000",
> + "Filter": "filter_band2=30",
> "MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_3000mhz_cycles %",
> "PerPkg": "1",
> @@ -221,7 +221,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xe",
> "EventName": "UNC_P_FREQ_GE_4000MHZ_CYCLES",
> - "Filter": "filter_band3=4000",
> + "Filter": "filter_band3=40",
> "MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_4000mhz_cycles %",
> "PerPkg": "1",
> @@ -232,7 +232,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xb",
> "EventName": "UNC_P_FREQ_GE_1200MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band0=1200",
> + "Filter": "edge=1,filter_band0=12",
> "MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_1200mhz_cycles %",
> "PerPkg": "1",
> @@ -243,7 +243,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xc",
> "EventName": "UNC_P_FREQ_GE_2000MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band1=2000",
> + "Filter": "edge=1,filter_band1=20",
> "MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_2000mhz_cycles %",
> "PerPkg": "1",
> @@ -254,7 +254,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xd",
> "EventName": "UNC_P_FREQ_GE_3000MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band2=4000",
> + "Filter": "edge=1,filter_band2=30",
> "MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_3000mhz_cycles %",
> "PerPkg": "1",
> @@ -265,7 +265,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xe",
> "EventName": "UNC_P_FREQ_GE_4000MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band3=4000",
> + "Filter": "edge=1,filter_band3=40",
> "MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_4000mhz_cycles %",
> "PerPkg": "1",
> diff --git a/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json b/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
> index 16034bfd06dd..8755693d86c6 100644
> --- a/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
> @@ -187,7 +187,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xb",
> "EventName": "UNC_P_FREQ_GE_1200MHZ_CYCLES",
> - "Filter": "filter_band0=1200",
> + "Filter": "filter_band0=12",
> "MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_1200mhz_cycles %",
> "PerPkg": "1",
> @@ -198,7 +198,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xc",
> "EventName": "UNC_P_FREQ_GE_2000MHZ_CYCLES",
> - "Filter": "filter_band1=2000",
> + "Filter": "filter_band1=20",
> "MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_2000mhz_cycles %",
> "PerPkg": "1",
> @@ -209,7 +209,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xd",
> "EventName": "UNC_P_FREQ_GE_3000MHZ_CYCLES",
> - "Filter": "filter_band2=3000",
> + "Filter": "filter_band2=30",
> "MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_3000mhz_cycles %",
> "PerPkg": "1",
> @@ -220,7 +220,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xe",
> "EventName": "UNC_P_FREQ_GE_4000MHZ_CYCLES",
> - "Filter": "filter_band3=4000",
> + "Filter": "filter_band3=40",
> "MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_4000mhz_cycles %",
> "PerPkg": "1",
> @@ -231,7 +231,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xb",
> "EventName": "UNC_P_FREQ_GE_1200MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band0=1200",
> + "Filter": "edge=1,filter_band0=12",
> "MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_1200mhz_cycles %",
> "PerPkg": "1",
> @@ -242,7 +242,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xc",
> "EventName": "UNC_P_FREQ_GE_2000MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band1=2000",
> + "Filter": "edge=1,filter_band1=20",
> "MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_2000mhz_cycles %",
> "PerPkg": "1",
> @@ -253,7 +253,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xd",
> "EventName": "UNC_P_FREQ_GE_3000MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band2=4000",
> + "Filter": "edge=1,filter_band2=30",
> "MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_3000mhz_cycles %",
> "PerPkg": "1",
> @@ -264,7 +264,7 @@
> "Counter": "0,1,2,3",
> "EventCode": "0xe",
> "EventName": "UNC_P_FREQ_GE_4000MHZ_TRANSITIONS",
> - "Filter": "edge=1,filter_band3=4000",
> + "Filter": "edge=1,filter_band3=40",
> "MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
> "MetricName": "freq_ge_4000mhz_cycles %",
> "PerPkg": "1",
> --
> 2.17.1