1 files changed, 91 insertions, 54 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index e3f8cd46e7d7..f5a1e4f65263 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -8,9 +8,7 @@
 /* hist period print (hpp) functions */
 static int hpp__header_overhead(struct perf_hpp *hpp)
 {
-        const char *fmt = hpp->ptr ? "Baseline" : "Overhead";
-
-        return scnprintf(hpp->buf, hpp->size, fmt);
+        return scnprintf(hpp->buf, hpp->size, "Overhead");
 }
 
 static int hpp__width_overhead(struct perf_hpp *hpp __maybe_unused)
@@ -20,38 +18,18 @@ static int hpp__width_overhead(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period / hpp->total_period;
-
-        if (hpp->ptr) {
-                struct hists *old_hists = hpp->ptr;
-                u64 total_period = old_hists->stats.total_period;
-                u64 base_period = he->pair ? he->pair->period : 0;
-
-                if (total_period)
-                        percent = 100.0 * base_period / total_period;
-                else
-                        percent = 0.0;
-        }
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
 }
 
 static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
 
-        if (hpp->ptr) {
-                struct hists *old_hists = hpp->ptr;
-                u64 total_period = old_hists->stats.total_period;
-                u64 base_period = he->pair ? he->pair->period : 0;
-
-                if (total_period)
-                        percent = 100.0 * base_period / total_period;
-                else
-                        percent = 0.0;
-        }
-
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
 }
 
@@ -69,13 +47,16 @@ static int hpp__width_overhead_sys(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__color_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_sys / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
 }
 
 static int hpp__entry_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_sys / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -95,13 +76,16 @@ static int hpp__width_overhead_us(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__color_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
 }
 
 static int hpp__entry_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -120,14 +104,17 @@ static int hpp__width_overhead_guest_sys(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead_guest_sys(struct perf_hpp *hpp,
                                          struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_sys / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ", percent);
 }
 
 static int hpp__entry_overhead_guest_sys(struct perf_hpp *hpp,
                                          struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_sys / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -146,19 +133,63 @@ static int hpp__width_overhead_guest_us(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead_guest_us(struct perf_hpp *hpp,
                                         struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_us / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ", percent);
 }
 
 static int hpp__entry_overhead_guest_us(struct perf_hpp *hpp,
                                         struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_us / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
 }
 
+static int hpp__header_baseline(struct perf_hpp *hpp)
+{
+        return scnprintf(hpp->buf, hpp->size, "Baseline");
+}
+
+static int hpp__width_baseline(struct perf_hpp *hpp __maybe_unused)
+{
+        return 8;
+}
+
+static double baseline_percent(struct hist_entry *he)
+{
+        struct hist_entry *pair = he->pair;
+        struct hists *pair_hists = pair ? pair->hists : NULL;
+        double percent = 0.0;
+
+        if (pair) {
+                u64 total_period = pair_hists->stats.total_period;
+                u64 base_period  = pair->stat.period;
+
+                percent = 100.0 * base_period / total_period;
+        }
+
+        return percent;
+}
+
+static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he)
+{
+        double percent = baseline_percent(he);
+
+        return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
+}
+
+static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)
+{
+        double percent = baseline_percent(he);
+        const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
+
+        return scnprintf(hpp->buf, hpp->size, fmt, percent);
+}
+
 static int hpp__header_samples(struct perf_hpp *hpp)
 {
         const char *fmt = symbol_conf.field_sep ? "%s" : "%11s";
@@ -175,7 +206,7 @@ static int hpp__entry_samples(struct perf_hpp *hpp, struct hist_entry *he)
 {
         const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%11" PRIu64;
 
-        return scnprintf(hpp->buf, hpp->size, fmt, he->nr_events);
+        return scnprintf(hpp->buf, hpp->size, fmt, he->stat.nr_events);
 }
 
 static int hpp__header_period(struct perf_hpp *hpp)
@@ -194,7 +225,7 @@ static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he)
 {
         const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%12" PRIu64;
 
-        return scnprintf(hpp->buf, hpp->size, fmt, he->period);
+        return scnprintf(hpp->buf, hpp->size, fmt, he->stat.period);
 }
 
 static int hpp__header_delta(struct perf_hpp *hpp)
@@ -211,20 +242,22 @@ static int hpp__width_delta(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        struct hists *pair_hists = hpp->ptr;
+        struct hist_entry *pair = he->pair;
+        struct hists *pair_hists = pair ? pair->hists : NULL;
+        struct hists *hists = he->hists;
         u64 old_total, new_total;
         double old_percent = 0, new_percent = 0;
         double diff;
         const char *fmt = symbol_conf.field_sep ? "%s" : "%7.7s";
         char buf[32] = " ";
 
-        old_total = pair_hists->stats.total_period;
-        if (old_total > 0 && he->pair)
-                old_percent = 100.0 * he->pair->period / old_total;
+        old_total = pair_hists ? pair_hists->stats.total_period : 0;
+        if (old_total > 0 && pair)
+                old_percent = 100.0 * pair->stat.period / old_total;
 
-        new_total = hpp->total_period;
+        new_total = hists->stats.total_period;
         if (new_total > 0)
-                new_percent = 100.0 * he->period / new_total;
+                new_percent = 100.0 * he->stat.period / new_total;
 
         diff = new_percent - old_percent;
         if (fabs(diff) >= 0.01)
@@ -244,13 +277,15 @@ static int hpp__width_displ(struct perf_hpp *hpp __maybe_unused)
 }
 
 static int hpp__entry_displ(struct perf_hpp *hpp,
-                            struct hist_entry *he __maybe_unused)
+                            struct hist_entry *he)
 {
+        struct hist_entry *pair = he->pair;
+        long displacement = pair ? pair->position - he->position : 0;
         const char *fmt = symbol_conf.field_sep ? "%s" : "%6.6s";
         char buf[32] = " ";
 
-        if (hpp->displacement)
-                scnprintf(buf, sizeof(buf), "%+4ld", hpp->displacement);
+        if (displacement)
+                scnprintf(buf, sizeof(buf), "%+4ld", displacement);
 
         return scnprintf(hpp->buf, hpp->size, fmt, buf);
 }
