perf stat: Update event skip condition
Namhyung Kim
maintainerPATCH v2 1/1 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 <[email protected]>
Acked-by Athira Rajeev <[email protected]>
Signed-off-by Namhyung Kim <[email protected]>
--- tools/perf/util/stat-display.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
tools/perf/util/stat-display.c +9 -10
@@ -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); }
Signature · 1 line
2.39.0.rc0.267.gcb52ba06e7-goog
Em Tue, Dec 06, 2022 at 09:58:04AM -0800, Namhyung Kim escreveu:
Quoted 5 lines
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.
Thanks, applied.
- Arnaldo
Quoted 68 lines
Fixes 91f85f98da7a ("Display event stats using aggr counts")Reported-by Athira Rajeev <[email protected]>Acked-by Athira Rajeev <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/stat-display.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)tools/perf/util/stat-display.c +9
-10@@ -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); }Signature · 1 line
2.39.0.rc0.267.gcb52ba06e7-goog
Signature · 1 line
- Arnaldo