From: John Garry <john.garry@huawei.com>
To: Ian Rogers <irogers@google.com>, Will Deacon <will@kernel.org>,
"James Clark" <james.clark@arm.com>,
Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Zhengjun Xing <zhengjun.xing@linux.intel.com>,
Ravi Bangoria <ravi.bangoria@amd.com>,
"Kan Liang" <kan.liang@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-perf-users@vger.kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH v3 05/17] perf jevents: Remove the type/version variables
Date: Fri, 29 Jul 2022 09:29:52 +0100 [thread overview]
Message-ID: <393770c6-8469-a5b5-5106-a98420bb6e00@huawei.com> (raw)
In-Reply-To: <20220729074351.138260-6-irogers@google.com>
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@google.com>
Reviewed-by: John Garry <john.garry@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,
> };
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-07-29 8:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 7:43 [PATCH v3 00/17] Compress the pmu_event tables Ian Rogers
2022-07-29 7:43 ` [PATCH v3 01/17] perf jevents: Clean up pytype warnings Ian Rogers
2022-07-29 7:43 ` [PATCH v3 02/17] perf jevents: Simplify generation of C-string Ian Rogers
2022-07-29 7:43 ` [PATCH v3 03/17] perf jevents: Add JEVENTS_ARCH make option Ian Rogers
2022-07-29 7:43 ` [PATCH v3 04/17] perf jevent: Add an 'all' architecture argument Ian Rogers
2022-07-29 7:43 ` [PATCH v3 05/17] perf jevents: Remove the type/version variables Ian Rogers
2022-07-29 8:29 ` John Garry [this message]
2022-07-29 14:24 ` Ian Rogers
2022-07-29 7:43 ` [PATCH v3 06/17] perf jevents: Provide path to json file on error Ian Rogers
2022-07-29 7:43 ` [PATCH v3 07/17] perf jevents: Sort json files entries Ian Rogers
2022-07-29 7:43 ` [PATCH v3 08/17] perf pmu-events: Hide pmu_sys_event_tables Ian Rogers
2022-07-29 7:43 ` [PATCH v3 09/17] perf pmu-events: Avoid passing pmu_events_map Ian Rogers
2022-07-29 7:43 ` [PATCH v3 10/17] perf pmu-events: Hide pmu_events_map Ian Rogers
2022-07-29 7:43 ` [PATCH v3 11/17] perf test: Use full metric resolution Ian Rogers
2022-07-29 7:43 ` [PATCH v3 12/17] perf pmu-events: Move test events/metrics to json Ian Rogers
2022-07-29 7:43 ` [PATCH v3 13/17] perf pmu-events: Don't assume pmu_event is an array Ian Rogers
2022-07-29 7:43 ` [PATCH v3 14/17] perf pmu-events: Hide the pmu_events Ian Rogers
2022-07-29 7:43 ` [PATCH v3 15/17] perf metrics: Copy entire pmu_event in find metric Ian Rogers
2022-07-29 7:43 ` [PATCH v3 16/17] perf jevents: Compress the pmu_events_table Ian Rogers
2022-07-29 7:43 ` [PATCH v3 17/17] perf jevents: Fold strings optimization Ian Rogers
2022-07-29 15:03 ` [PATCH v3 00/17] Compress the pmu_event tables John Garry
2022-07-29 17:27 ` Ian Rogers
2022-08-02 9:08 ` John Garry
2022-08-05 8:11 ` John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=393770c6-8469-a5b5-5106-a98420bb6e00@huawei.com \
--to=john.garry@huawei.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=will@kernel.org \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).