Commit 3cc84399 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Honor event config name on --no-merge 



If user gave an event name explicitly, it should be displayed in the
output as is.  But with --no-merge option it adds a pmu name at the
end so might confuse users.

Actually this is true for hybrid pmus, I think we should do the same
for others.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210602212241.2175005-3-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2dc065ea

tools/perf/util/stat-display.c

+3 −5
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static void uniquify_event_name(struct evsel *counter) 
	char *config;

	int ret = 0;



	if (counter->uniquified_name ||

	if (counter->uniquified_name || counter->use_config_name ||

	    !counter->pmu_name || !strncmp(counter->name, counter->pmu_name,

					   strlen(counter->pmu_name)))

		return;
@@ -555,10 +555,8 @@ static void uniquify_event_name(struct evsel *counter) 
		}

	} else {

		if (perf_pmu__has_hybrid()) {

			if (!counter->use_config_name) {

			ret = asprintf(&new_name, "%s/%s/",

				       counter->pmu_name, counter->name);

			}

		} else {

			ret = asprintf(&new_name, "%s [%s]",

				       counter->name, counter->pmu_name);