1 files changed, 60 insertions, 3 deletions

diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index eefca5c981fd..dbc6f7134f61 100644
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -5,6 +5,7 @@
 #include <linux/types.h>
 #include <stdio.h>
 #include "xyarray.h"
+#include "rblist.h"
 
 struct stats
 {
@@ -43,11 +44,54 @@ enum aggr_mode {
         AGGR_UNSET,
 };
 
+enum {
+        CTX_BIT_USER    = 1 << 0,
+        CTX_BIT_KERNEL  = 1 << 1,
+        CTX_BIT_HV      = 1 << 2,
+        CTX_BIT_HOST    = 1 << 3,
+        CTX_BIT_IDLE    = 1 << 4,
+        CTX_BIT_MAX     = 1 << 5,
+};
+
+#define NUM_CTX CTX_BIT_MAX
+
+enum stat_type {
+        STAT_NONE = 0,
+        STAT_NSECS,
+        STAT_CYCLES,
+        STAT_STALLED_CYCLES_FRONT,
+        STAT_STALLED_CYCLES_BACK,
+        STAT_BRANCHES,
+        STAT_CACHEREFS,
+        STAT_L1_DCACHE,
+        STAT_L1_ICACHE,
+        STAT_LL_CACHE,
+        STAT_ITLB_CACHE,
+        STAT_DTLB_CACHE,
+        STAT_CYCLES_IN_TX,
+        STAT_TRANSACTION,
+        STAT_ELISION,
+        STAT_TOPDOWN_TOTAL_SLOTS,
+        STAT_TOPDOWN_SLOTS_ISSUED,
+        STAT_TOPDOWN_SLOTS_RETIRED,
+        STAT_TOPDOWN_FETCH_BUBBLES,
+        STAT_TOPDOWN_RECOVERY_BUBBLES,
+        STAT_SMI_NUM,
+        STAT_APERF,
+        STAT_MAX
+};
+
+struct runtime_stat {
+        struct rblist value_list;
+};
+
 struct perf_stat_config {
         enum aggr_mode  aggr_mode;
         bool            scale;
         FILE            *output;
         unsigned int    interval;
+        struct runtime_stat *stats;
+        int             stats_num;
 };
 
 void update_stats(struct stats *stats, u64 val);
@@ -67,6 +111,15 @@ static inline void init_stats(struct stats *stats)
 struct perf_evsel;
 struct perf_evlist;
 
+struct perf_aggr_thread_value {
+        struct perf_evsel *counter;
+        int id;
+        double uval;
+        u64 val;
+        u64 run;
+        u64 ena;
+};
+
 bool __perf_evsel_stat__is(struct perf_evsel *evsel,
                            enum perf_stat_evsel_id id);
 
@@ -75,16 +128,20 @@ bool __perf_evsel_stat__is(struct perf_evsel *evsel,
 
 void perf_stat_evsel_id_init(struct perf_evsel *evsel);
 
+extern struct runtime_stat rt_stat;
 extern struct stats walltime_nsecs_stats;
 
 typedef void (*print_metric_t)(void *ctx, const char *color, const char *unit,
                                const char *fmt, double val);
 typedef void (*new_line_t )(void *ctx);
 
+void runtime_stat__init(struct runtime_stat *st);
+void runtime_stat__exit(struct runtime_stat *st);
 void perf_stat__init_shadow_stats(void);
 void perf_stat__reset_shadow_stats(void);
+void perf_stat__reset_shadow_per_stat(struct runtime_stat *st);
 void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 count,
-                                    int cpu);
+                                    int cpu, struct runtime_stat *st);
 struct perf_stat_output_ctx {
         void *ctx;
         print_metric_t print_metric;
@@ -92,11 +149,11 @@ struct perf_stat_output_ctx {
         bool force_header;
 };
 
-struct rblist;
 void perf_stat__print_shadow_stats(struct perf_evsel *evsel,
                                    double avg, int cpu,
                                    struct perf_stat_output_ctx *out,
-                                   struct rblist *metric_events);
+                                   struct rblist *metric_events,
+                                   struct runtime_stat *st);
 void perf_stat__collect_metric_expr(struct perf_evlist *);
 
 int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw);