From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753406AbbIPVin (ORCPT ); Wed, 16 Sep 2015 17:38:43 -0400 Received: from mga11.intel.com ([192.55.52.93]:64435 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753040AbbIPViG (ORCPT ); Wed, 16 Sep 2015 17:38:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,541,1437462000"; d="scan'208";a="770539365" From: kan.liang@intel.com 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 V10 5/8] perf,tools: caculate and save freq/CPU%/CORE_BUSY% in he_stat Date: Wed, 16 Sep 2015 10:21:53 -0400 Message-Id: <1442413316-33518-6-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1442413316-33518-1-git-send-email-kan.liang@intel.com> References: <1442413316-33518-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 From: Kan Liang Caculate freq/CPU%/CORE_BUSY% in add_entry_cb, and update the value in he_stat. Signed-off-by: Kan Liang Acked-by: Jiri Olsa --- tools/perf/builtin-report.c | 20 ++++++++++++++++++++ tools/perf/util/sort.h | 3 +++ 2 files changed, 23 insertions(+) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index e4e3f14..e2a2fdd 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -90,6 +90,21 @@ static int report__config(const char *var, const char *value, void *cb) return perf_default_config(var, value, cb); } +static void set_he_perf_freq(struct perf_session *session, + struct hist_entry_iter *iter) +{ + struct hist_entry *he = iter->he; + struct perf_sample *sample = iter->sample; + u64 cpu_max_freq = session->header.env.cpuattr.max_freq; + + if (perf_freq__has_freq(sample->freq)) + he->stat.freq = perf_freq__get_freq(sample->freq, cpu_max_freq/1000); + if (perf_freq__has_cpu_util(sample->freq)) + he->stat.cpu_util = perf_freq__get_cpu_util(sample->freq); + if (perf_freq__has_core_busy(sample->freq)) + he->stat.core_busy = perf_freq__get_core_busy(sample->freq); +} + static int hist_iter__report_callback(struct hist_entry_iter *iter, struct addr_location *al, bool single, void *arg) @@ -101,6 +116,11 @@ static int hist_iter__report_callback(struct hist_entry_iter *iter, struct mem_info *mi; struct branch_info *bi; + if (dump_trace && + (iter->ops == &hist_iter_normal) && + perf_evsel__is_group_leader(evsel)) + set_he_perf_freq(rep->session, iter); + if (!ui__has_annotation()) return 0; diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index c06b757..0ff2bdd 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -55,6 +55,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