[v2] New metricgroup output in perf stat default mode

[PATCH V2 6/8] pert tests: Update metric-value for perf stat JSON output

Posted by kan.liang@linux.intel.com 2 years, 7 months ago

From: Kan Liang <kan.liang@linux.intel.com>

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

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
 tools/perf/tests/shell/lib/perf_json_output_lint.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py
index 5e9bd68c83fe..ea55d5ea1ced 100644
--- a/tools/perf/tests/shell/lib/perf_json_output_lint.py
+++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py
@@ -66,10 +66,10 @@ def check_json_output(expected_items):
   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:
+      if count != expected_items and count >= 1 and count <= 6 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.
+        # values and possibly other prefixes like interval, core,
+        # aggregate-number, or event-runtime/pcnt-running from multiplexing.
         pass
       elif count != expected_items and count >= 1 and count <= 5 and 'metricgroup' in item:
         pass
-- 
2.35.1

Re: [PATCH V2 6/8] pert tests: Update metric-value for perf stat JSON output

Posted by Ian Rogers 2 years, 7 months ago

On Wed, Jun 14, 2023 at 5:18 PM <kan.liang@linux.intel.com> wrote:
>
> From: Kan Liang <kan.liang@linux.intel.com>
>
> There may be multiplexing triggered, e.g., e-core of ADL.
>
> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  tools/perf/tests/shell/lib/perf_json_output_lint.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py
> index 5e9bd68c83fe..ea55d5ea1ced 100644
> --- a/tools/perf/tests/shell/lib/perf_json_output_lint.py
> +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py
> @@ -66,10 +66,10 @@ def check_json_output(expected_items):
>    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:
> +      if count != expected_items and count >= 1 and count <= 6 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.
> +        # values and possibly other prefixes like interval, core,
> +        # aggregate-number, or event-runtime/pcnt-running from multiplexing.
>          pass
>        elif count != expected_items and count >= 1 and count <= 5 and 'metricgroup' in item:
>          pass
> --
> 2.35.1
>