[PATCH v5 08/15] perf jevents: Combine table prefix and suffix writing

Ian Rogers
2023-01-26T23:38:35Z

Combine into a single function to simplify, in a later change, writing
metrics separately.
---
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