From: Ian Rogers <irogers@google.com>
To: John Garry <john.g.garry@oracle.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>,
Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Kim Phillips <kim.phillips@amd.com>,
Florian Fischer <florian.fischer@muhq.space>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Xing Zhengjun <zhengjun.xing@linux.intel.com>,
Rob Herring <robh@kernel.org>,
Kang Minchul <tegongkang@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Sandipan Das <sandipan.das@amd.com>,
Jing Zhang <renyu.zj@linux.alibaba.com>,
linuxppc-dev@lists.ozlabs.org, Kajol Jain <kjain@linux.ibm.com>
Cc: Stephane Eranian <eranian@google.com>,
Perry Taylor <perry.taylor@intel.com>,
Caleb Biggers <caleb.biggers@intel.com>,
Ian Rogers <irogers@google.com>
Subject: [PATCH v4 08/12] perf jevents: Combine table prefix and suffix writing
Date: Wed, 25 Jan 2023 17:18:50 -0800 [thread overview]
Message-ID: <20230126011854.198243-9-irogers@google.com> (raw)
In-Reply-To: <20230126011854.198243-1-irogers@google.com>
Combine into a single function to simplify, in a later change, writing
metrics separately.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/pmu-events/jevents.py | 36 +++++++++++++-------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
index 4cdbf34b7298..5f8d490c7269 100755
--- a/tools/perf/pmu-events/jevents.py
+++ b/tools/perf/pmu-events/jevents.py
@@ -19,10 +19,10 @@ _sys_event_tables = []
# JsonEvent. Architecture standard events are in json files in the top
# f'{_args.starting_dir}/{_args.arch}' directory.
_arch_std_events = {}
-# Track whether an events table is currently being defined and needs closing.
-_close_table = False
# Events to write out when the table is closed
_pending_events = []
+# Name of table to be written out
+_pending_events_tblname = None
# Global BigCString shared by all structures.
_bcs = None
# Order specific JsonEvent attributes will be visited.
@@ -378,24 +378,13 @@ def preprocess_arch_std_files(archpath: str) -> None:
_arch_std_events[event.metric_name.lower()] = event
-def print_events_table_prefix(tblname: str) -> None:
- """Called when a new events table is started."""
- global _close_table
- if _close_table:
- raise IOError('Printing table prefix but last table has no suffix')
- _args.output_file.write(f'static const struct compact_pmu_event {tblname}[] = {{\n')
- _close_table = True
-
-
def add_events_table_entries(item: os.DirEntry, topic: str) -> None:
"""Add contents of file to _pending_events table."""
- if not _close_table:
- raise IOError('Table entries missing prefix')
for e in read_json_events(item.path, topic):
_pending_events.append(e)
-def print_events_table_suffix() -> None:
+def print_pending_events() -> None:
"""Optionally close events table."""
def event_cmp_key(j: JsonEvent) -> Tuple[bool, str, str, str, str]:
@@ -407,17 +396,19 @@ def print_events_table_suffix() -> None:
return (j.desc is not None, fix_none(j.topic), fix_none(j.name), fix_none(j.pmu),
fix_none(j.metric_name))
- global _close_table
- if not _close_table:
+ global _pending_events
+ if not _pending_events:
return
- global _pending_events
+ global _pending_events_tblname
+ _args.output_file.write(
+ f'static const struct compact_pmu_event {_pending_events_tblname}[] = {{\n')
+
for event in sorted(_pending_events, key=event_cmp_key):
_args.output_file.write(event.to_c_string())
- _pending_events = []
+ _pending_events = []
_args.output_file.write('};\n\n')
- _close_table = False
def get_topic(topic: str) -> str:
if topic.endswith('metrics.json'):
@@ -455,12 +446,13 @@ def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
# model directory, reset topic
if item.is_dir() and is_leaf_dir(item.path):
- print_events_table_suffix()
+ print_pending_events()
tblname = file_name_to_table_name(parents, item.name)
if item.name == 'sys':
_sys_event_tables.append(tblname)
- print_events_table_prefix(tblname)
+ global _pending_events_tblname
+ _pending_events_tblname = tblname
return
# base dir or too deep
@@ -809,7 +801,7 @@ struct compact_pmu_event {
for arch in archs:
arch_path = f'{_args.starting_dir}/{arch}'
ftw(arch_path, [], process_one_file)
- print_events_table_suffix()
+ print_pending_events()
print_mapping_table(archs)
print_system_mapping_table()
--
2.39.1.456.gfc5497dd1b-goog
next prev parent reply other threads:[~2023-01-26 1:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 1:18 [PATCH v4 00/12] jevents/pmu-events improvements Ian Rogers
2023-01-26 1:18 ` [PATCH v4 01/12] perf jevents metric: Correct Function equality Ian Rogers
2023-01-26 1:18 ` [PATCH v4 02/12] perf jevents metric: Add ability to rewrite metrics in terms of others Ian Rogers
2023-01-26 15:59 ` John Garry
2023-01-26 19:10 ` Ian Rogers
2023-01-26 1:18 ` [PATCH v4 03/12] perf jevents: Rewrite metrics in the same file with each other Ian Rogers
2023-01-26 1:18 ` [PATCH v4 04/12] perf pmu-events: Add separate metric from pmu_event Ian Rogers
2023-01-26 1:18 ` [PATCH v4 05/12] perf pmu-events: Separate the metrics from events for no jevents Ian Rogers
2023-01-26 1:18 ` [PATCH v4 06/12] perf pmu-events: Remove now unused event and metric variables Ian Rogers
2023-01-26 1:18 ` [PATCH v4 07/12] perf stat: Remove evsel metric_name/expr Ian Rogers
2023-01-26 1:18 ` Ian Rogers [this message]
2023-01-26 1:18 ` [PATCH v4 09/12] perf pmu-events: Introduce pmu_metrics_table Ian Rogers
2023-01-26 1:18 ` [PATCH v4 10/12] perf jevents: Generate metrics and events as separate tables Ian Rogers
2023-01-26 1:18 ` [PATCH v4 11/12] perf jevents: Add model list option Ian Rogers
2023-01-26 13:44 ` John Garry
2023-01-26 14:20 ` Arnaldo Carvalho de Melo
2023-01-26 14:22 ` John Garry
2023-01-26 1:18 ` [PATCH v4 12/12] perf pmu-events: Fix testing with JEVENTS_ARCH=all 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=20230126011854.198243-9-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=caleb.biggers@intel.com \
--cc=eranian@google.com \
--cc=florian.fischer@muhq.space \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kim.phillips@amd.com \
--cc=kjain@linux.ibm.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=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=perry.taylor@intel.com \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=renyu.zj@linux.alibaba.com \
--cc=robh@kernel.org \
--cc=sandipan.das@amd.com \
--cc=tegongkang@gmail.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).