linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/14] perf vendor events intel: Fix icelake cstate metrics
@ 2022-04-13 21:04 Ian Rogers
  2022-04-13 21:04 ` [PATCH 02/14] perf vendor events intel: Fix icelakex " Ian Rogers
                   ` (13 more replies)
  0 siblings, 14 replies; 19+ messages in thread
From: Ian Rogers @ 2022-04-13 21:04 UTC (permalink / raw)
  To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Maxime Coquelin, Alexandre Torgue, Kan Liang, Xing Zhengjun,
	Andi Kleen, John Garry, James Clark, linux-kernel,
	linux-perf-users
  Cc: Ian Rogers

Apply cstate fix from:
https://github.com/intel/event-converter-for-linux-perf/
so that metrics for cstates that exist on the particular architecture
are generated. This corrects issues with metric testing.

Also correct topic of ASSISTS.ANY event.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 .../arch/x86/icelake/icl-metrics.json         | 24 ++++++++++++++-----
 .../pmu-events/arch/x86/icelake/other.json    | 14 +----------
 .../pmu-events/arch/x86/icelake/pipeline.json | 14 ++++++++++-
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/tools/perf/pmu-events/arch/x86/icelake/icl-metrics.json b/tools/perf/pmu-events/arch/x86/icelake/icl-metrics.json
index 4af23c04dc18..ea73bc1889ba 100644
--- a/tools/perf/pmu-events/arch/x86/icelake/icl-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/icelake/icl-metrics.json
@@ -408,12 +408,6 @@
         "MetricGroup": "Branches;OS",
         "MetricName": "IpFarBranch"
     },
-    {
-        "BriefDescription": "C3 residency percent per core",
-        "MetricExpr": "(cstate_core@c3\\-residency@ / msr@tsc@) * 100",
-        "MetricGroup": "Power",
-        "MetricName": "C3_Core_Residency"
-    },
     {
         "BriefDescription": "C6 residency percent per core",
         "MetricExpr": "(cstate_core@c6\\-residency@ / msr@tsc@) * 100",
@@ -449,5 +443,23 @@
         "MetricExpr": "(cstate_pkg@c7\\-residency@ / msr@tsc@) * 100",
         "MetricGroup": "Power",
         "MetricName": "C7_Pkg_Residency"
+    },
+    {
+        "BriefDescription": "C8 residency percent per package",
+        "MetricExpr": "(cstate_pkg@c8\\-residency@ / msr@tsc@) * 100",
+        "MetricGroup": "Power",
+        "MetricName": "C8_Pkg_Residency"
+    },
+    {
+        "BriefDescription": "C9 residency percent per package",
+        "MetricExpr": "(cstate_pkg@c9\\-residency@ / msr@tsc@) * 100",
+        "MetricGroup": "Power",
+        "MetricName": "C9_Pkg_Residency"
+    },
+    {
+        "BriefDescription": "C10 residency percent per package",
+        "MetricExpr": "(cstate_pkg@c10\\-residency@ / msr@tsc@) * 100",
+        "MetricGroup": "Power",
+        "MetricName": "C10_Pkg_Residency"
     }
 ]
diff --git a/tools/perf/pmu-events/arch/x86/icelake/other.json b/tools/perf/pmu-events/arch/x86/icelake/other.json
index 08f6321025e8..2e177f95a9cb 100644
--- a/tools/perf/pmu-events/arch/x86/icelake/other.json
+++ b/tools/perf/pmu-events/arch/x86/icelake/other.json
@@ -1,16 +1,4 @@
 [
-    {
-        "BriefDescription": "Number of occurrences where a microcode assist is invoked by hardware.",
-        "CollectPEBSRecord": "2",
-        "Counter": "0,1,2,3,4,5,6,7",
-        "EventCode": "0xc1",
-        "EventName": "ASSISTS.ANY",
-        "PEBScounters": "0,1,2,3,4,5,6,7",
-        "PublicDescription": "Counts the number of occurrences where a microcode assist is invoked by hardware Examples include AD (page Access Dirty), FP and AVX related assists.",
-        "SampleAfterValue": "100003",
-        "Speculative": "1",
-        "UMask": "0x7"
-    },
     {
         "BriefDescription": "Core cycles where the core was running in a manner where Turbo may be clipped to the Non-AVX turbo schedule.",
         "CollectPEBSRecord": "2",
@@ -407,4 +395,4 @@
         "Speculative": "1",
         "UMask": "0x1"
     }
-]
\ No newline at end of file
+]
diff --git a/tools/perf/pmu-events/arch/x86/icelake/pipeline.json b/tools/perf/pmu-events/arch/x86/icelake/pipeline.json
index 573ac7ac8879..2b58cfaaaf39 100644
--- a/tools/perf/pmu-events/arch/x86/icelake/pipeline.json
+++ b/tools/perf/pmu-events/arch/x86/icelake/pipeline.json
@@ -12,6 +12,18 @@
         "Speculative": "1",
         "UMask": "0x9"
     },
