Commit b4388dfa authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Remove evlist__warn_hybrid_group 



Parse events now corrects PMU groups in
parse_events__sort_events_and_fix_groups and so this warning is no
longer possible.

Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230527072210.2900565-13-irogers@google.com


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

tools/perf/builtin-stat.c

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ static void evlist__check_cpu_maps(struct evlist *evlist) 
{

	struct evsel *evsel, *warned_leader = NULL;



	if (evlist__has_hybrid(evlist))

		evlist__warn_hybrid_group(evlist);



	evlist__for_each_entry(evlist, evsel) {

		struct evsel *leader = evsel__leader(evsel);

tools/perf/util/evlist-hybrid.c

+0 −32
Original line number Diff line number Diff line
@@ -41,38 +41,6 @@ int evlist__add_default_hybrid(struct evlist *evlist, bool precise) 
	return 0;

}



static bool group_hybrid_conflict(struct evsel *leader)

{

	struct evsel *pos, *prev = NULL;



	for_each_group_evsel(pos, leader) {

		if (!evsel__is_hybrid(pos))

			continue;



		if (prev && strcmp(prev->pmu_name, pos->pmu_name))

			return true;



		prev = pos;

	}



	return false;

}



void evlist__warn_hybrid_group(struct evlist *evlist)

{

	struct evsel *evsel;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel__is_group_leader(evsel) &&

		    evsel->core.nr_members > 1 &&

		    group_hybrid_conflict(evsel)) {

			pr_warning("WARNING: events in group from "

				   "different hybrid PMUs!\n");

			return;

		}

	}

}



bool evlist__has_hybrid(struct evlist *evlist)

{

	struct evsel *evsel;

tools/perf/util/evlist-hybrid.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <unistd.h>



int evlist__add_default_hybrid(struct evlist *evlist, bool precise);

void evlist__warn_hybrid_group(struct evlist *evlist);

bool evlist__has_hybrid(struct evlist *evlist);



#endif /* __PERF_EVLIST_HYBRID_H */