1 files changed, 8 insertions, 16 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 7e17bf9f700a..60cdd383af81 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -61,6 +61,7 @@
 #include "util/tool.h"
 #include "util/string2.h"
 #include "util/metricgroup.h"
+#include "util/synthetic-events.h"
 #include "util/target.h"
 #include "util/time-utils.h"
 #include "util/top.h"
@@ -540,8 +541,8 @@ try_again:
                 if (err < 0)
                         return err;
 
-                err = perf_stat_synthesize_config(&stat_config, NULL, evsel_list,
-                                                  process_synthesized_event, is_pipe);
+                err = perf_event__synthesize_stat_events(&stat_config, NULL, evsel_list,
+                                                         process_synthesized_event, is_pipe);
                 if (err < 0)
                         return err;
         }
@@ -822,18 +823,6 @@ static int perf_stat__get_core(struct perf_stat_config *config __maybe_unused,
         return cpu_map__get_core(map, cpu, NULL);
 }
 
-static int cpu_map__get_max(struct perf_cpu_map *map)
-{
-        int i, max = -1;
-
-        for (i = 0; i < map->nr; i++) {
-                if (map->map[i] > max)
-                        max = map->map[i];
-        }
-
-        return max;
-}
-
 static int perf_stat__get_aggr(struct perf_stat_config *config,
                                aggr_get_id_t get_id, struct perf_cpu_map *map, int idx)
 {
@@ -928,7 +917,7 @@ static int perf_stat_init_aggr_mode(void)
          * taking the highest cpu number to be the size of
          * the aggregation translate cpumap.
          */
-        nr = cpu_map__get_max(evsel_list->core.cpus);
+        nr = perf_cpu_map__max(evsel_list->core.cpus);
         stat_config.cpus_aggr_map = perf_cpu_map__empty_new(nr + 1);
         return stat_config.cpus_aggr_map ? 0 : -ENOMEM;
 }
@@ -1963,8 +1952,11 @@ int cmd_stat(int argc, const char **argv)
                         fprintf(output, "[ perf stat: executing run #%d ... ]\n",
                                 run_idx + 1);
 
+                if (run_idx != 0)
+                        perf_evlist__reset_prev_raw_counts(evsel_list);
+
                 status = run_perf_stat(argc, argv, run_idx);
-                if (forever && status != -1) {
+                if (forever && status != -1 && !interval) {
                         print_counters(NULL, argc, argv);
                         perf_stat__reset_stats();
                 }