+    {
+        "BriefDescription": "Number of occurrences where a microcode assist is invoked by hardware.",
+        "CollectPEBSRecord": "2",
+        "Counter": "0,1,2,3,4,5,6,7",
+        "EventCode": "0xc1",
+        "EventName": "ASSISTS.ANY",
+        "PEBScounters": "0,1,2,3,4,5,6,7",
+        "PublicDescription": "Counts the number of occurrences where a microcode assist is invoked by hardware Examples include AD (page Access Dirty), FP and AVX related assists.",
+        "SampleAfterValue": "100003",
+        "Speculative": "1",
+        "UMask": "0x7"
+    },
     {
         "BriefDescription": "All branch instructions retired.",
         "CollectPEBSRecord": "2",
@@ -1102,4 +1114,4 @@
         "SampleAfterValue": "1000003",
         "UMask": "0x2"
     }
-]
\ No newline at end of file
+]
-- 
2.36.0.rc0.470.gd361397f0d-goog


^ permalink raw reply related	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2022-04-18 15:51 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-13 21:04 [PATCH 01/14] perf vendor events intel: Fix icelake cstate metrics Ian Rogers
2022-04-13 21:04 ` [PATCH 02/14] perf vendor events intel: Fix icelakex " Ian Rogers
2022-04-13 21:04 ` [PATCH 04/14] perf vendor events intel: Update CLX uncore to v1.14 Ian Rogers
2022-04-13 21:04 ` [PATCH 05/14] perf vendor events intel: Update SKX uncore Ian Rogers
2022-04-13 21:04 ` [PATCH 06/14] perf vendor events intel: Update nehalemep event topics Ian Rogers
2022-04-13 21:04 ` [PATCH 07/14] perf vendor events intel: Update tigerlake topic Ian Rogers
2022-04-13 21:04 ` [PATCH 08/14] perf vendor events intel: Update tremontx uncore and topics Ian Rogers
2022-04-13 21:04 ` [PATCH 09/14] perf vendor events intel: Update westmereep-dp event topics Ian Rogers
2022-04-13 21:04 ` [PATCH 10/14] perf vendor events intel: Update westmereep-sp " Ian Rogers
2022-04-13 21:05 ` [PATCH 11/14] perf vendor events intel: Update westmereex " Ian Rogers
2022-04-13 21:05 ` [PATCH 12/14] perf vendor events intel: Update elkhartlake " Ian Rogers
2022-04-13 21:05 ` [PATCH 13/14] perf vendor events intel: Update goldmontplus " Ian Rogers
2022-04-13 21:05 ` [PATCH 14/14] perf vendor events intel: Update goldmont " Ian Rogers
2022-04-14 12:11 ` [PATCH 01/14] perf vendor events intel: Fix icelake cstate metrics Arnaldo Carvalho de Melo
     [not found] ` <20220413210503.3256922-3-irogers@google.com>
2022-04-14 15:03   ` [PATCH 03/14] perf vendor events intel: Add sapphirerapids events Liang, Kan
2022-04-14 16:36     ` Ian Rogers
2022-04-14 18:25       ` Liang, Kan
2022-04-15  2:59         ` Xing Zhengjun
2022-04-18 15:39     ` Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).