From 4781f1f270fea983a6579ddad5e8dc8ad33f1fed Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 Apr 2023 17:13:21 -0700 Subject: [PATCH] perf vendor events intel: Update free running snowridgex events Fix the PMU names, event code and umask. Remove UNC_IIO_BANDWIDTH_OUT events that aren't supported. These updates were generated by: https://github.com/intel/perfmon/blob/main/scripts/create_perf_json.py with this PR: https://github.com/intel/perfmon/pull/66 Signed-off-by: Ian Rogers : Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Xing Zhengjun Link: https://lore.kernel.org/r/20230407001322.2776268-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo --- .../arch/x86/snowridgex/uncore-memory.json | 4 +- .../arch/x86/snowridgex/uncore-other.json | 92 ++++++------------- 2 files changed, 30 insertions(+), 66 deletions(-) diff --git a/tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json b/tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json index 7dc0910694ed..530e9b71b92a 100644 --- a/tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json +++ b/tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json @@ -127,10 +127,12 @@ }, { "BriefDescription": "Free running counter that increments for the Memory Controller", + "EventCode": "0xff", "EventName": "UNC_M_CLOCKTICKS_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_M_CLOCKTICKS_FREERUN", - "Unit": "iMC" + "UMask": "0x10", + "Unit": "imc_free_running" }, { "BriefDescription": "DRAM Precharge All Commands", diff --git a/tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json b/tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json index 3b35e08e24d6..8bd041bc0c57 100644 --- a/tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json +++ b/tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json @@ -7129,115 +7129,75 @@ }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART0_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART0_FREERUN", - "Unit": "IIO" + "UMask": "0x20", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART1_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART1_FREERUN", - "Unit": "IIO" + "UMask": "0x21", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART2_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART2_FREERUN", - "Unit": "IIO" + "UMask": "0x22", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART3_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART3_FREERUN", - "Unit": "IIO" + "UMask": "0x23", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART4_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART4_FREERUN", - "Unit": "IIO" + "UMask": "0x24", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART5_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART5_FREERUN", - "Unit": "IIO" + "UMask": "0x25", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART6_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART6_FREERUN", - "Unit": "IIO" + "UMask": "0x26", + "Unit": "iio_free_running" }, { "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", + "EventCode": "0xff", "EventName": "UNC_IIO_BANDWIDTH_IN.PART7_FREERUN", "PerPkg": "1", "PublicDescription": "UNC_IIO_BANDWIDTH_IN.PART7_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART0_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART0_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART1_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART1_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART2_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART2_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART3_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART3_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART4_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART4_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART5_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART5_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART6_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART6_FREERUN", - "Unit": "IIO" - }, - { - "BriefDescription": "Free running counter that increments for every 32 bytes of data sent from the IO agent to the SOC", - "EventName": "UNC_IIO_BANDWIDTH_OUT.PART7_FREERUN", - "PerPkg": "1", - "PublicDescription": "UNC_IIO_BANDWIDTH_OUT.PART7_FREERUN", - "Unit": "IIO" + "UMask": "0x27", + "Unit": "iio_free_running" }, { "BriefDescription": "Clockticks of the integrated IO (IIO) traffic controller", @@ -7248,10 +7208,12 @@ }, { "BriefDescription": "Free running counter that increments for IIO clocktick", + "EventCode": "0xff", "EventName": "UNC_IIO_CLOCKTICKS_FREERUN", "PerPkg": "1", "PublicDescription": "Free running counter that increments for integrated IO (IIO) traffic controller clockticks", - "Unit": "IIO" + "UMask": "0x10", + "Unit": "iio_free_running" }, { "BriefDescription": "PCIe Completion Buffer Inserts : All Ports", -- 2.34.1