[PATCH 09/10] perf, tools, list: Support printing MetricExpr with -v

[Andi Kleen]

From: Andi Kleen <a...@linux.intel.com>

Output the metric expr in perf list when -v is specified, so that the user
can check the formula.

Before:

% perf list -v
  ...
  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 -v
  ...
  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 <a...@linux.intel.com>
---
 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 4d9632390ab1..2cb463ababb8 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -1096,6 +1096,7 @@ struct sevent {
        char *topic;
        char *str;
        char *pmu;
+       char *metric_expr;
 };
 
 static int cmp_sevent(const void *a, const void *b)
@@ -1194,6 +1195,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 &&
@@ -1228,8 +1230,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)
-                               printf("%*s%s/%s/\n", 8, "", aliases[j].pmu, 
aliases[j].str);
+                       if (verbose) {
+                               printf("%*sPerf: %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++;
-- 
2.9.3