1 files changed, 130 insertions, 95 deletions

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index 6ac03146889d..b33ffb2af2cf 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -2,6 +2,7 @@
 #include "evsel.h"
 #include "stat.h"
 #include "color.h"
+#include "pmu.h"
 
 enum {
         CTX_BIT_USER    = 1 << 0,
@@ -14,6 +15,13 @@ enum {
 
 #define NUM_CTX CTX_BIT_MAX
 
+/*
+ * AGGR_GLOBAL: Use CPU 0
+ * AGGR_SOCKET: Use first CPU of socket
+ * AGGR_CORE: Use first CPU of core
+ * AGGR_NONE: Use matching CPU
+ * AGGR_THREAD: Not supported?
+ */
 static struct stats runtime_nsecs_stats[MAX_NR_CPUS];
 static struct stats runtime_cycles_stats[NUM_CTX][MAX_NR_CPUS];
 static struct stats runtime_stalled_cycles_front_stats[NUM_CTX][MAX_NR_CPUS];
@@ -28,9 +36,15 @@ static struct stats runtime_dtlb_cache_stats[NUM_CTX][MAX_NR_CPUS];
 static struct stats runtime_cycles_in_tx_stats[NUM_CTX][MAX_NR_CPUS];
 static struct stats runtime_transaction_stats[NUM_CTX][MAX_NR_CPUS];
 static struct stats runtime_elision_stats[NUM_CTX][MAX_NR_CPUS];
+static bool have_frontend_stalled;
 
 struct stats walltime_nsecs_stats;
 
+void perf_stat__init_shadow_stats(void)
+{
+        have_frontend_stalled = pmu_have_event("cpu", "stalled-cycles-frontend");
+}
+
 static int evsel_context(struct perf_evsel *evsel)
 {
         int ctx = 0;
@@ -137,9 +151,10 @@ static const char *get_ratio_color(enum grc_type type, double ratio)
         return color;
 }
 
-static void print_stalled_cycles_frontend(FILE *out, int cpu,
+static void print_stalled_cycles_frontend(int cpu,
                                           struct perf_evsel *evsel
-                                          __maybe_unused, double avg)
+                                          __maybe_unused, double avg,
+                                          struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -152,14 +167,17 @@ static void print_stalled_cycles_frontend(FILE *out, int cpu,
 
         color = get_ratio_color(GRC_STALLED_CYCLES_FE, ratio);
 
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " frontend cycles idle   ");
+        if (ratio)
+                out->print_metric(out->ctx, color, "%7.2f%%", "frontend cycles idle",
+                                  ratio);
+        else
+                out->print_metric(out->ctx, NULL, NULL, "frontend cycles idle", 0);
 }
 
-static void print_stalled_cycles_backend(FILE *out, int cpu,
+static void print_stalled_cycles_backend(int cpu,
                                          struct perf_evsel *evsel
-                                         __maybe_unused, double avg)
+                                         __maybe_unused, double avg,
+                                         struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -172,14 +190,13 @@ static void print_stalled_cycles_backend(FILE *out, int cpu,
 
         color = get_ratio_color(GRC_STALLED_CYCLES_BE, ratio);
 
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " backend  cycles idle   ");
+        out->print_metric(out->ctx, color, "%6.2f%%", "backend cycles idle", ratio);
 }
 
-static void print_branch_misses(FILE *out, int cpu,
+static void print_branch_misses(int cpu,
                                 struct perf_evsel *evsel __maybe_unused,
-                                double avg)
+                                double avg,
+                                struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -192,14 +209,13 @@ static void print_branch_misses(FILE *out, int cpu,
 
         color = get_ratio_color(GRC_CACHE_MISSES, ratio);
 
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " of all branches        ");
+        out->print_metric(out->ctx, color, "%7.2f%%", "of all branches", ratio);
 }
 
-static void print_l1_dcache_misses(FILE *out, int cpu,
+static void print_l1_dcache_misses(int cpu,
                                    struct perf_evsel *evsel __maybe_unused,
-                                   double avg)
+                                   double avg,
+                                   struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -212,14 +228,13 @@ static void print_l1_dcache_misses(FILE *out, int cpu,
 
         color = get_ratio_color(GRC_CACHE_MISSES, ratio);
 
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " of all L1-dcache hits  ");
+        out->print_metric(out->ctx, color, "%7.2f%%", "of all L1-dcache hits", ratio);
 }
 
-static void print_l1_icache_misses(FILE *out, int cpu,
+static void print_l1_icache_misses(int cpu,
                                    struct perf_evsel *evsel __maybe_unused,
-                                   double avg)
+                                   double avg,
+                                   struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -231,15 +246,13 @@ static void print_l1_icache_misses(FILE *out, int cpu,
                 ratio = avg / total * 100.0;
 
         color = get_ratio_color(GRC_CACHE_MISSES, ratio);
-
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " of all L1-icache hits  ");
+        out->print_metric(out->ctx, color, "%7.2f%%", "of all L1-icache hits", ratio);
 }
 
-static void print_dtlb_cache_misses(FILE *out, int cpu,
+static void print_dtlb_cache_misses(int cpu,
                                     struct perf_evsel *evsel __maybe_unused,
-                                    double avg)
+                                    double avg,
+                                    struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -251,15 +264,13 @@ static void print_dtlb_cache_misses(FILE *out, int cpu,
                 ratio = avg / total * 100.0;
 
         color = get_ratio_color(GRC_CACHE_MISSES, ratio);
-
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " of all dTLB cache hits ");
+        out->print_metric(out->ctx, color, "%7.2f%%", "of all dTLB cache hits", ratio);
 }
 
-static void print_itlb_cache_misses(FILE *out, int cpu,
+static void print_itlb_cache_misses(int cpu,
                                     struct perf_evsel *evsel __maybe_unused,
-                                    double avg)
+                                    double avg,
+                                    struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -271,15 +282,13 @@ static void print_itlb_cache_misses(FILE *out, int cpu,
                 ratio = avg / total * 100.0;
 
         color = get_ratio_color(GRC_CACHE_MISSES, ratio);
-
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " of all iTLB cache hits ");
+        out->print_metric(out->ctx, color, "%7.2f%%", "of all iTLB cache hits", ratio);
 }
 
-static void print_ll_cache_misses(FILE *out, int cpu,
+static void print_ll_cache_misses(int cpu,
                                   struct perf_evsel *evsel __maybe_unused,
-                                  double avg)
+                                  double avg,
+                                  struct perf_stat_output_ctx *out)
 {
         double total, ratio = 0.0;
         const char *color;
@@ -291,15 +300,15 @@ static void print_ll_cache_misses(FILE *out, int cpu,
                 ratio = avg / total * 100.0;
 
         color = get_ratio_color(GRC_CACHE_MISSES, ratio);
-
-        fprintf(out, " #  ");
-        color_fprintf(out, color, "%6.2f%%", ratio);
-        fprintf(out, " of all LL-cache hits   ");
+        out->print_metric(out->ctx, color, "%7.2f%%", "of all LL-cache hits", ratio);
 }
 
-void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel,
-                                   double avg, int cpu, enum aggr_mode aggr)
+void perf_stat__print_shadow_stats(struct perf_evsel *evsel,
+                                   double avg, int cpu,
+                                   struct perf_stat_output_ctx *out)
 {
+        void *ctxp = out->ctx;
+        print_metric_t print_metric = out->print_metric;
         double total, ratio = 0.0, total2;
         int ctx = evsel_context(evsel);
 
@@ -307,119 +316,145 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel,
                 total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
                 if (total) {
                         ratio = avg / total;
-                        fprintf(out, " #   %5.2f  insns per cycle        ", ratio);
+                        print_metric(ctxp, NULL, "%7.2f ",
+                                        "insn per cycle", ratio);
                 } else {
-                        fprintf(out, "                                   ");
+                        print_metric(ctxp, NULL, NULL, "insn per cycle", 0);
                 }
                 total = avg_stats(&runtime_stalled_cycles_front_stats[ctx][cpu]);
                 total = max(total, avg_stats(&runtime_stalled_cycles_back_stats[ctx][cpu]));
 
                 if (total && avg) {
+                        out->new_line(ctxp);
                         ratio = total / avg;
-                        fprintf(out, "\n");
-                        if (aggr == AGGR_NONE)
-                                fprintf(out, "        ");
-                        fprintf(out, "                                                  #   %5.2f  stalled cycles per insn", ratio);
+                        print_metric(ctxp, NULL, "%7.2f ",
+                                        "stalled cycles per insn",
+                                        ratio);
+                } else if (have_frontend_stalled) {
+                        print_metric(ctxp, NULL, NULL,
+                                     "stalled cycles per insn", 0);
                 }
-
-        } else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES) &&
-                        runtime_branches_stats[ctx][cpu].n != 0) {
-                print_branch_misses(out, cpu, evsel, avg);
+        } else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES)) {
+                if (runtime_branches_stats[ctx][cpu].n != 0)
+                        print_branch_misses(cpu, evsel, avg, out);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all branches", 0);
         } else if (
                 evsel->attr.type == PERF_TYPE_HW_CACHE &&
                 evsel->attr.config ==  ( PERF_COUNT_HW_CACHE_L1D |
                                         ((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
-                                        ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
-                        runtime_l1_dcache_stats[ctx][cpu].n != 0) {
-                print_l1_dcache_misses(out, cpu, evsel, avg);
+                                         ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16))) {
+                if (runtime_l1_dcache_stats[ctx][cpu].n != 0)
+                        print_l1_dcache_misses(cpu, evsel, avg, out);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all L1-dcache hits", 0);
         } else if (
                 evsel->attr.type == PERF_TYPE_HW_CACHE &&
                 evsel->attr.config ==  ( PERF_COUNT_HW_CACHE_L1I |
                                         ((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
-                                        ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
-                        runtime_l1_icache_stats[ctx][cpu].n != 0) {
-                print_l1_icache_misses(out, cpu, evsel, avg);
+                                         ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16))) {
+                if (runtime_l1_icache_stats[ctx][cpu].n != 0)
+                        print_l1_icache_misses(cpu, evsel, avg, out);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all L1-icache hits", 0);
         } else if (
                 evsel->attr.type == PERF_TYPE_HW_CACHE &&
                 evsel->attr.config ==  ( PERF_COUNT_HW_CACHE_DTLB |
                                         ((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
-                                        ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
-                        runtime_dtlb_cache_stats[ctx][cpu].n != 0) {
-                print_dtlb_cache_misses(out, cpu, evsel, avg);
+                                         ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16))) {
+                if (runtime_dtlb_cache_stats[ctx][cpu].n != 0)
+                        print_dtlb_cache_misses(cpu, evsel, avg, out);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all dTLB cache hits", 0);
         } else if (
                 evsel->attr.type == PERF_TYPE_HW_CACHE &&
                 evsel->attr.config ==  ( PERF_COUNT_HW_CACHE_ITLB |
                                         ((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
-                                        ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
-                        runtime_itlb_cache_stats[ctx][cpu].n != 0) {
-                print_itlb_cache_misses(out, cpu, evsel, avg);
+                                         ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16))) {
+                if (runtime_itlb_cache_stats[ctx][cpu].n != 0)
+                        print_itlb_cache_misses(cpu, evsel, avg, out);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all iTLB cache hits", 0);
         } else if (
                 evsel->attr.type == PERF_TYPE_HW_CACHE &&
                 evsel->attr.config ==  ( PERF_COUNT_HW_CACHE_LL |
                                         ((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
-                                        ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
-                        runtime_ll_cache_stats[ctx][cpu].n != 0) {
-                print_ll_cache_misses(out, cpu, evsel, avg);
-        } else if (perf_evsel__match(evsel, HARDWARE, HW_CACHE_MISSES) &&
-                        runtime_cacherefs_stats[ctx][cpu].n != 0) {
+                                         ((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16))) {
+                if (runtime_ll_cache_stats[ctx][cpu].n != 0)
+                        print_ll_cache_misses(cpu, evsel, avg, out);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all LL-cache hits", 0);
+        } else if (perf_evsel__match(evsel, HARDWARE, HW_CACHE_MISSES)) {
                 total = avg_stats(&runtime_cacherefs_stats[ctx][cpu]);
 
                 if (total)
                         ratio = avg * 100 / total;
 
-                fprintf(out, " # %8.3f %% of all cache refs    ", ratio);
-
+                if (runtime_cacherefs_stats[ctx][cpu].n != 0)
+                        print_metric(ctxp, NULL, "%8.3f %%",
+                                     "of all cache refs", ratio);
+                else
+                        print_metric(ctxp, NULL, NULL, "of all cache refs", 0);
         } else if (perf_evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_FRONTEND)) {
-                print_stalled_cycles_frontend(out, cpu, evsel, avg);
+                print_stalled_cycles_frontend(cpu, evsel, avg, out);
         } else if (perf_evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_BACKEND)) {
-                print_stalled_cycles_backend(out, cpu, evsel, avg);
+                print_stalled_cycles_backend(cpu, evsel, avg, out);
         } else if (perf_evsel__match(evsel, HARDWARE, HW_CPU_CYCLES)) {
                 total = avg_stats(&runtime_nsecs_stats[cpu]);
 
                 if (total) {
                         ratio = avg / total;
-                        fprintf(out, " # %8.3f GHz                    ", ratio);
+                        print_metric(ctxp, NULL, "%8.3f", "GHz", ratio);
                 } else {
-                        fprintf(out, "                                   ");
+                        print_metric(ctxp, NULL, NULL, "Ghz", 0);
                 }
         } else if (perf_stat_evsel__is(evsel, CYCLES_IN_TX)) {
                 total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
                 if (total)
-                        fprintf(out,
-                                " #   %5.2f%% transactional cycles   ",
-                                100.0 * (avg / total));
+                        print_metric(ctxp, NULL,
+                                        "%7.2f%%", "transactional cycles",
+                                        100.0 * (avg / total));
+                else
+                        print_metric(ctxp, NULL, NULL, "transactional cycles",
+                                     0);
         } else if (perf_stat_evsel__is(evsel, CYCLES_IN_TX_CP)) {
                 total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
                 total2 = avg_stats(&runtime_cycles_in_tx_stats[ctx][cpu]);
                 if (total2 < avg)
                         total2 = avg;
                 if (total)
-                        fprintf(out,
-                                " #   %5.2f%% aborted cycles         ",
+                        print_metric(ctxp, NULL, "%7.2f%%", "aborted cycles",
                                 100.0 * ((total2-avg) / total));
-        } else if (perf_stat_evsel__is(evsel, TRANSACTION_START) &&
-                   runtime_cycles_in_tx_stats[ctx][cpu].n != 0) {
+                else
+                        print_metric(ctxp, NULL, NULL, "aborted cycles", 0);
+        } else if (perf_stat_evsel__is(evsel, TRANSACTION_START)) {
                 total = avg_stats(&runtime_cycles_in_tx_stats[ctx][cpu]);
 
                 if (avg)
                         ratio = total / avg;
 
-                fprintf(out, " # %8.0f cycles / transaction   ", ratio);
-        } else if (perf_stat_evsel__is(evsel, ELISION_START) &&
-                   runtime_cycles_in_tx_stats[ctx][cpu].n != 0) {
+                if (runtime_cycles_in_tx_stats[ctx][cpu].n != 0)
+                        print_metric(ctxp, NULL, "%8.0f",
+                                     "cycles / transaction", ratio);
+                else
+                        print_metric(ctxp, NULL, NULL, "cycles / transaction",
+                                     0);
+        } else if (perf_stat_evsel__is(evsel, ELISION_START)) {
                 total = avg_stats(&runtime_cycles_in_tx_stats[ctx][cpu]);
 
                 if (avg)
                         ratio = total / avg;
 
-                fprintf(out, " # %8.0f cycles / elision       ", ratio);
+                print_metric(ctxp, NULL, "%8.0f", "cycles / elision", ratio);
         } else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK)) {
                 if ((ratio = avg_stats(&walltime_nsecs_stats)) != 0)
-                        fprintf(out, " # %8.3f CPUs utilized          ", avg / ratio);
+                        print_metric(ctxp, NULL, "%8.3f", "CPUs utilized",
+                                     avg / ratio);
                 else
-                        fprintf(out, "                                   ");
+                        print_metric(ctxp, NULL, NULL, "CPUs utilized", 0);
         } else if (runtime_nsecs_stats[cpu].n != 0) {
                 char unit = 'M';
+                char unit_buf[10];
 
                 total = avg_stats(&runtime_nsecs_stats[cpu]);
 
@@ -429,9 +464,9 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel,
                         ratio *= 1000;
                         unit = 'K';
                 }
-
-                fprintf(out, " # %8.3f %c/sec                  ", ratio, unit);
+                snprintf(unit_buf, sizeof(unit_buf), "%c/sec", unit);
+                print_metric(ctxp, NULL, "%8.3f", unit_buf, ratio);
         } else {
-                fprintf(out, "                                   ");
+                print_metric(ctxp, NULL, NULL, NULL, 0);
         }
 }