From 54bc363afa5bbc97d9ce3423ec54ac907a95c669 Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Thu, 6 Apr 2023 17:13:20 -0700
Subject: [PATCH] perf vendor events intel: Correct knightslanding memory topic

Correct the memory topic of events for the imc related PMUs.

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 <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20230407001322.2776268-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 .../x86/knightslanding/uncore-memory.json     | 38 +++++++++++++++++++
 .../arch/x86/knightslanding/uncore-other.json | 36 ------------------
 2 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json

diff --git a/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json b/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
new file mode 100644
index 0000000000000..47da947b1a6e8
--- /dev/null
+++ b/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
@@ -0,0 +1,38 @@
+[
+    {
+        "BriefDescription": "CAS All",
+        "EventCode": "0x03",
+        "EventName": "UNC_M_CAS_COUNT.ALL",
+        "PerPkg": "1",
+        "UMask": "0x3",
+        "Unit": "iMC_DCLK"
+    },
+    {
+        "BriefDescription": "CAS Reads",
+        "EventCode": "0x03",
+        "EventName": "UNC_M_CAS_COUNT.RD",
+        "PerPkg": "1",
+        "UMask": "0x1",
+        "Unit": "iMC_DCLK"
+    },
+    {
+        "BriefDescription": "CAS Writes",
+        "EventCode": "0x03",
+        "EventName": "UNC_M_CAS_COUNT.WR",
+        "PerPkg": "1",
+        "UMask": "0x2",
+        "Unit": "iMC_DCLK"
+    },
+    {
+        "BriefDescription": "DCLK count",
+        "EventName": "UNC_M_D_CLOCKTICKS",
+        "PerPkg": "1",
+        "Unit": "iMC_DCLK"
+    },
+    {
+        "BriefDescription": "UCLK count",
+        "EventName": "UNC_M_U_CLOCKTICKS",
+        "PerPkg": "1",
+        "Unit": "iMC_UCLK"
+    }
+]
diff --git a/tools/perf/pmu-events/arch/x86/knightslanding/uncore-other.json b/tools/perf/pmu-events/arch/x86/knightslanding/uncore-other.json
index 491cb37ddab06..fc85e0c953181 100644
--- a/tools/perf/pmu-events/arch/x86/knightslanding/uncore-other.json
+++ b/tools/perf/pmu-events/arch/x86/knightslanding/uncore-other.json
@@ -3621,41 +3621,5 @@
         "PerPkg": "1",
         "UMask": "0x4",
         "Unit": "M2PCIe"
-    },
-    {
-        "BriefDescription": "CAS All",
-        "EventCode": "0x03",
-        "EventName": "UNC_M_CAS_COUNT.ALL",
-        "PerPkg": "1",
-        "UMask": "0x3",
-        "Unit": "iMC_DCLK"
-    },
-    {
-        "BriefDescription": "CAS Reads",
-        "EventCode": "0x03",
-        "EventName": "UNC_M_CAS_COUNT.RD",
-        "PerPkg": "1",
-        "UMask": "0x1",
-        "Unit": "iMC_DCLK"
-    },
-    {
-        "BriefDescription": "CAS Writes",
-        "EventCode": "0x03",
-        "EventName": "UNC_M_CAS_COUNT.WR",
-        "PerPkg": "1",
-        "UMask": "0x2",
-        "Unit": "iMC_DCLK"
-    },
-    {
-        "BriefDescription": "DCLK count",
-        "EventName": "UNC_M_D_CLOCKTICKS",
-        "PerPkg": "1",
-        "Unit": "iMC_DCLK"
-    },
-    {
-        "BriefDescription": "UCLK count",
-        "EventName": "UNC_M_U_CLOCKTICKS",
-        "PerPkg": "1",
-        "Unit": "iMC_UCLK"
     }
 ]
-- 
2.30.2