2 files changed, 14 insertions, 2 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 47a864478543..fd2503a5f876 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -416,8 +416,16 @@ static int __cmd_report(struct perf_report *rep)
                         hists->symbol_filter_str = rep->symbol_filter_str;
 
                 hists__collapse_resort(hists);
-                hists__output_resort(hists);
                 nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE];
+
+                /* Non-group events are considered as leader */
+                if (symbol_conf.event_group &&
+                    !perf_evsel__is_group_leader(pos)) {
+                        struct hists *leader_hists = &pos->leader->hists;
+
+                        hists__match(leader_hists, hists);
+                        hists__link(leader_hists, hists);
+                }
         }
 
         if (nr_samples == 0) {
@@ -425,6 +433,9 @@ static int __cmd_report(struct perf_report *rep)
                 goto out_delete;
         }
 
+        list_for_each_entry(pos, &session->evlist->entries, node)
+                hists__output_resort(&pos->hists);
+
         if (use_browser > 0) {
                 if (use_browser == 1) {
                         perf_evlist__tui_browse_hists(session->evlist, help,
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index d97377ac2f16..b62ca37c4b77 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -96,7 +96,8 @@ struct symbol_conf {
                         initialized,
                         kptr_restrict,
                         annotate_asm_raw,
-                        annotate_src;
+                        annotate_src,
+                        event_group;
         const char      *vmlinux_name,
                         *kallsyms_name,
                         *source_prefix,