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

perf stat: Remove duplicate cpus_map_matched function 



Use libperf's perf_cpu_map__equal() that performs the same function.

Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>
Cc: Andrew Jones <ajones@ventanamicro.com>
Cc: André Almeida <andrealmeid@igalia.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Atish Patra <atishp@rivosinc.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paran Lee <p4ranlee@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Yang Li <yang.lee@linux.alibaba.com>
Cc: Yanteng Si <siyanteng@loongson.cn>
Link: https://lore.kernel.org/r/20240202234057.2085863-8-irogers@google.com


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

tools/perf/builtin-stat.c

+1 −21
Original line number Diff line number Diff line
@@ -164,26 +164,6 @@ static struct perf_stat_config stat_config = { 
	.iostat_run		= false,

};



static bool cpus_map_matched(struct evsel *a, struct evsel *b)

{

	if (!a->core.cpus && !b->core.cpus)

		return true;



	if (!a->core.cpus || !b->core.cpus)

		return false;



	if (perf_cpu_map__nr(a->core.cpus) != perf_cpu_map__nr(b->core.cpus))

		return false;



	for (int i = 0; i < perf_cpu_map__nr(a->core.cpus); i++) {

		if (perf_cpu_map__cpu(a->core.cpus, i).cpu !=

		    perf_cpu_map__cpu(b->core.cpus, i).cpu)

			return false;

	}



	return true;

}



static void evlist__check_cpu_maps(struct evlist *evlist)

{

	struct evsel *evsel, *warned_leader = NULL;
@@ -194,7 +174,7 @@ static void evlist__check_cpu_maps(struct evlist *evlist) 
		/* Check that leader matches cpus with each member. */

		if (leader == evsel)

			continue;

		if (cpus_map_matched(leader, evsel))

		if (perf_cpu_map__equal(leader->core.cpus, evsel->core.cpus))

			continue;



		/* If there's mismatch disable the group and warn user. */