[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20240301184942.2660478-3-irogers@google.com>
Date: Fri, 1 Mar 2024 10:49:42 -0800
From: Ian Rogers <irogers@...gle.com>
To: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>, Namhyung Kim <namhyung@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...nel.org>,
Ian Rogers <irogers@...gle.com>, Adrian Hunter <adrian.hunter@...el.com>,
John Garry <john.g.garry@...cle.com>, Kan Liang <kan.liang@...ux.intel.com>,
Jing Zhang <renyu.zj@...ux.alibaba.com>, Thomas Richter <tmricht@...ux.ibm.com>,
James Clark <james.clark@....com>, linux-kernel@...r.kernel.org,
linux-perf-users@...r.kernel.org, Stephane Eranian <eranian@...gle.com>
Subject: [PATCH v2 2/2] perf jevents: Add cycles breakdown metric for arm64/AMD/Intel
Breakdown cycles to user, kernel and guest. Add a common_metrics.py
file for such metrics.
Signed-off-by: Ian Rogers <irogers@...gle.com>
---
tools/perf/pmu-events/amd_metrics.py | 3 +++
tools/perf/pmu-events/arm64_metrics.py | 2 ++
tools/perf/pmu-events/common_metrics.py | 18 ++++++++++++++++++
tools/perf/pmu-events/intel_metrics.py | 2 ++
4 files changed, 25 insertions(+)
create mode 100644 tools/perf/pmu-events/common_metrics.py
diff --git a/tools/perf/pmu-events/amd_metrics.py b/tools/perf/pmu-events/amd_metrics.py
index 377ce413d051..5a1f10ecff4d 100755
--- a/tools/perf/pmu-events/amd_metrics.py
+++ b/tools/perf/pmu-events/amd_metrics.py
@@ -4,6 +4,7 @@ from metric import (d_ratio, has_event, max, Event, JsonEncodeMetric,
JsonEncodeMetricGroupDescriptions, Literal, LoadEvents,
Metric, MetricGroup, Select)
import argparse
+from common_metrics import Cycles
import json
import math
import os
@@ -572,6 +573,7 @@ def AmdUpc() -> Metric:
return Metric("upc", "Micro-ops retired per core cycle (higher is better)",
upc, "uops/cycle")
+
def Idle() -> Metric:
cyc = Event("msr/mperf/")
tsc = Event("msr/tsc/")
@@ -628,6 +630,7 @@ all_metrics = MetricGroup("", [
AmdHwpf(),
AmdSwpf(),
AmdUpc(),
+ Cycles(),
Idle(),
Rapl(),
UncoreL3(),
diff --git a/tools/perf/pmu-events/arm64_metrics.py b/tools/perf/pmu-events/arm64_metrics.py
index 0dcf5236ea1f..516b3fa08600 100755
--- a/tools/perf/pmu-events/arm64_metrics.py
+++ b/tools/perf/pmu-events/arm64_metrics.py
@@ -3,6 +3,7 @@
from metric import (d_ratio, Event, JsonEncodeMetric, JsonEncodeMetricGroupDescriptions,
LoadEvents, Metric, MetricGroup)
import argparse
+from common_metrics import Cycles
import json
import os
from typing import Optional
@@ -154,6 +155,7 @@ def Arm64Topdown() -> MetricGroup:
all_metrics = MetricGroup("",[
Arm64Topdown(),
+ Cycles(),
])
if args.metricgroups:
diff --git a/tools/perf/pmu-events/common_metrics.py b/tools/perf/pmu-events/common_metrics.py
new file mode 100644
index 000000000000..74c58f9ab020
--- /dev/null
+++ b/tools/perf/pmu-events/common_metrics.py
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
+from metric import (d_ratio, Event, Metric, MetricGroup)
+
+def Cycles() -> MetricGroup:
+ cyc_k = Event("cycles:kHh")
+ cyc_g = Event("cycles:G")
+ cyc_u = Event("cycles:uH")
+ cyc = cyc_k + cyc_g + cyc_u
+
+ return MetricGroup("cycles", [
+ Metric("cycles_total", "Total number of cycles", cyc, "cycles"),
+ Metric("cycles_user", "User cycles as a percentage of all cycles",
+ d_ratio(cyc_u, cyc), "100%"),
+ Metric("cycles_kernel", "Kernel cycles as a percentage of all cycles",
+ d_ratio(cyc_k, cyc), "100%"),
+ Metric("cycles_guest", "Hypervisor guest cycles as a percentage of all cycles",
+ d_ratio(cyc_g, cyc), "100%"),
+ ], description = "cycles breakdown per privilege level (users, kernel, guest)")
diff --git a/tools/perf/pmu-events/intel_metrics.py b/tools/perf/pmu-events/intel_metrics.py
index 5775ae8a87b4..1a34e2f7a590 100755
--- a/tools/perf/pmu-events/intel_metrics.py
+++ b/tools/perf/pmu-events/intel_metrics.py
@@ -4,6 +4,7 @@ from metric import (d_ratio, has_event, max, CheckPmu, Event, JsonEncodeMetric,
JsonEncodeMetricGroupDescriptions, Literal, LoadEvents,
Metric, MetricConstraint, MetricGroup, MetricRef, Select)
import argparse
+from common_metrics import Cycles
import json
import math
import os
@@ -1012,6 +1013,7 @@ def UncoreUpiBw() -> Optional[MetricGroup]:
all_metrics = MetricGroup("", [
+ Cycles(),
Idle(),
Rapl(),
Smi(),
--
2.44.0.278.ge034bb2e1d-goog
Powered by blists - more mailing lists