From: Ian Rogers <irogers@google.com>
To: John Garry <john.garry@huawei.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>, Ian Rogers <irogers@google.com>
Subject: [PATCH v2 04/16] perf jevents: Remove the type/version variables
Date: Thu, 28 Jul 2022 15:28:23 -0700 [thread overview]
Message-ID: <20220728222835.3254224-5-irogers@google.com> (raw)
In-Reply-To: <20220728222835.3254224-1-irogers@google.com>
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>
---
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",
.cpuid = "testcpu",
- .version = "v1",
- .type = "core",
.table = pme_test_soc_cpu,
},
{
+ .arch = 0,
.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 2a9a1a086dee..c53c744da56b 100755
--- a/tools/perf/pmu-events/jevents.py
+++ b/tools/perf/pmu-events/jevents.py
@@ -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,
}
};
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,
};
--
2.37.1.455.g008518b4e5-goog
next prev parent reply other threads:[~2022-07-28 22:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 22:28 [PATCH v2 00/16] Compress the pmu_event tables Ian Rogers
2022-07-28 22:28 ` [PATCH v2 01/16] perf jevents: Simplify generation of C-string Ian Rogers
2022-07-28 22:28 ` [PATCH v2 02/16] perf jevents: Add JEVENTS_ARCH make option Ian Rogers
2022-07-28 22:28 ` [PATCH v2 03/16] perf jevent: Add an 'all' architecture argument Ian Rogers
2022-07-28 22:28 ` Ian Rogers [this message]
2022-07-28 22:28 ` [PATCH v2 05/16] perf jevents: Provide path to json file on error Ian Rogers
2022-07-28 22:28 ` [PATCH v2 06/16] perf jevents: Sort json files entries Ian Rogers
2022-07-28 22:28 ` [PATCH v2 07/16] perf pmu-events: Hide pmu_sys_event_tables Ian Rogers
2022-07-28 22:28 ` [PATCH v2 08/16] perf pmu-events: Avoid passing pmu_events_map Ian Rogers
2022-07-28 22:28 ` [PATCH v2 09/16] perf pmu-events: Hide pmu_events_map Ian Rogers
2022-07-28 22:28 ` [PATCH v2 10/16] perf test: Use full metric resolution Ian Rogers
2022-07-28 22:28 ` [PATCH v2 11/16] perf pmu-events: Move test events/metrics to json Ian Rogers
2022-07-28 22:28 ` [PATCH v2 12/16] perf pmu-events: Don't assume pmu_event is an array Ian Rogers
2022-07-28 22:28 ` [PATCH v2 13/16] perf pmu-events: Hide the pmu_events Ian Rogers
2022-07-28 22:28 ` [PATCH v2 14/16] perf metrics: Copy entire pmu_event in find metric Ian Rogers
2022-07-28 22:28 ` [PATCH v2 15/16] perf jevents: Compress the pmu_events_table Ian Rogers
2022-07-28 22:28 ` [PATCH v2 16/16] perf jevents: Fold strings optimization Ian Rogers
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=20220728222835.3254224-5-irogers@google.com \
--to=irogers@google.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=james.clark@arm.com \
--cc=john.garry@huawei.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).