[v2] perf vendor events intel: Add umasks/occ_sel to PCU events.

  UMasks were being dropped leading to all PCU
UNC_P_POWER_STATE_OCCUPANCY events having the same encoding. Don't
drop the umask trying to be consistent with other sources of events
like libpfm4 [1]. Older models need to use occ_sel rather than umask,
correct these values too. This applies the change from [2].

[1] https://sourceforge.net/p/perfmon2/libpfm4/ci/master/tree/lib/events/intel_skx_unc_pcu_events.h#l30
[2] https://github.com/captain5050/perfmon/commit/cbd4aee81023e5bfa09677b1ce170ff69e9c423d

Signed-off-by: Ian Rogers <irogers@google.com>
---
v2 corrects BDW-DE, BDX, HSX and JKT to not use umask but occ_sel.
---
 tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json  | 3 +++
 tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json   | 3 +++
 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json | 3 +++
 tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json     | 3 +++
 tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json     | 3 +++
 tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json      | 3 +++
 tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json     | 3 +++
 tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json     | 3 +++
 tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json   | 3 +++
 9 files changed, 27 insertions(+)
  

On 2024-02-28 12:05 p.m., Ian Rogers wrote:
> UMasks were being dropped leading to all PCU
> UNC_P_POWER_STATE_OCCUPANCY events having the same encoding. Don't
> drop the umask trying to be consistent with other sources of events
> like libpfm4 [1]. Older models need to use occ_sel rather than umask,
> correct these values too. This applies the change from [2].
> 
> [1] https://sourceforge.net/p/perfmon2/libpfm4/ci/master/tree/lib/events/intel_skx_unc_pcu_events.h#l30
> [2] https://github.com/captain5050/perfmon/commit/cbd4aee81023e5bfa09677b1ce170ff69e9c423d
> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> v2 corrects BDW-DE, BDX, HSX and JKT to not use umask but occ_sel.

Thanks Ian for the fix.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>