@@ -267,6 +302,7 @@ static int hpp__entry_displ(struct perf_hpp *hpp,
         .entry  = hpp__entry_ ## _name
 
 struct perf_hpp_fmt perf_hpp__format[] = {
+        { .cond = false, HPP__COLOR_PRINT_FNS(baseline) },
         { .cond = true,  HPP__COLOR_PRINT_FNS(overhead) },
         { .cond = false, HPP__COLOR_PRINT_FNS(overhead_sys) },
         { .cond = false, HPP__COLOR_PRINT_FNS(overhead_us) },
@@ -281,7 +317,7 @@ struct perf_hpp_fmt perf_hpp__format[] = {
 #undef HPP__COLOR_PRINT_FNS
 #undef HPP__PRINT_FNS
 
-void perf_hpp__init(bool need_pair, bool show_displacement)
+void perf_hpp__init(void)
 {
         if (symbol_conf.show_cpu_utilization) {
                 perf_hpp__format[PERF_HPP__OVERHEAD_SYS].cond = true;
@@ -298,13 +334,12 @@ void perf_hpp__init(bool need_pair, bool show_displacement)
 
         if (symbol_conf.show_total_period)
                 perf_hpp__format[PERF_HPP__PERIOD].cond = true;
+}
 
-        if (need_pair) {
-                perf_hpp__format[PERF_HPP__DELTA].cond = true;
-
-                if (show_displacement)
-                        perf_hpp__format[PERF_HPP__DISPL].cond = true;
-        }
+void perf_hpp__column_enable(unsigned col, bool enable)
+{
+        BUG_ON(col >= PERF_HPP__MAX_INDEX);
+        perf_hpp__format[col].cond = enable;
 }
 
 static inline void advance_hpp(struct perf_hpp *hpp, int inc)
@@ -319,6 +354,7 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
         const char *sep = symbol_conf.field_sep;
         char *start = hpp->buf;
         int i, ret;
+        bool first = true;
 
         if (symbol_conf.exclude_other && !he->parent)
                 return 0;
@@ -327,9 +363,10 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
                 if (!perf_hpp__format[i].cond)
                         continue;
 
-                if (!sep || i > 0) {
+                if (!sep || !first) {
                         ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: "  ");
                         advance_hpp(hpp, ret);
+                        first = false;
                 }
 
                 if (color && perf_hpp__format[i].color)