[RFC PATCH v8 7/7] perf stat: Skip read retire_lat counters and plugin retire_lat data from sampled data

[weilin.wang@intel.com]

From: Weilin Wang <weilin.wang@intel.com>

In current :R parsing implementation, the parser would recognize events with
retire_latency modifier and insert them into the evlist like a normal event.
Ideally, we need to avoid counting these events.

In this commit, at the stage of metric calculation, the code uses sampled
retire latency value instead of counted event value.

Signed-off-by: Weilin Wang <weilin.wang@intel.com>
---
 tools/perf/arch/x86/util/evlist.c | 6 ++++++
 tools/perf/util/evsel.h           | 5 +++++
 tools/perf/util/stat-display.c    | 5 +++++
 tools/perf/util/stat-shadow.c     | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c
index b1ce0c52d88d..cebdd483149e 100644
--- a/tools/perf/arch/x86/util/evlist.c
+++ b/tools/perf/arch/x86/util/evlist.c
@@ -89,6 +89,12 @@ int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs)
 			return 1;
 	}
 
+	/* Retire latency event should not be group leader*/
+	if (lhs->retire_lat && !rhs->retire_lat)
+		return 1;
+	if (!lhs->retire_lat && rhs->retire_lat)
+		return -1;
+
 	/* Default ordering by insertion index. */
 	return lhs->core.idx - rhs->core.idx;
 }
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index bd8e84954e34..aaf572317e92 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -303,6 +303,11 @@ static inline bool evsel__is_tool(const struct evsel *evsel)
 	return evsel->tool_event != PERF_TOOL_NONE;
 }
 
+static inline bool evsel__is_retire_lat(const struct evsel *evsel)
+{
+	return evsel->retire_lat;
+}
+
 const char *evsel__group_name(struct evsel *evsel);
 int evsel__group_desc(struct evsel *evsel, char *buf, size_t size);
 
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index b9c3978cc99c..499fe0ddca93 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -1013,6 +1013,9 @@ static bool should_skip_zero_counter(struct perf_stat_config *config,
 	/* Tool events have the software PMU but are only gathered on 1. */
 	if (evsel__is_tool(counter))
 		return true;
+	/* Retire latency events are read from sampling data. */
+	if (evsel__is_retire_lat(counter))
+		return true;
 
 	/*
 	 * Skip value 0 when it's an uncore event and the given aggr id
@@ -1653,6 +1656,8 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf
 		} else {
 			print_metric_begin(config, evlist, &os, /*aggr_idx=*/0);
 			evlist__for_each_entry(evlist, counter) {
+				if (evsel__is_retire_lat(counter))
+					continue;
 				print_counter(config, counter, &os);
 			}
 			print_metric_end(config, &os);
diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index b97d23bfeac1..45e0b21a4724 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -384,7 +384,7 @@ static int prepare_metric(const struct metric_expr *mexp,
 		double val;
 		int source_count = 0;
 
-		if (metric_events[i]->retire_lat)
+		if (evsel__is_retire_lat(metric_events[i]))
 			continue;
 
 		if (evsel__is_tool(metric_events[i])) {
-- 
2.43.0