On Sun, Oct 9, 2022 at 10:36 PM Namhyung Kim <namhyung@kernel.org> wrote:
>
> 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>
Thanks,
Ian
> ---
> tools/perf/util/stat-display.c | 20 ++++----------------
> 1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> index 5c47ee9963a7..4113aa86772f 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -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;
> --
> 2.38.0.rc1.362.ged0d419d3c-goog
>