Thanks,
Kan
> ---
>  tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json  | 3 +++
>  tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json   | 3 +++
>  tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json | 3 +++
>  tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json     | 3 +++
>  tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json     | 3 +++
>  tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json      | 3 +++
>  tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json     | 3 +++
>  tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json     | 3 +++
>  tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json   | 3 +++
>  9 files changed, 27 insertions(+)
> 
> diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
> index 83d20130c217..320aaab53a0b 100644
> --- a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
> @@ -394,6 +394,7 @@
>          "BriefDescription": "Number of cores in C-State; C0 and C1",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
> +        "Filter": "occ_sel=1",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -402,6 +403,7 @@
>          "BriefDescription": "Number of cores in C-State; C3",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
> +        "Filter": "occ_sel=2",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -410,6 +412,7 @@
>          "BriefDescription": "Number of cores in C-State; C6 and C7",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
> +        "Filter": "occ_sel=3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> diff --git a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
> index 83d20130c217..320aaab53a0b 100644
> --- a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
> @@ -394,6 +394,7 @@
>          "BriefDescription": "Number of cores in C-State; C0 and C1",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
> +        "Filter": "occ_sel=1",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -402,6 +403,7 @@
>          "BriefDescription": "Number of cores in C-State; C3",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
> +        "Filter": "occ_sel=2",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -410,6 +412,7 @@
>          "BriefDescription": "Number of cores in C-State; C6 and C7",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
> +        "Filter": "occ_sel=3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> diff --git a/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json b/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json
> index c6254af7a468..ceef46046488 100644
> --- a/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json
> @@ -144,6 +144,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x40",
>          "Unit": "PCU"
>      },
>      {
> @@ -152,6 +153,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x80",
>          "Unit": "PCU"
>      },
>      {
> @@ -160,6 +162,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0xc0",
>          "Unit": "PCU"
>      },
>      {
> diff --git a/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json b/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
> index daebf1050acb..c391325ee36b 100644
> --- a/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
> @@ -426,6 +426,7 @@
>          "BriefDescription": "Number of cores in C-State; C0 and C1",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
> +        "Filter": "occ_sel=1",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -434,6 +435,7 @@
>          "BriefDescription": "Number of cores in C-State; C3",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
> +        "Filter": "occ_sel=2",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -442,6 +444,7 @@
>          "BriefDescription": "Number of cores in C-State; C6 and C7",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
> +        "Filter": "occ_sel=3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> diff --git a/tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json b/tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json
> index ee4dac6fc797..920cab6ffe37 100644
> --- a/tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json
> @@ -151,6 +151,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
>          "PerPkg": "1",
>          "PublicDescription": "Number of cores in C-State : C0 and C1 : This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x40",
>          "Unit": "PCU"
>      },
>      {
> @@ -159,6 +160,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
>          "PerPkg": "1",
>          "PublicDescription": "Number of cores in C-State : C3 : This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x80",
>          "Unit": "PCU"
>      },
>      {
> @@ -167,6 +169,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
>          "PerPkg": "1",
>          "PublicDescription": "Number of cores in C-State : C6 and C7 : This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0xc0",
>          "Unit": "PCU"
>      },
>      {
> 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 5df1ebfb89ea..ad6c531a9e38 100644
> --- a/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
> @@ -514,6 +514,7 @@
>          "BriefDescription": "Number of cores in C-State; C0 and C1",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
> +        "Filter": "occ_sel=1",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -522,6 +523,7 @@
>          "BriefDescription": "Number of cores in C-State; C3",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
> +        "Filter": "occ_sel=2",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -530,6 +532,7 @@
>          "BriefDescription": "Number of cores in C-State; C6 and C7",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
> +        "Filter": "occ_sel=3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> 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 b3ee5d741015..6f98fc1728e6 100644
> --- a/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
> @@ -233,6 +233,7 @@
>          "BriefDescription": "Number of cores in C0",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
> +        "Filter": "occ_sel=1",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in C0.  It can be used by itself to get the average number of cores in C0, with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -241,6 +242,7 @@
>          "BriefDescription": "Number of cores in C0",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
> +        "Filter": "occ_sel=2",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in C0.  It can be used by itself to get the average number of cores in C0, with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> @@ -249,6 +251,7 @@
>          "BriefDescription": "Number of cores in C0",
>          "EventCode": "0x80",
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
> +        "Filter": "occ_sel=3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in C0.  It can be used by itself to get the average number of cores in C0, with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
>          "Unit": "PCU"
> diff --git a/tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json b/tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json
> index c6254af7a468..ceef46046488 100644
> --- a/tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json
> @@ -144,6 +144,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x40",
>          "Unit": "PCU"
>      },
>      {
> @@ -152,6 +153,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x80",
>          "Unit": "PCU"
>      },
>      {
> @@ -160,6 +162,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
>          "PerPkg": "1",
>          "PublicDescription": "This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0xc0",
>          "Unit": "PCU"
>      },
>      {
> diff --git a/tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json b/tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json
> index a61ffca2dfea..dcf268467db9 100644
> --- a/tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json
> +++ b/tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json
> @@ -150,6 +150,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C0",
>          "PerPkg": "1",
>          "PublicDescription": "Number of cores in C-State : C0 and C1 : This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x40",
>          "Unit": "PCU"
>      },
>      {
> @@ -158,6 +159,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C3",
>          "PerPkg": "1",
>          "PublicDescription": "Number of cores in C-State : C3 : This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0x80",
>          "Unit": "PCU"
>      },
>      {
> @@ -166,6 +168,7 @@
>          "EventName": "UNC_P_POWER_STATE_OCCUPANCY.CORES_C6",
>          "PerPkg": "1",
>          "PublicDescription": "Number of cores in C-State : C6 and C7 : This is an occupancy event that tracks the number of cores that are in the chosen C-State.  It can be used by itself to get the average number of cores in that C-state with thresholding to generate histograms, or with other PCU events and occupancy triggering to capture other details.",
> +        "UMask": "0xc0",
>          "Unit": "PCU"
>      },
>      {