Commit 18b687d7 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo

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

There may be multiplexing triggered, e.g., e-core of ADL.
Reviewed-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarKan 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.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b0a9e8f8
...@@ -66,10 +66,10 @@ def check_json_output(expected_items): ...@@ -66,10 +66,10 @@ def check_json_output(expected_items):
for item in json.loads(input): for item in json.loads(input):
if expected_items != -1: if expected_items != -1:
count = len(item) count = len(item)
if count != expected_items and count >= 1 and count <= 4 and 'metric-value' in item: if count != expected_items and count >= 1 and count <= 6 and 'metric-value' in item:
# Events that generate >1 metric may have isolated metric # Events that generate >1 metric may have isolated metric
# values and possibly other prefixes like interval, core and # values and possibly other prefixes like interval, core,
# aggregate-number. # aggregate-number, or event-runtime/pcnt-running from multiplexing.
pass pass
elif count != expected_items and count >= 1 and count <= 5 and 'metricgroup' in item: elif count != expected_items and count >= 1 and count <= 5 and 'metricgroup' in item:
pass pass
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment