@@ -68,6 +68,7 @@ struct perf_evsel {
 		struct list_head	config_terms;
 		const char		*metric_id;
 		enum perf_tool_event	tool_event;
+		const char		*unit;
 	};
 };
 

@@ -917,7 +917,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
 			continue;
 		}
 
-		l = strlen(counter->unit);
+		l = strlen(counter->core.unit);
 		if (l > stat_config.unit_width)
 			stat_config.unit_width = l;
 

@@ -99,7 +99,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unu
 
 	perf_evlist__id_add(&evlist->core, &evsel->core, 0, 0, 123);
 
-	evsel->unit = unit;
+	evsel->core.unit = unit;
 
 	TEST_ASSERT_VAL("failed to synthesize attr update unit",
 			!perf_event__synthesize_event_update_unit(NULL, evsel, process_event_unit));

@@ -241,7 +241,7 @@ void evsel__init(struct evsel *evsel,
 {
 	perf_evsel__init(&evsel->core, attr, idx);
 	evsel->tracking	   = !idx;
-	evsel->unit	   = "";
+	evsel->core.unit   = "";
 	evsel->scale	   = 1.0;
 	evsel->max_events  = ULONG_MAX;
 	evsel->evlist	   = NULL;

@@ -282,7 +282,7 @@ struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx)
 		 */
 		static const char *unit = "msec";
 
-		evsel->unit = unit;
+		evsel->core.unit = unit;
 		evsel->scale = 1e-6;
 	}
 

@@ -422,7 +422,7 @@ struct evsel *evsel__clone(struct evsel *orig)
 
 	evsel->max_events = orig->max_events;
 	evsel->core.tool_event = orig->core.tool_event;
-	evsel->unit = orig->unit;
+	evsel->core.unit = orig->core.unit;
 	evsel->scale = orig->scale;
 	evsel->snapshot = orig->snapshot;
 	evsel->per_pkg = orig->per_pkg;

@@ -1300,7 +1300,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
 		attr->exclude_user   = 1;
 	}
 
-	if (evsel->core.own_cpus || evsel->unit)
+	if (evsel->core.own_cpus || evsel->core.unit)
 		evsel->core.attr.read_format |= PERF_FORMAT_ID;
 
 	/*

@@ -60,7 +60,6 @@ struct evsel {
 		char			*filter;
 		unsigned long		max_events;
 		double			scale;
-		const char		*unit;
 		struct cgroup		*cgrp;
 		/* parse modifier helper */
 		int			exclude_GH;

@@ -4256,7 +4256,7 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,
 
 	switch (ev->type) {
 	case PERF_EVENT_UPDATE__UNIT:
-		evsel->unit = strdup(ev->data);
+		evsel->core.unit = strdup(ev->data);
 		break;
 	case PERF_EVENT_UPDATE__NAME:
 		evsel->core.name = strdup(ev->data);

@@ -436,7 +436,7 @@ static int add_event_tool(struct list_head *list, int *idx,
 		return -ENOMEM;
 	evsel->core.tool_event = tool_event;
 	if (tool_event == PERF_TOOL_DURATION_TIME)
-		evsel->unit = "ns";
+		evsel->core.unit = "ns";
 	return 0;
 }
 

@@ -1663,7 +1663,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 	if (parse_state->fake_pmu)
 		return 0;
 
-	evsel->unit = info.unit;
+	evsel->core.unit = info.unit;
 	evsel->scale = info.scale;
 	evsel->per_pkg = info.per_pkg;
 	evsel->snapshot = info.snapshot;

@@ -372,10 +372,10 @@ static void abs_printout(struct perf_stat_config *config,
 
 	fprintf(output, fmt, avg, config->csv_sep);
 
-	if (evsel->unit)
+	if (evsel->core.unit)
 		fprintf(output, "%-*s%s",
 			config->csv_output ? 0 : config->unit_width,
-			evsel->unit, config->csv_sep);
+			evsel->core.unit, config->csv_sep);
 
 	fprintf(output, "%-*s", config->csv_output ? 0 : 25, evsel__name(evsel));
 

@@ -476,7 +476,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int
 
 		fprintf(config->output, "%-*s%s",
 			config->csv_output ? 0 : config->unit_width,
-			counter->unit, config->csv_sep);
+			counter->core.unit, config->csv_sep);
 
 		fprintf(config->output, "%*s",
 			config->csv_output ? 0 : -25, evsel__name(counter));

@@ -588,7 +588,7 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *c
 		if (strcmp(evsel__name(alias), evsel__name(counter)) ||
 		    alias->scale != counter->scale ||
 		    alias->cgrp != counter->cgrp ||
-		    strcmp(alias->unit, counter->unit) ||
+		    strcmp(alias->core.unit, counter->core.unit) ||
 		    evsel__is_clock(alias) != evsel__is_clock(counter) ||
 		    !strcmp(alias->pmu_name, counter->pmu_name))
 			break;

@@ -1824,7 +1824,7 @@ static struct perf_record_event_update *event_update_event__new(size_t size, u64
 int perf_event__synthesize_event_update_unit(struct perf_tool *tool, struct evsel *evsel,
 					     perf_event__handler_t process)
 {
-	size_t size = strlen(evsel->unit);
+	size_t size = strlen(evsel->core.unit);
 	struct perf_record_event_update *ev;
 	int err;
 

@@ -1832,7 +1832,7 @@ int perf_event__synthesize_event_update_unit(struct perf_tool *tool, struct evse
 	if (ev == NULL)
 		return -ENOMEM;
 
-	strlcpy(ev->data, evsel->unit, size + 1);
+	strlcpy(ev->data, evsel->core.unit, size + 1);
 	err = process(tool, (union perf_event *)ev, NULL, NULL);
 	free(ev);
 	return err;

@@ -1921,7 +1921,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool, struct evlist *evlist,
 
 static bool has_unit(struct evsel *evsel)
 {
-	return evsel->unit && *evsel->unit;
+	return evsel->core.unit && *evsel->core.unit;
 }
 
 static bool has_scale(struct evsel *evsel)