leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim
2021-06-02 14:22:41 -07:00
committed by Arnaldo Carvalho de Melo
parent 2dc065eae5
commit 3cc84399e9
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/util/stat-display.c
View File

@@ -541,7 +541,7 @@ static void uniquify_event_name(struct evsel *counter)
char *config; char *config;
int ret = 0; int ret = 0;
if (counter->uniquified_name || if (counter->uniquified_name || counter->use_config_name ||
!counter->pmu_name || !strncmp(counter->name, counter->pmu_name, !counter->pmu_name || !strncmp(counter->name, counter->pmu_name,
strlen(counter->pmu_name))) strlen(counter->pmu_name)))
return; return;
@@ -555,10 +555,8 @@ static void uniquify_event_name(struct evsel *counter)
} }
} else { } else {
if (perf_pmu__has_hybrid()) { if (perf_pmu__has_hybrid()) {
if (!counter->use_config_name) { ret = asprintf(&new_name, "%s/%s/",
ret = asprintf(&new_name, "%s/%s/", counter->pmu_name, counter->name);
counter->pmu_name, counter->name);
}
} else { } else {
ret = asprintf(&new_name, "%s [%s]", ret = asprintf(&new_name, "%s [%s]",
counter->name, counter->pmu_name); counter->name, counter->pmu_name);