Commit 93d5e700 authored Oct 17, 2022 by Namhyung Kim Committed by Arnaldo Carvalho de Melo Oct 27, 2022

perf stat: Use evsel__is_hybrid() more



In the stat-display code, it needs to check if the current evsel is
hybrid but it uses perf_pmu__has_hybrid() which can return true for
non-hybrid event too.  I think it's better to use evsel__is_hybrid().

Also remove a NULL check for the 'config' parameter in the
hybrid_merge() since it's called after config->no_merge check.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221018020227.85905-4-namhyung@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent b86ac679

tools/perf/util/stat-display.c

+4 −16

Original line number	Diff line number	Diff line
		@@ -704,7 +704,7 @@ static void uniquify_event_name(struct evsel *counter)
		counter->name = new_name;
		}
		} else {
		if (perf_pmu__has_hybrid()) {
		if (evsel__is_hybrid(counter)) {
		ret = asprintf(&new_name, "%s/%s/",
		counter->pmu_name, counter->name);
		} else {
		@@ -744,26 +744,14 @@ static void collect_all_aliases(struct perf_stat_config config, struct evsel c
		}
		}

		static bool is_uncore(struct evsel *evsel)
		{
		struct perf_pmu *pmu = evsel__find_pmu(evsel);

		return pmu && pmu->is_uncore;
		}

		static bool hybrid_uniquify(struct evsel *evsel)
		{
		return perf_pmu__has_hybrid() && !is_uncore(evsel);
		}

		static bool hybrid_merge(struct evsel counter, struct perf_stat_config config,
		bool check)
		{
		if (hybrid_uniquify(counter)) {
		if (evsel__is_hybrid(counter)) {
		if (check)
		return config && config->hybrid_merge;
		return config->hybrid_merge;
		else
		return config && !config->hybrid_merge;
		return !config->hybrid_merge;
		}

		return false;