[PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output

[PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output

[James Clark]

Commit c4b41b83c250 ("perf stat: Rename "aggregate-number" to
"cpu-count" in JSON") renamed a field, so update the tests to reflect
this.

This fixes the following failure:

  $ sudo ./perf test "json output" -vvv
   96: perf stat JSON output linter                                    :
  --- start ---
  test child forked, pid 327720
  Checking json output: no args [Success]
  Checking json output: system wide [Success]
  Checking json output: interval [Success]
  Checking json output: event [Success]
  Checking json output: per thread [Success]
  Checking json output: per node Test failed for input:
  ...
  Traceback (most recent call last):
    File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 93, in <module>
      check_json_output(expected_items)
    File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 78, in check_json_output
      raise RuntimeError(f'Unexpected key: key={key} value={value}')
  RuntimeError: Unexpected key: key=cpu-count value=16
  test child finished with -1
  ---- end ----
  perf stat JSON output linter: FAILED!

Fixes: c4b41b83c250 ("perf stat: Rename "aggregate-number" to "cpu-count" in JSON")
Signed-off-by: James Clark <james.clark@arm.com>
---
 tools/perf/tests/shell/lib/perf_json_output_lint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d90f8d102eb9..9c073e257d33 100644
--- a/tools/perf/tests/shell/lib/perf_json_output_lint.py
+++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py
@@ -54,7 +54,7 @@ def check_json_output(expected_items):
           raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}'
                              f' in \'{line}\'')
   checks = {
-      'aggregate-number': lambda x: isfloat(x),
+      'cpu-count': lambda x: isfloat(x),
       'core': lambda x: True,
       'counter-value': lambda x: is_counter_value(x),
       'cgroup': lambda x: True,
-- 
2.25.1

[PATCH 2/2] perf stat: Fix invalid output handle

[James Clark]

In this context, 'os' is already a pointer so the extra dereference
isn't required. This fixes the following test failure on aarch64:

  $ ./perf test "json output" -vvv
  92: perf stat JSON output linter                                    :
  --- start ---
  Checking json output: no args Test failed for input:
  ...
  Fatal error: glibc detected an invalid stdio handle
  ---- end ----
  perf stat JSON output linter: FAILED!

Fixes: e7f4da312259 ("perf stat: Pass struct outstate to printout()")
Signed-off-by: James Clark <james.clark@arm.com>
---
 tools/perf/util/stat-display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 847acdb5dc40..eac5ac3a734c 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -741,7 +741,7 @@ static void printout(struct perf_stat_config *config, struct outstate *os,
 		perf_stat__print_shadow_stats(config, counter, uval, map_idx,
 					      &out, &config->metric_events, &rt_stat);
 	} else {
-		pm(config, &os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
+		pm(config, os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
 	}
 
 	if (!config->metric_only) {
-- 
2.25.1

Re: [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output

[Ian Rogers]

On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
>
> Commit c4b41b83c250 ("perf stat: Rename "aggregate-number" to
> "cpu-count" in JSON") renamed a field, so update the tests to reflect
> this.
>
> This fixes the following failure:
>
>   $ sudo ./perf test "json output" -vvv
>    96: perf stat JSON output linter                                    :
>   --- start ---
>   test child forked, pid 327720
>   Checking json output: no args [Success]
>   Checking json output: system wide [Success]
>   Checking json output: interval [Success]
>   Checking json output: event [Success]
>   Checking json output: per thread [Success]
>   Checking json output: per node Test failed for input:
>   ...
>   Traceback (most recent call last):
>     File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 93, in <module>
>       check_json_output(expected_items)
>     File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 78, in check_json_output
>       raise RuntimeError(f'Unexpected key: key={key} value={value}')
>   RuntimeError: Unexpected key: key=cpu-count value=16
>   test child finished with -1
>   ---- end ----
>   perf stat JSON output linter: FAILED!
>
> Fixes: c4b41b83c250 ("perf stat: Rename "aggregate-number" to "cpu-count" in JSON")
> Signed-off-by: James Clark <james.clark@arm.com>

Namhyung mentioned reverting change c4b41b83c250, in which case
merging this would break the test again. I think the revert is better.

Thanks,
Ian

> ---
>  tools/perf/tests/shell/lib/perf_json_output_lint.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 d90f8d102eb9..9c073e257d33 100644
> --- a/tools/perf/tests/shell/lib/perf_json_output_lint.py
> +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py
> @@ -54,7 +54,7 @@ def check_json_output(expected_items):
>            raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}'
>                               f' in \'{line}\'')
>    checks = {
> -      'aggregate-number': lambda x: isfloat(x),
> +      'cpu-count': lambda x: isfloat(x),
>        'core': lambda x: True,
>        'counter-value': lambda x: is_counter_value(x),
>        'cgroup': lambda x: True,
> --
> 2.25.1
>

Re: [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output

[Namhyung Kim]

Hi,

On Wed, Nov 30, 2022 at 10:19 AM Ian Rogers <irogers@google.com> wrote:
>
> On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
> >
> > Commit c4b41b83c250 ("perf stat: Rename "aggregate-number" to
> > "cpu-count" in JSON") renamed a field, so update the tests to reflect
> > this.
> >
> > This fixes the following failure:
> >
> >   $ sudo ./perf test "json output" -vvv
> >    96: perf stat JSON output linter                                    :
> >   --- start ---
> >   test child forked, pid 327720
> >   Checking json output: no args [Success]
> >   Checking json output: system wide [Success]
> >   Checking json output: interval [Success]
> >   Checking json output: event [Success]
> >   Checking json output: per thread [Success]
> >   Checking json output: per node Test failed for input:
> >   ...
> >   Traceback (most recent call last):
> >     File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 93, in <module>
> >       check_json_output(expected_items)
> >     File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 78, in check_json_output
> >       raise RuntimeError(f'Unexpected key: key={key} value={value}')
> >   RuntimeError: Unexpected key: key=cpu-count value=16
> >   test child finished with -1
> >   ---- end ----
> >   perf stat JSON output linter: FAILED!
> >
> > Fixes: c4b41b83c250 ("perf stat: Rename "aggregate-number" to "cpu-count" in JSON")
> > Signed-off-by: James Clark <james.clark@arm.com>
>
> Namhyung mentioned reverting change c4b41b83c250, in which case
> merging this would break the test again. I think the revert is better.

Yep, I will send the revert soon.

Thanks,
Namhyung

Re: [PATCH 2/2] perf stat: Fix invalid output handle

[Namhyung Kim]

On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
>
> In this context, 'os' is already a pointer so the extra dereference
> isn't required. This fixes the following test failure on aarch64:
>
>   $ ./perf test "json output" -vvv
>   92: perf stat JSON output linter                                    :
>   --- start ---
>   Checking json output: no args Test failed for input:
>   ...
>   Fatal error: glibc detected an invalid stdio handle
>   ---- end ----
>   perf stat JSON output linter: FAILED!
>
> Fixes: e7f4da312259 ("perf stat: Pass struct outstate to printout()")
> Signed-off-by: James Clark <james.clark@arm.com>

Thanks for fixing this.  I'm not sure how I missed it.. :(

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  tools/perf/util/stat-display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> index 847acdb5dc40..eac5ac3a734c 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -741,7 +741,7 @@ static void printout(struct perf_stat_config *config, struct outstate *os,
>                 perf_stat__print_shadow_stats(config, counter, uval, map_idx,
>                                               &out, &config->metric_events, &rt_stat);
>         } else {
> -               pm(config, &os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
> +               pm(config, os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
>         }
>
>         if (!config->metric_only) {
> --
> 2.25.1
>

Re: [PATCH 2/2] perf stat: Fix invalid output handle

[James Clark]

On 30/11/2022 18:32, Namhyung Kim wrote:
> On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
>>
>> In this context, 'os' is already a pointer so the extra dereference
>> isn't required. This fixes the following test failure on aarch64:
>>
>>   $ ./perf test "json output" -vvv
>>   92: perf stat JSON output linter                                    :
>>   --- start ---
>>   Checking json output: no args Test failed for input:
>>   ...
>>   Fatal error: glibc detected an invalid stdio handle
>>   ---- end ----
>>   perf stat JSON output linter: FAILED!
>>
>> Fixes: e7f4da312259 ("perf stat: Pass struct outstate to printout()")
>> Signed-off-by: James Clark <james.clark@arm.com>
> 
> Thanks for fixing this.  I'm not sure how I missed it.. :(
> 

It seems to only go down that path on some configuration. At least on
x86 the test was passing fine for me.

> Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks for the review!

> 
> Thanks,
> Namhyung
> 
> 
>> ---
>>  tools/perf/util/stat-display.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
>> index 847acdb5dc40..eac5ac3a734c 100644
>> --- a/tools/perf/util/stat-display.c
>> +++ b/tools/perf/util/stat-display.c
>> @@ -741,7 +741,7 @@ static void printout(struct perf_stat_config *config, struct outstate *os,
>>                 perf_stat__print_shadow_stats(config, counter, uval, map_idx,
>>                                               &out, &config->metric_events, &rt_stat);
>>         } else {
>> -               pm(config, &os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
>> +               pm(config, os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
>>         }
>>
>>         if (!config->metric_only) {
>> --
>> 2.25.1
>>

Re: [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output

[Arnaldo Carvalho de Melo]

Em Wed, Nov 30, 2022 at 10:18:49AM -0800, Ian Rogers escreveu:
> On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
> >
> > Commit c4b41b83c250 ("perf stat: Rename "aggregate-number" to
> > "cpu-count" in JSON") renamed a field, so update the tests to reflect
> > this.
> >
> > This fixes the following failure:
> >
> >   $ sudo ./perf test "json output" -vvv
> >    96: perf stat JSON output linter                                    :
> >   --- start ---
> >   test child forked, pid 327720
> >   Checking json output: no args [Success]
> >   Checking json output: system wide [Success]
> >   Checking json output: interval [Success]
> >   Checking json output: event [Success]
> >   Checking json output: per thread [Success]
> >   Checking json output: per node Test failed for input:
> >   ...
> >   Traceback (most recent call last):
> >     File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 93, in <module>
> >       check_json_output(expected_items)
> >     File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 78, in check_json_output
> >       raise RuntimeError(f'Unexpected key: key={key} value={value}')
> >   RuntimeError: Unexpected key: key=cpu-count value=16
> >   test child finished with -1
> >   ---- end ----
> >   perf stat JSON output linter: FAILED!
> >
> > Fixes: c4b41b83c250 ("perf stat: Rename "aggregate-number" to "cpu-count" in JSON")
> > Signed-off-by: James Clark <james.clark@arm.com>
> 
> Namhyung mentioned reverting change c4b41b83c250, in which case
> merging this would break the test again. I think the revert is better.

Applied the revert, with an Acked-by: you.
 
> Thanks,
> Ian
> 
> > ---
> >  tools/perf/tests/shell/lib/perf_json_output_lint.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > 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 d90f8d102eb9..9c073e257d33 100644
> > --- a/tools/perf/tests/shell/lib/perf_json_output_lint.py
> > +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py
> > @@ -54,7 +54,7 @@ def check_json_output(expected_items):
> >            raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}'
> >                               f' in \'{line}\'')
> >    checks = {
> > -      'aggregate-number': lambda x: isfloat(x),
> > +      'cpu-count': lambda x: isfloat(x),
> >        'core': lambda x: True,
> >        'counter-value': lambda x: is_counter_value(x),
> >        'cgroup': lambda x: True,
> > --
> > 2.25.1
> >

-- 

- Arnaldo

Re: [PATCH 2/2] perf stat: Fix invalid output handle

[Athira Rajeev]

> On 01-Dec-2022, at 3:36 PM, James Clark <james.clark@arm.com> wrote:
> 
> 
> 
> On 30/11/2022 18:32, Namhyung Kim wrote:
>> On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
>>> 
>>> In this context, 'os' is already a pointer so the extra dereference
>>> isn't required. This fixes the following test failure on aarch64:
>>> 
>>>  $ ./perf test "json output" -vvv
>>>  92: perf stat JSON output linter                                    :
>>>  --- start ---
>>>  Checking json output: no args Test failed for input:
>>>  ...
>>>  Fatal error: glibc detected an invalid stdio handle
>>>  ---- end ----
>>>  perf stat JSON output linter: FAILED!
>>> 
>>> Fixes: e7f4da312259 ("perf stat: Pass struct outstate to printout()")
>>> Signed-off-by: James Clark <james.clark@arm.com>
>> 
>> Thanks for fixing this.  I'm not sure how I missed it.. :(
>> 
> 
> It seems to only go down that path on some configuration. At least on
> x86 the test was passing fine for me.
> 
>> Acked-by: Namhyung Kim <namhyung@kernel.org>
> 
> Thanks for the review!

Faced same issue on powerpc. Tested with this change and it works with this patch.

Tested-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>

Thanks
Athira
> 
>> 
>> Thanks,
>> Namhyung
>> 
>> 
>>> ---
>>> tools/perf/util/stat-display.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>> 
>>> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
>>> index 847acdb5dc40..eac5ac3a734c 100644
>>> --- a/tools/perf/util/stat-display.c
>>> +++ b/tools/perf/util/stat-display.c
>>> @@ -741,7 +741,7 @@ static void printout(struct perf_stat_config *config, struct outstate *os,
>>>                perf_stat__print_shadow_stats(config, counter, uval, map_idx,
>>>                                              &out, &config->metric_events, &rt_stat);
>>>        } else {
>>> -               pm(config, &os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
>>> +               pm(config, os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);
>>>        }
>>> 
>>>        if (!config->metric_only) {
>>> --
>>> 2.25.1

Re: [PATCH 2/2] perf stat: Fix invalid output handle

[Arnaldo Carvalho de Melo]

Em Sun, Dec 04, 2022 at 10:38:28PM +0530, Athira Rajeev escreveu:
> 
> 
> > On 01-Dec-2022, at 3:36 PM, James Clark <james.clark@arm.com> wrote:
> > 
> > 
> > 
> > On 30/11/2022 18:32, Namhyung Kim wrote:
> >> On Wed, Nov 30, 2022 at 3:15 AM James Clark <james.clark@arm.com> wrote:
> >>> 
> >>> In this context, 'os' is already a pointer so the extra dereference
> >>> isn't required. This fixes the following test failure on aarch64:
> >>> 
> >>>  $ ./perf test "json output" -vvv
> >>>  92: perf stat JSON output linter                                    :
> >>>  --- start ---
> >>>  Checking json output: no args Test failed for input:
> >>>  ...
> >>>  Fatal error: glibc detected an invalid stdio handle
> >>>  ---- end ----
> >>>  perf stat JSON output linter: FAILED!
> >>> 
> >>> Fixes: e7f4da312259 ("perf stat: Pass struct outstate to printout()")
> >>> Signed-off-by: James Clark <james.clark@arm.com>
> >> 
> >> Thanks for fixing this.  I'm not sure how I missed it.. :(
> >> 
> > 
> > It seems to only go down that path on some configuration. At least on
> > x86 the test was passing fine for me.
> > 
> >> Acked-by: Namhyung Kim <namhyung@kernel.org>
> > 
> > Thanks for the review!
> 
> Faced same issue on powerpc. Tested with this change and it works with this patch.
> 
> Tested-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>

Thanks, applied.

- Arnaldo