Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf hist: Honor symbol_conf.skip_empty

So that it can skip events with no sample according to the config value.
This can omit the dummy event in the output of perf report --group.

An example output:

$ sudo perf mem record -a sleep 1
$ sudo perf report --group

Before)
#
# Samples: 232 of events 'cpu/mem-loads,ldlat=30/P, cpu/mem-stores/P, dummy:u'
# Event count (approx.): 3089861
#
# Overhead Command Shared Object Symbol
# ........................ ........... ................. .....................................
#
9.29% 0.00% 0.00% swapper [kernel.kallsyms] [k] update_blocked_averages
5.26% 0.15% 0.00% swapper [kernel.kallsyms] [k] __update_load_avg_se
4.15% 0.00% 0.00% perf-exec [kernel.kallsyms] [k] slab_update_freelist.isra.0
3.87% 0.00% 0.00% perf-exec [kernel.kallsyms] [k] memcg_slab_post_alloc_hook
3.79% 0.17% 0.00% swapper [kernel.kallsyms] [k] enqueue_task_fair
3.63% 0.00% 0.00% sleep [kernel.kallsyms] [k] next_uptodate_page
2.86% 0.00% 0.00% swapper [kernel.kallsyms] [k] __update_load_avg_cfs_rq
2.78% 0.00% 0.00% swapper [kernel.kallsyms] [k] __schedule
2.34% 0.00% 0.00% swapper [kernel.kallsyms] [k] intel_idle
2.32% 0.97% 0.00% swapper [kernel.kallsyms] [k] psi_group_change

After)
#
# Samples: 232 of events 'cpu/mem-loads,ldlat=30/P, cpu/mem-stores/P'
# Event count (approx.): 3089861
#
# Overhead Command Shared Object Symbol
# ................ ........... ................. .....................................
#
9.29% 0.00% swapper [kernel.kallsyms] [k] update_blocked_averages
5.26% 0.15% swapper [kernel.kallsyms] [k] __update_load_avg_se
4.15% 0.00% perf-exec [kernel.kallsyms] [k] slab_update_freelist.isra.0
3.87% 0.00% perf-exec [kernel.kallsyms] [k] memcg_slab_post_alloc_hook
3.79% 0.17% swapper [kernel.kallsyms] [k] enqueue_task_fair
3.63% 0.00% sleep [kernel.kallsyms] [k] next_uptodate_page
2.86% 0.00% swapper [kernel.kallsyms] [k] __update_load_avg_cfs_rq
2.78% 0.00% swapper [kernel.kallsyms] [k] __schedule
2.34% 0.00% swapper [kernel.kallsyms] [k] intel_idle
2.32% 0.97% swapper [kernel.kallsyms] [k] psi_group_change

Now it doesn't have a column for the dummy event.

Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240607202918.2357459-5-namhyung@kernel.org

+29 -5
+16 -2
tools/perf/ui/hist.c
··· 95 95 } 96 96 97 97 for (i = 0; i < nr_members; i++) { 98 + if (symbol_conf.skip_empty && 99 + values[i].hists->stats.nr_samples == 0) 100 + continue; 101 + 98 102 ret += __hpp__fmt_print(hpp, values[i].hists, values[i].val, 99 103 values[i].samples, fmt, len, 100 104 print_fn, fmtype); ··· 300 296 int len = fmt->user_len ?: fmt->len; 301 297 struct evsel *evsel = hists_to_evsel(hists); 302 298 303 - if (symbol_conf.event_group) 304 - len = max(len, evsel->core.nr_members * fmt->len); 299 + if (symbol_conf.event_group) { 300 + int nr = 0; 301 + struct evsel *pos; 302 + 303 + for_each_group_evsel(pos, evsel) { 304 + if (!symbol_conf.skip_empty || 305 + evsel__hists(pos)->stats.nr_samples) 306 + nr++; 307 + } 308 + 309 + len = max(len, nr * fmt->len); 310 + } 305 311 306 312 if (len < (int)strlen(fmt->name)) 307 313 len = strlen(fmt->name);
+10 -3
tools/perf/util/evsel.c
··· 55 55 #include "../perf-sys.h" 56 56 #include "util/parse-branch-options.h" 57 57 #include "util/bpf-filter.h" 58 + #include "util/hist.h" 58 59 #include <internal/xyarray.h> 59 60 #include <internal/lib.h> 60 61 #include <internal/threadmap.h> ··· 833 832 int evsel__group_desc(struct evsel *evsel, char *buf, size_t size) 834 833 { 835 834 int ret = 0; 835 + bool first = true; 836 836 struct evsel *pos; 837 837 const char *group_name = evsel__group_name(evsel); 838 838 839 839 if (!evsel->forced_leader) 840 840 ret = scnprintf(buf, size, "%s { ", group_name); 841 841 842 - ret += scnprintf(buf + ret, size - ret, "%s", evsel__name(evsel)); 842 + for_each_group_evsel(pos, evsel) { 843 + if (symbol_conf.skip_empty && 844 + evsel__hists(pos)->stats.nr_samples == 0) 845 + continue; 843 846 844 - for_each_group_member(pos, evsel) 845 - ret += scnprintf(buf + ret, size - ret, ", %s", evsel__name(pos)); 847 + ret += scnprintf(buf + ret, size - ret, "%s%s", 848 + first ? "" : ", ", evsel__name(pos)); 849 + first = false; 850 + } 846 851 847 852 if (!evsel->forced_leader) 848 853 ret += scnprintf(buf + ret, size - ret, " }");
+3
tools/perf/util/python.c
··· 23 23 #include "util/env.h" 24 24 #include "util/pmu.h" 25 25 #include "util/pmus.h" 26 + #include "util/symbol_conf.h" 26 27 #include <internal/lib.h> 27 28 #include "util.h" 28 29 ··· 50 49 #ifndef Py_TYPE 51 50 #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) 52 51 #endif 52 + 53 + struct symbol_conf symbol_conf; 53 54 54 55 /* 55 56 * Avoid bringing in event parsing.