1 files changed, 61 insertions, 1 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 849c40028e7b..a47ce98c2cb1 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -21,6 +21,53 @@ static int __hpp__percent_fmt(struct perf_hpp *hpp, struct hist_entry *he,
                 percent = 100.0 * get_field(he) / hists->stats.total_period;
 
         ret = print_fn(hpp->buf, hpp->size, fmt, percent);
+
+        if (symbol_conf.event_group) {
+                int prev_idx, idx_delta;
+                struct perf_evsel *evsel = hists_to_evsel(hists);
+                struct hist_entry *pair;
+                int nr_members = evsel->nr_members;
+
+                if (nr_members <= 1)
+                        return ret;
+
+                prev_idx = perf_evsel__group_idx(evsel);
+
+                list_for_each_entry(pair, &he->pairs.head, pairs.node) {
+                        u64 period = get_field(pair);
+                        u64 total = pair->hists->stats.total_period;
+
+                        if (!total)
+                                continue;
+
+                        evsel = hists_to_evsel(pair->hists);
+                        idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
+
+                        while (idx_delta--) {
+                                /*
+                                 * zero-fill group members in the middle which
+                                 * have no sample
+                                 */
+                                ret += print_fn(hpp->buf + ret, hpp->size - ret,
+                                                fmt, 0.0);
+                        }
+
+                        ret += print_fn(hpp->buf + ret, hpp->size - ret,
+                                        fmt, 100.0 * period / total);
+
+                        prev_idx = perf_evsel__group_idx(evsel);
+                }
+
+                idx_delta = nr_members - prev_idx - 1;
+
+                while (idx_delta--) {
+                        /*
+                         * zero-fill group members at last which have no sample
+                         */
+                        ret += print_fn(hpp->buf + ret, hpp->size - ret,
+                                        fmt, 0.0);
+                }
+        }
         return ret;
 }
 
@@ -40,6 +87,11 @@ static int hpp__header_##_type(struct perf_hpp *hpp)			\
 {                                                                       \
         int len = _min_width;                                           \
                                                                         \
+        if (symbol_conf.event_group) {                                  \
+                struct perf_evsel *evsel = hpp->ptr;                    \
+                                                                        \
+                len = max(len, evsel->nr_members * _unit_width);        \
+        }                                                               \
         return scnprintf(hpp->buf, hpp->size, "%*s", len, _str);        \
 }
 
@@ -48,6 +100,11 @@ static int hpp__width_##_type(struct perf_hpp *hpp __maybe_unused)	\
 {                                                                       \
         int len = _min_width;                                           \
                                                                         \
+        if (symbol_conf.event_group) {                                  \
+                struct perf_evsel *evsel = hpp->ptr;                    \
+                                                                        \
+                len = max(len, evsel->nr_members * _unit_width);        \
+        }                                                               \
         return len;                                                     \
 }
 
@@ -438,12 +495,15 @@ unsigned int hists__sort_list_width(struct hists *hists)
         struct perf_hpp_fmt *fmt;
         struct sort_entry *se;
         int i = 0, ret = 0;
+        struct perf_hpp dummy_hpp = {
+                .ptr    = hists_to_evsel(hists),
+        };
 
         perf_hpp__for_each_format(fmt) {
                 if (i)
                         ret += 2;
 
-                ret += fmt->width(NULL);
+                ret += fmt->width(&dummy_hpp);
         }
 
         list_for_each_entry(se, &hist_entry__sort_list, list)