Commit 3de34f85 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Avoid counting commas in json linter 



Commas may appear in events like:

  cpu/INT_MISC.RECOVERY_CYCLES,cmask=1,edge/

which causes the count of commas to see more items than expected. Switch
to counting the entries in the dictionary, which is 1 more than the
number of commas.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Claire Jensen <cjense@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lore.kernel.org/r/20230223071818.329671-2-irogers@google.com


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

tools/perf/tests/shell/lib/perf_json_output_lint.py

+13 −16
Original line number Diff line number Diff line
@@ -40,19 +40,6 @@ def is_counter_value(num): 
  return isfloat(num) or num == '<not counted>' or num == '<not supported>'



def check_json_output(expected_items):

  if expected_items != -1:

    for line in Lines:

      if 'failed' not in line:

        count = 0

        count = line.count(',')

        if count != expected_items and count >= 1 and count <= 3 and 'metric-value' in line:

          # Events that generate >1 metric may have isolated metric

          # values and possibly other prefixes like interval, core and

          # aggregate-number.

          continue

        if count != expected_items:

          raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}'

                             f' in \'{line}\'')

  checks = {

      'aggregate-number': lambda x: isfloat(x),

      'core': lambda x: True,
@@ -73,6 +60,16 @@ def check_json_output(expected_items): 
  }

  input = '[\n' + ','.join(Lines) + '\n]'

  for item in json.loads(input):

    if expected_items != -1:

      count = len(item)

      if count != expected_items and count >= 1 and count <= 4 and 'metric-value' in item:

        # Events that generate >1 metric may have isolated metric

        # values and possibly other prefixes like interval, core and

        # aggregate-number.

        pass

      elif count != expected_items:

        raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}'

                           f' in \'{item}\'')

    for key, value in item.items():

      if key not in checks:

        raise RuntimeError(f'Unexpected key: key={key} value={value}')
@@ -82,11 +79,11 @@ def check_json_output(expected_items): 


try:

  if args.no_args or args.system_wide or args.event:

    expected_items = 6

  elif args.interval or args.per_thread or args.system_wide_no_aggr:

    expected_items = 7

  elif args.per_core or args.per_socket or args.per_node or args.per_die:

  elif args.interval or args.per_thread or args.system_wide_no_aggr:

    expected_items = 8

  elif args.per_core or args.per_socket or args.per_node or args.per_die:

    expected_items = 9

  else:

    # If no option is specified, don't check the number of items.

    expected_items = -1