[PATCH V9 5/6] perf,tools: caculate and save freq/CPU%/CORE_BUSY% in he_stat

[kan . liang]

From: Kan Liang <kan.li...@intel.com>

Caculate freq/CPU%/CORE_BUSY% in add_entry_cb, and update the value in
he_stat.

Signed-off-by: Kan Liang <kan.li...@intel.com>
Acked-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/builtin-report.c | 36 ++++++++++++++++++++++++++++++++++++
 tools/perf/util/sort.h      |  3 +++
 2 files changed, 39 insertions(+)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 4b43245..d6e5203 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -90,6 +90,38 @@ static int report__config(const char *var, const char 
*value, void *cb)
        return perf_default_config(var, value, cb);
 }
 
+static void set_he_freq_perf(struct perf_session *session,
+                            struct hist_entry_iter *iter)
+{
+       struct hist_entry *he = iter->he;
+       struct perf_evsel *evsel = iter->evsel;
+       struct perf_evsel *leader = evsel;
+       struct perf_sample *sample = iter->sample;
+       struct perf_evlist *evlist = session->evlist;
+       u64 cpu_max_freq = session->header.env.cpuattr.max_freq;
+       perf_freq_t data = { 0 };
+       u64 nr = 0;
+
+       perf_freq__init(session->header.env.msr_pmu_type,
+                       evsel, data,
+                       sample->read.group.values[nr].value);
+       evlist__for_each_continue(evlist, evsel) {
+               if ((evsel->leader != leader) ||
+                    (++nr >= sample->read.group.nr))
+                       break;
+               perf_freq__init(session->header.env.msr_pmu_type,
+                               evsel, data,
+                               sample->read.group.values[nr].value);
+       }
+
+       if (perf_freq__has_freq(data))
+               he->stat.freq = perf_freq__get_freq(data, cpu_max_freq/1000);
+       if (perf_freq__has_cpu_util(data))
+               he->stat.cpu_util = perf_freq__get_cpu_util(data);
+       if (perf_freq__has_core_busy(data))
+               he->stat.core_busy = perf_freq__get_core_busy(data);
+}
+
 static int hist_iter__report_callback(struct hist_entry_iter *iter,
                                      struct addr_location *al, bool single,
                                      void *arg)
@@ -101,6 +133,10 @@ static int hist_iter__report_callback(struct 
hist_entry_iter *iter,
        struct mem_info *mi;
        struct branch_info *bi;
 
+       if ((iter->ops == &hist_iter_normal) &&
+           perf_evsel__is_group_leader(evsel))
+               set_he_freq_perf(rep->session, iter);
+
        if (!ui__has_annotation())
                return 0;
 
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 654ac8a..f39e287 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -54,6 +54,9 @@ struct he_stat {
        u64                     period_guest_us;
        u64                     weight;
        u32                     nr_events;
+       u64                     freq;
+       u64                     cpu_util;
+       u64                     core_busy;
 };
 
 struct hist_entry_diff {
-- 
1.8.3.1

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