From: Kan Liang <[email protected]> Caculate freq/CPU%/CORE_BUSY% in add_entry_cb, and update the value in he_stat.
Signed-off-by: Kan Liang <[email protected]> --- 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 95a4771..3810251 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -88,6 +88,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.cpu_attr[PERF_HEADER_CPU_MAX_FREQ]; + u64 data[FREQ_PERF_MAX] = { 0 }; + u64 nr = 0; + + SET_FREQ_PERF_VALUE(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; + SET_FREQ_PERF_VALUE(session->header.env.msr_pmu_type, + evsel, data, + sample->read.group.values[nr].value); + } + + if (HAS_FREQ(data)) + he->stat.freq = GET_FREQ(data, cpu_max_freq/1000); + if (HAS_CPU_UTIL(data)) + he->stat.cpu_util = GET_CPU_UTIL(data); + if (HAS_CORE_BUSY(data)) + he->stat.core_busy = GET_CORE_BUSY(data); +} + static int hist_iter__report_callback(struct hist_entry_iter *iter, struct addr_location *al, bool single, void *arg) @@ -99,6 +131,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 e97cd47..df1d908 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
