---

yaml
---
r: 350015
b: refs/heads/master
c: 6e1f601
h: refs/heads/master
i:
  350013: 38ecd77
  350011: d4f7e72
  350007: 2a13d54
  349999: 8452e30
  349983: d027d1e
  349951: fdb8f76
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8bb559bd4eff5c71601e2e61a4bd1deef44a03c
+refs/heads/master: 6e1f601a10cbaa5cda869f844292dd81c519a8e7

trunk/tools/perf/builtin-report.c

@@ -416,15 +416,26 @@ 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) {
 		ui__error("The %s file has no samples!\n", session->filename);
 		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,

trunk/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,