The metric adjusts for whether or not SMT is on.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/pmu-events/amd_metrics.py | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
from metric import (d_ratio, has_event, max, Event, JsonEncodeMetric,
- JsonEncodeMetricGroupDescriptions, LoadEvents, Metric,
- MetricGroup, Select)
+ JsonEncodeMetricGroupDescriptions, Literal, LoadEvents,
+ Metric, MetricGroup, Select)
import argparse
import json
import math
@@ -16,9 +16,17 @@ args = parser.parse_args()
directory = f"{os.path.dirname(os.path.realpath(__file__))}/arch/x86/{args.model}/"
LoadEvents(directory)
-all_metrics = MetricGroup("",[])
-
+zen_model = int(args.model[6:])
interval_sec = Event("duration_time")
+cycles = Event("cycles")
+# Number of CPU cycles scaled for SMT.
+smt_cycles = Select(cycles / 2, Literal("#smt_on"), cycles)
+
+def AmdUpc() -> Metric:
+ ops = Event("ex_ret_ops", "ex_ret_cops")
+ upc = d_ratio(ops, smt_cycles)
+ return Metric("upc", "Micro-ops retired per core cycle (higher is better)",
+ upc, "uops/cycle")
def Idle() -> Metric:
cyc = Event("msr/mperf/")
@@ -50,6 +58,7 @@ def Rapl() -> MetricGroup:
description="Processor socket power consumption estimates")
all_metrics = MetricGroup("", [
+ AmdUpc(),
Idle(),
Rapl(),
])