[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221206175804.391387-1-namhyung@kernel.org>
Date: Tue, 6 Dec 2022 09:58:04 -0800
From: Namhyung Kim <namhyung@...nel.org>
To: Arnaldo Carvalho de Melo <acme@...nel.org>,
Jiri Olsa <jolsa@...nel.org>
Cc: Ingo Molnar <mingo@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
LKML <linux-kernel@...r.kernel.org>,
Ian Rogers <irogers@...gle.com>,
Adrian Hunter <adrian.hunter@...el.com>,
linux-perf-users@...r.kernel.org,
Athira Rajeev <atrajeev@...ux.vnet.ibm.com>,
Kan Liang <kan.liang@...ux.intel.com>,
Leo Yan <leo.yan@...aro.org>, Andi Kleen <ak@...ux.intel.com>,
James Clark <james.clark@....com>,
Xing Zhengjun <zhengjun.xing@...ux.intel.com>,
Michael Petlan <mpetlan@...hat.com>
Subject: [PATCH v2] perf stat: Update event skip condition
In print_counter_aggrdata(), it skips some events that has no aggregate
count. It's actually for system-wide per-thread mode and merged uncore
and hybrid events.
Let's update the condition to check them explicitly.
Fixes: 91f85f98da7a ("Display event stats using aggr counts")
Reported-by: Athira Rajeev <atrajeev@...ux.vnet.ibm.com>
Acked-by: Athira Rajeev <atrajeev@...ux.vnet.ibm.com>
Signed-off-by: Namhyung Kim <namhyung@...nel.org>
---
tools/perf/util/stat-display.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 847acdb5dc40..a45aacc9df64 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -814,7 +814,8 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
os->nr = aggr->nr;
os->evsel = counter;
- if (counter->supported && aggr->nr == 0)
+ /* Skip already merged uncore/hybrid events */
+ if (counter->merged_stat)
return;
uniquify_counter(config, counter);
@@ -823,6 +824,13 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
ena = aggr->counts.ena;
run = aggr->counts.run;
+ /*
+ * Skip value 0 when enabling --per-thread globally, otherwise it will
+ * have too many 0 output.
+ */
+ if (val == 0 && config->aggr_mode == AGGR_THREAD && config->system_wide)
+ return;
+
if (!metric_only) {
if (config->json_output)
fputc('{', output);
@@ -899,9 +907,6 @@ static void print_aggr(struct perf_stat_config *config,
print_metric_begin(config, evlist, os, s);
evlist__for_each_entry(evlist, counter) {
- if (counter->merged_stat)
- continue;
-
print_counter_aggrdata(config, counter, s, os);
}
print_metric_end(config, os);
@@ -928,9 +933,6 @@ static void print_aggr_cgroup(struct perf_stat_config *config,
print_metric_begin(config, evlist, os, s);
evlist__for_each_entry(evlist, counter) {
- if (counter->merged_stat)
- continue;
-
if (counter->cgrp != os->cgrp)
continue;
@@ -950,9 +952,6 @@ static void print_counter(struct perf_stat_config *config,
if (!config->aggr_map)
return;
- if (counter->merged_stat)
- return;
-
for (s = 0; s < config->aggr_map->nr; s++) {
print_counter_aggrdata(config, counter, s, os);
}
--
2.39.0.rc0.267.gcb52ba06e7-goog
Powered by blists - more mailing lists