[PATCH 08/59] libperf: Move auto_merge_stats to perf_evsel

[Jiri Olsa <jolsa@redhat.com>]

Moving auto_merge_stats to perf_evsel struct.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/perf/include/internal/evsel.h | 1 +
 tools/perf/util/evsel.c                 | 2 +-
 tools/perf/util/evsel.h                 | 1 -
 tools/perf/util/parse-events.c          | 2 +-
 tools/perf/util/stat-display.c          | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/lib/perf/include/internal/evsel.h b/tools/lib/perf/include/internal/evsel.h
index 808720b4cf77..be30dc1ed9a7 100644
--- a/tools/lib/perf/include/internal/evsel.h
+++ b/tools/lib/perf/include/internal/evsel.h
@@ -59,6 +59,7 @@ struct perf_evsel {
 	 */
         struct {
                 char			*name;
+		bool			auto_merge_stats;
 	};
 };
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index b737f1c60721..10ba2f91d5a2 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -433,7 +433,7 @@ struct evsel *evsel__clone(struct evsel *orig)
 
 	evsel->exclude_GH = orig->exclude_GH;
 	evsel->sample_read = orig->sample_read;
-	evsel->auto_merge_stats = orig->auto_merge_stats;
+	evsel->core.auto_merge_stats = orig->core.auto_merge_stats;
 	evsel->collect_stat = orig->collect_stat;
 	evsel->weak_group = orig->weak_group;
 	evsel->use_config_name = orig->use_config_name;
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index de6ed7b258ca..ead2c3f3ea05 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -78,7 +78,6 @@ struct evsel {
 		bool			precise_max;
 		bool			use_uncore_alias;
 		bool			is_libpfm_event;
-		bool			auto_merge_stats;
 		bool			collect_stat;
 		bool			weak_group;
 		bool			bpf_counter;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 072ff971e32f..09fbb128df63 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -384,7 +384,7 @@ __add_event(struct list_head *list, int *idx,
 	evsel->core.cpus = cpus;
 	evsel->core.own_cpus = perf_cpu_map__get(cpus);
 	evsel->core.system_wide = pmu ? pmu->is_uncore : false;
-	evsel->auto_merge_stats = auto_merge_stats;
+	evsel->core.auto_merge_stats = auto_merge_stats;
 
 	if (name)
 		evsel->core.name = strdup(name);
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 9a685b347041..b00097e86c85 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -619,7 +619,7 @@ static bool collect_data(struct perf_stat_config *config, struct evsel *counter,
 	cb(config, counter, data, true);
 	if (config->no_merge || hybrid_uniquify(counter))
 		uniquify_event_name(counter);
-	else if (counter->auto_merge_stats)
+	else if (counter->core.auto_merge_stats)
 		collect_all_aliases(config, counter, cb, data);
 	return true;
 }
-- 
2.31.1