Commit 9f587cc9 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf jevents: Combine table prefix and suffix writing 



Combine into a single function to simplify, in a later change, writing
metrics separately.

Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20230126233645.200509-9-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6f8f98ab

tools/perf/pmu-events/jevents.py

+14 −22
Original line number Diff line number Diff line
@@ -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 = []



  _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()