From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966241AbdCXSxx (ORCPT ); Fri, 24 Mar 2017 14:53:53 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51407 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965791AbdCXSxm (ORCPT ); Fri, 24 Mar 2017 14:53:42 -0400 Date: Fri, 24 Mar 2017 11:52:28 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, ak@linux.intel.com, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, hpa@zytor.com Reply-To: acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, ak@linux.intel.com, jolsa@kernel.org, mingo@kernel.org, hpa@zytor.com In-Reply-To: <20170320201711.14142-12-andi@firstfloor.org> References: <20170320201711.14142-12-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf list: Support printing MetricExpr with --debug Git-Commit-ID: 7f372a636d92e21d6fa41aebd6986ef590aefbfc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7f372a636d92e21d6fa41aebd6986ef590aefbfc Gitweb: http://git.kernel.org/tip/7f372a636d92e21d6fa41aebd6986ef590aefbfc Author: Andi Kleen AuthorDate: Mon, 20 Mar 2017 13:17:09 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 23 Mar 2017 11:42:30 -0300 perf list: Support printing MetricExpr with --debug Output the metric expr in perf list when --debug is specified, so that the user can check the formula. Before: % perf list ... unc_m_power_channel_ppd [Cycles where DRAM ranks are in power down (CKE) mode. Derived from unc_m_power_channel_ppd. Unit: uncore_imc] uncore_imc_2/event=0x85/ After: % perf list --debug ... unc_m_power_channel_ppd [Cycles where DRAM ranks are in power down (CKE) mode. Derived from unc_m_power_channel_ppd. Unit: uncore_imc] Perf: uncore_imc_2/event=0x85/ MetricExpr: (unc_m_power_channel_ppd / unc_m_clockticks) * 100. Signed-off-by: Andi Kleen Acked-by: Jiri Olsa Link: http://lkml.kernel.org/r/20170320201711.14142-12-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/pmu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0f1133a..f819ad1 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1105,6 +1105,7 @@ struct sevent { char *topic; char *str; char *pmu; + char *metric_expr; }; static int cmp_sevent(const void *a, const void *b) @@ -1203,6 +1204,7 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag, aliases[j].topic = alias->topic; aliases[j].str = alias->str; aliases[j].pmu = pmu->name; + aliases[j].metric_expr = alias->metric_expr; j++; } if (pmu->selectable && @@ -1237,8 +1239,12 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag, printf("%*s", 8, "["); wordwrap(aliases[j].desc, 8, columns, 0); printf("]\n"); - if (verbose > 0) - printf("%*s%s/%s/\n", 8, "", aliases[j].pmu, aliases[j].str); + if (verbose > 0) { + printf("%*s%s/%s/ ", 8, "", aliases[j].pmu, aliases[j].str); + if (aliases[j].metric_expr) + printf(" MetricExpr: %s", aliases[j].metric_expr); + putchar('\n'); + } } else printf(" %-50s [Kernel PMU event]\n", aliases[j].name); printed++;