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

perf pmu: Separate pmu and pmus 



Separate and hide the pmus list in pmus.[ch]. Move pmus functionality
out of pmu.[ch] into pmus.[ch] renaming pmus functions which were
prefixed perf_pmu__ to perf_pmus__.

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-28-irogers@google.com


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

tools/perf/arch/arm/util/auxtrace.c

+4 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "../../../util/debug.h"

#include "../../../util/evlist.h"

#include "../../../util/pmu.h"

#include "../../../util/pmus.h"

#include "cs-etm.h"

#include "arm-spe.h"

#include "hisi-ptt.h"
@@ -40,7 +41,7 @@ static struct perf_pmu **find_all_arm_spe_pmus(int *nr_spes, int *err) 
			return NULL;

		}



		arm_spe_pmus[*nr_spes] = perf_pmu__find(arm_spe_pmu_name);

		arm_spe_pmus[*nr_spes] = perf_pmus__find(arm_spe_pmu_name);

		if (arm_spe_pmus[*nr_spes]) {

			pr_debug2("%s %d: arm_spe_pmu %d type %d name %s\n",

				 __func__, __LINE__, *nr_spes,
@@ -87,7 +88,7 @@ static struct perf_pmu **find_all_hisi_ptt_pmus(int *nr_ptts, int *err) 
	rewinddir(dir);

	while ((dent = readdir(dir))) {

		if (strstr(dent->d_name, HISI_PTT_PMU_NAME) && idx < *nr_ptts) {

			hisi_ptt_pmus[idx] = perf_pmu__find(dent->d_name);

			hisi_ptt_pmus[idx] = perf_pmus__find(dent->d_name);

			if (hisi_ptt_pmus[idx])

				idx++;

		}
@@ -131,7 +132,7 @@ struct auxtrace_record 
	if (!evlist)

		return NULL;



	cs_etm_pmu = perf_pmu__find(CORESIGHT_ETM_PMU_NAME);

	cs_etm_pmu = perf_pmus__find(CORESIGHT_ETM_PMU_NAME);

	arm_spe_pmus = find_all_arm_spe_pmus(&nr_spes, err);

	hisi_ptt_pmus = find_all_hisi_ptt_pmus(&nr_ptts, err);

tools/perf/arch/arm/util/cs-etm.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "../../../util/evsel.h"

#include "../../../util/perf_api_probe.h"

#include "../../../util/evsel_config.h"

#include "../../../util/pmu.h"

#include "../../../util/pmus.h"

#include "../../../util/cs-etm.h"

#include <internal/lib.h> // page_size

#include "../../../util/session.h"
@@ -881,7 +881,7 @@ struct auxtrace_record *cs_etm_record_init(int *err) 
	struct perf_pmu *cs_etm_pmu;

	struct cs_etm_recording *ptr;



	cs_etm_pmu = perf_pmu__find(CORESIGHT_ETM_PMU_NAME);

	cs_etm_pmu = perf_pmus__find(CORESIGHT_ETM_PMU_NAME);



	if (!cs_etm_pmu) {

		*err = -EINVAL;

tools/perf/arch/arm64/util/pmu.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <internal/cpumap.h>

#include "../../../util/cpumap.h"

#include "../../../util/pmu.h"

#include "../../../util/pmus.h"

#include <api/fs/fs.h>

#include <math.h>
@@ -10,7 +11,7 @@ static struct perf_pmu *pmu__find_core_pmu(void) 
{

	struct perf_pmu *pmu = NULL;



	while ((pmu = perf_pmu__scan(pmu))) {

	while ((pmu = perf_pmus__scan(pmu))) {

		if (!is_pmu_core(pmu->name))

			continue;

tools/perf/arch/x86/tests/hybrid.c

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "evlist.h"

#include "evsel.h"

#include "pmu.h"

#include "pmus.h"

#include "tests/tests.h"



static bool test_config(const struct evsel *evsel, __u64 expected_config)
@@ -113,7 +114,7 @@ static int test__hybrid_raw1(struct evlist *evlist) 
	struct perf_evsel *evsel;



	perf_evlist__for_each_evsel(&evlist->core, evsel) {

		struct perf_pmu *pmu = perf_pmu__find_by_type(evsel->attr.type);

		struct perf_pmu *pmu = perf_pmus__find_by_type(evsel->attr.type);



		TEST_ASSERT_VAL("missing pmu", pmu);

		TEST_ASSERT_VAL("unexpected pmu", !strncmp(pmu->name, "cpu_", 4));
@@ -280,7 +281,7 @@ static int test_events(const struct evlist_test *events, int cnt) 


int test__hybrid(struct test_suite *test __maybe_unused, int subtest __maybe_unused)

{

	if (!perf_pmu__has_hybrid())

	if (!perf_pmus__has_hybrid())

		return TEST_SKIP;



	return test_events(test__hybrid_events, ARRAY_SIZE(test__hybrid_events));

tools/perf/arch/x86/util/auxtrace.c

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "../../../util/header.h"

#include "../../../util/debug.h"

#include "../../../util/pmu.h"

#include "../../../util/pmus.h"

#include "../../../util/auxtrace.h"

#include "../../../util/intel-pt.h"

#include "../../../util/intel-bts.h"
@@ -25,8 +26,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist, 
	bool found_pt = false;

	bool found_bts = false;



	intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME);

	intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME);

	intel_pt_pmu = perf_pmus__find(INTEL_PT_PMU_NAME);

	intel_bts_pmu = perf_pmus__find(INTEL_BTS_PMU_NAME);



	evlist__for_each_entry(evlist, evsel) {

		if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type)