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

perf jevents: Remove the type/version variables 



pmu_events_map has a type variable that is always initialized to "core"
and a version variable that is never read. Remove these from the API as
it is straightforward to add them back when necessary.

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: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.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: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20220812230949.683239-3-irogers@google.com


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

tools/perf/pmu-events/empty-pmu-events.c

+0 −4
Original line number Diff line number Diff line
@@ -112,15 +112,11 @@ const struct pmu_events_map pmu_events_map[] = { 
	{

		.arch = "testarch",

		.cpuid = "testcpu",

		.version = "v1",

		.type = "core",

		.table = pme_test_soc_cpu,

	},

	{

		.arch = 0,

		.cpuid = 0,

		.version = 0,

		.type = 0,

		.table = 0,

	},

};

tools/perf/pmu-events/jevents.py

+0 −6
Original line number Diff line number Diff line
@@ -313,8 +313,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: 
      _args.output_file.write("""{

\t.arch = "testarch",

\t.cpuid = "testcpu",

\t.version = "v1",

\t.type = "core",

\t.table = pme_test_soc_cpu,

},

""")
@@ -330,8 +328,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: 
            _args.output_file.write(f"""{{

\t.arch = "{arch}",

\t.cpuid = "{cpuid}",

\t.version = "{row[1]}",

\t.type = "{row[3]}",

\t.table = {tblname}

}},

""")
@@ -340,8 +336,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: 
  _args.output_file.write("""{

\t.arch = 0,

\t.cpuid = 0,

\t.version = 0,

\t.type = 0,

\t.table = 0,

}

};

tools/perf/pmu-events/pmu-events.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ struct pmu_event { 
struct pmu_events_map {

	const char *arch;

	const char *cpuid;

	const char *version;

	const char *type;		/* core, uncore etc */

	const struct pmu_event *table;

};

tools/perf/tests/expand-cgroup.c

+0 −2
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ static int expand_metric_events(void) 
	};

	const struct pmu_events_map ev_map = {

		.cpuid		= "test",

		.version	= "1",

		.type		= "core",

		.table		= pme_test,

	};

tools/perf/tests/parse-metric.c

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ static struct pmu_event pme_test[] = { 


static const struct pmu_events_map map = {

	.cpuid		= "test",

	.version	= "1",

	.type		= "core",

	.table		= pme_test,

};