Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753147AbbH1REm (ORCPT ); Fri, 28 Aug 2015 13:04:42 -0400 Received: from mga02.intel.com ([134.134.136.20]:18537 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886AbbH1RED (ORCPT ); Fri, 28 Aug 2015 13:04:03 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,425,1437462000"; d="scan'208";a="777614797" From: Kan Liang To: acme@kernel.org, jolsa@kernel.org Cc: a.p.zijlstra@chello.nl, luto@kernel.org, mingo@redhat.com, eranian@google.com, ak@linux.intel.com, mark.rutland@arm.com, adrian.hunter@intel.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH V7 7/8] perf,tools: caculate and save freq/CPU%/CORE_BUSY% in he_stat Date: Fri, 28 Aug 2015 05:48:08 -0400 Message-Id: <1440755289-30939-8-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1440755289-30939-1-git-send-email-kan.liang@intel.com> References: <1440755289-30939-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2725 Lines: 87 From: Kan Liang Caculate freq/CPU%/CORE_BUSY% in add_entry_cb, and update the value in he_stat. Signed-off-by: Kan Liang --- 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 62b285e..e108729 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -89,6 +89,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.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) @@ -100,6 +132,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 3c2a399..9ed52e6 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/