[PATCH v3 05/17] perf jevents: Remove the type/version variables

[John Garry]

On 29/07/2022 08:43, Ian Rogers wrote:
> 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: Ian Rogers <irogers at google.com>

Reviewed-by: John Garry <john.garry at huawei.com>

Please note the questions, below.

> ---
>   tools/perf/pmu-events/empty-pmu-events.c | 6 ++----
>   tools/perf/pmu-events/jevents.py         | 6 ------
>   tools/perf/pmu-events/pmu-events.h       | 2 --
>   tools/perf/tests/expand-cgroup.c         | 2 --
>   tools/perf/tests/parse-metric.c          | 2 --
>   5 files changed, 2 insertions(+), 16 deletions(-)
> 
> diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c
> index 77e655c6f116..4182a986f505 100644
> --- a/tools/perf/pmu-events/empty-pmu-events.c
> +++ b/tools/perf/pmu-events/empty-pmu-events.c
> @@ -110,15 +110,13 @@ static const struct pmu_event pme_test_soc_cpu[] = {
>   
>   const struct pmu_events_map pmu_events_map[] = {
>   	{
> +		.arch = "testarch",

Is this really supposed to be part of this patch?

>   		.cpuid = "testcpu",
> -		.version = "v1",
> -		.type = "core",
>   		.table = pme_test_soc_cpu,
>   	},
>   	{
> +		.arch = 0,

Same as above

>   		.cpuid = 0,
> -		.version = 0,
> -		.type = 0,
>   		.table = 0,
>   	},
>   };
> diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
> index e6e6c42c3f8a..98d18d5c3830 100755
> --- a/tools/perf/pmu-events/jevents.py
> +++ b/tools/perf/pmu-events/jevents.py
> @@ -312,8 +312,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,
>   },
>   """)
> @@ -329,8 +327,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}
>   }},
>   """)
> @@ -339,8 +335,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,
>   }
>   };
> diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
> index 7a360792635f..a491b117c8ac 100644
> --- a/tools/perf/pmu-events/pmu-events.h
> +++ b/tools/perf/pmu-events/pmu-events.h
> @@ -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;
>   };
>   
> diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgroup.c
> index dfefe5b60eb2..dc4038f997d7 100644
> --- a/tools/perf/tests/expand-cgroup.c
> +++ b/tools/perf/tests/expand-cgroup.c
> @@ -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,
>   	};
>   
> diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
> index 07b6f4ec024f..1b811a26f4ee 100644
> --- a/tools/perf/tests/parse-metric.c
> +++ b/tools/perf/tests/parse-metric.c
> @@ -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,
>   };
>