From: Namhyung Kim <namhyung....@lge.com>

Print accumulated stat of a hist entry if requested.

Cc: Arun Sharma <asha...@fb.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
 tools/perf/ui/hist.c   | 45 +++++++++++++++++++++++++++++++++++++++++++++
 tools/perf/util/hist.h |  1 +
 2 files changed, 46 insertions(+)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 78f4c92e9b73..b365260645d3 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -129,6 +129,28 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt 
__maybe_unused,            \
                          scnprintf, true);                                     
\
 }
 
+#define __HPP_COLOR_ACC_PERCENT_FN(_type, _field)                              
\
+static u64 he_get_acc_##_field(struct hist_entry *he)                          
\
+{                                                                              
\
+       return he->stat_acc->_field;                                            
\
+}                                                                              
\
+                                                                               
\
+static int hpp__color_acc_##_type(struct perf_hpp_fmt *fmt __maybe_unused,     
\
+                             struct perf_hpp *hpp, struct hist_entry *he)      
\
+{                                                                              
\
+       return __hpp__fmt(hpp, he, he_get_acc_##_field, " %6.2f%%",             
\
+                         (hpp_snprint_fn)percent_color_snprintf, true);        
\
+}
+
+#define __HPP_ENTRY_ACC_PERCENT_FN(_type, _field)                              
\
+static int hpp__entry_acc_##_type(struct perf_hpp_fmt *_fmt __maybe_unused,    
\
+                             struct perf_hpp *hpp, struct hist_entry *he)      
\
+{                                                                              
\
+       const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%";         
\
+       return __hpp__fmt(hpp, he, he_get_acc_##_field, fmt,                    
\
+                         scnprintf, true);                                     
\
+}
+
 #define __HPP_ENTRY_RAW_FN(_type, _field)                                      
\
 static u64 he_get_raw_##_field(struct hist_entry *he)                          
\
 {                                                                              
\
@@ -148,17 +170,25 @@ __HPP_WIDTH_FN(_type, _min_width, _unit_width)            
                \
 __HPP_COLOR_PERCENT_FN(_type, _field)                                  \
 __HPP_ENTRY_PERCENT_FN(_type, _field)
 
+#define HPP_PERCENT_ACC_FNS(_type, _str, _field, _min_width, _unit_width)\
+__HPP_HEADER_FN(_type, _str, _min_width, _unit_width)                  \
+__HPP_WIDTH_FN(_type, _min_width, _unit_width)                         \
+__HPP_COLOR_ACC_PERCENT_FN(_type, _field)                              \
+__HPP_ENTRY_ACC_PERCENT_FN(_type, _field)
+
 #define HPP_RAW_FNS(_type, _str, _field, _min_width, _unit_width)      \
 __HPP_HEADER_FN(_type, _str, _min_width, _unit_width)                  \
 __HPP_WIDTH_FN(_type, _min_width, _unit_width)                         \
 __HPP_ENTRY_RAW_FN(_type, _field)
 
+__HPP_HEADER_FN(overhead_self, "Self", 8, 8)
 
 HPP_PERCENT_FNS(overhead, "Overhead", period, 8, 8)
 HPP_PERCENT_FNS(overhead_sys, "sys", period_sys, 8, 8)
 HPP_PERCENT_FNS(overhead_us, "usr", period_us, 8, 8)
 HPP_PERCENT_FNS(overhead_guest_sys, "guest sys", period_guest_sys, 9, 8)
 HPP_PERCENT_FNS(overhead_guest_us, "guest usr", period_guest_us, 9, 8)
+HPP_PERCENT_ACC_FNS(overhead_acc, "Total", period, 8, 8)
 
 HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12)
 HPP_RAW_FNS(period, "Period", period, 12, 12)
@@ -171,6 +201,14 @@ HPP_RAW_FNS(period, "Period", period, 12, 12)
                .entry  = hpp__entry_ ## _name          \
        }
 
+#define HPP__COLOR_ACC_PRINT_FNS(_name)                        \
+       {                                               \
+               .header = hpp__header_ ## _name,        \
+               .width  = hpp__width_ ## _name,         \
+               .color  = hpp__color_acc_ ## _name,     \
+               .entry  = hpp__entry_acc_ ## _name      \
+       }
+
 #define HPP__PRINT_FNS(_name)                          \
        {                                               \
                .header = hpp__header_ ## _name,        \
@@ -184,6 +222,7 @@ struct perf_hpp_fmt perf_hpp__format[] = {
        HPP__COLOR_PRINT_FNS(overhead_us),
        HPP__COLOR_PRINT_FNS(overhead_guest_sys),
        HPP__COLOR_PRINT_FNS(overhead_guest_us),
+       HPP__COLOR_ACC_PRINT_FNS(overhead_acc),
        HPP__PRINT_FNS(samples),
        HPP__PRINT_FNS(period)
 };
@@ -208,6 +247,12 @@ void perf_hpp__init(void)
 {
        perf_hpp__column_enable(PERF_HPP__OVERHEAD);
 
+       if (symbol_conf.cumulate_callchain) {
+               perf_hpp__format[PERF_HPP__OVERHEAD].header =
+                                               hpp__header_overhead_self;
+               perf_hpp__column_enable(PERF_HPP__OVERHEAD_ACC);
+       }
+
        if (symbol_conf.show_cpu_utilization) {
                perf_hpp__column_enable(PERF_HPP__OVERHEAD_SYS);
                perf_hpp__column_enable(PERF_HPP__OVERHEAD_US);
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 09e194a1e8f8..60134e79103d 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -160,6 +160,7 @@ enum {
        PERF_HPP__OVERHEAD_US,
        PERF_HPP__OVERHEAD_GUEST_SYS,
        PERF_HPP__OVERHEAD_GUEST_US,
+       PERF_HPP__OVERHEAD_ACC,
        PERF_HPP__SAMPLES,
        PERF_HPP__PERIOD,
 
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to