Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pert tests: Update metric-value for perf stat JSON output

There may be multiplexing triggered, e.g., e-core of ADL.

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ahmad Yasin <ahmad.yasin@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20230615135315.3662428-7-kan.liang@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Kan Liang and committed by
Arnaldo Carvalho de Melo
18b687d7 b0a9e8f8

+3 -3
+3 -3
tools/perf/tests/shell/lib/perf_json_output_lint.py
··· 66 66 for item in json.loads(input): 67 67 if expected_items != -1: 68 68 count = len(item) 69 - if count != expected_items and count >= 1 and count <= 4 and 'metric-value' in item: 69 + if count != expected_items and count >= 1 and count <= 6 and 'metric-value' in item: 70 70 # Events that generate >1 metric may have isolated metric 71 - # values and possibly other prefixes like interval, core and 72 - # aggregate-number. 71 + # values and possibly other prefixes like interval, core, 72 + # aggregate-number, or event-runtime/pcnt-running from multiplexing. 73 73 pass 74 74 elif count != expected_items and count >= 1 and count <= 5 and 'metricgroup' in item: 75 75 pass