perf test stat: Avoid hybrid assumption when virtualized
Ian Rogers
reviewerPATCH 1/1 perf test stat: Avoid hybrid assumption when virtualized
The cycles event will fallback to task-clock in the hybrid test when running virtualized. Change the test to not fail for this.
--- tools/perf/tests/shell/stat.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/tests/shell/stat.sh +7 -3
@@ -165,9 +165,13 @@ test_hybrid() { if [ "$pmus" -ne "$cycles_events" ] then - echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" - err=1 - return + # If virtualized the software task-clock event will be used. + if ! perf stat -- true 2>&1 | grep -q "task-clock" + then + echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" + err=1 + return + fi fi echo "hybrid test [Success]" }
Signature · 1 line
2.47.1.613.gc27f4b7a9f-goog
James Clark
reviewerQuoted 20 lines · Ian Rogers
The cycles event will fallback to task-clock in the hybrid test when running virtualized. Change the test to not fail for this.
Fixes a6b8bb2addd0 ("perf test: Add a test for default perf stat command")Signed-off-by Ian Rogers <[email protected]>--- tools/perf/tests/shell/stat.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)tools/perf/tests/shell/stat.sh +0
-3@@ -165,9 +165,13 @@ test_hybrid() { if [ "$pmus" -ne "$cycles_events" ] then - echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" - err=1 - return
tools/perf/tests/shell/stat.sh test_hybrid() { · line 177
Quoted 10 lines
tools/perf/tests/shell/stat.sh +7
-0+ # If virtualized the software task-clock event will be used. + if ! perf stat -- true 2>&1 | grep -q "task-clock" + then + echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" + err=1 + return + fi fi echo "hybrid test [Success]" }
Hi Ian,
Isn't the distinction between task-clock and cpu-clock whether the event is per-cpu or not?
$ perf stat -C 1 -- true 2>&1 | grep cpu-clock
1.49 msec cpu-clock # 0.917 CPUs utilized$ perf stat -- true 2>&1 | grep task-clock
0.30 msec task-clock # 0.366 CPUs utilizedThe test uses per-task mode so this change makes it always pass, even when the number of cycles events doesn't match the PMUs.
Thanks
James
Ian Rogers
reviewerQuoted 38 lines · James Clark
Quoted 20 lines · Ian Rogers
The cycles event will fallback to task-clock in the hybrid test when running virtualized. Change the test to not fail for this.
Fixes a6b8bb2addd0 ("perf test: Add a test for default perf stat command")Signed-off-by Ian Rogers <[email protected]>--- tools/perf/tests/shell/stat.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)tools/perf/tests/shell/stat.sh +0
-3@@ -165,9 +165,13 @@ test_hybrid() { if [ "$pmus" -ne "$cycles_events" ] then - echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" - err=1 - returntools/perf/tests/shell/stat.sh test_hybrid() { · line 177
Quoted 10 lines
tools/perf/tests/shell/stat.sh +7
-0+ # If virtualized the software task-clock event will be used. + if ! perf stat -- true 2>&1 | grep -q "task-clock" + then + echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" + err=1 + return + fi fi echo "hybrid test [Success]" }Hi Ian,
Isn't the distinction between task-clock and cpu-clock whether the event is per-cpu or not?
Quoted 8 lines
$ perf stat -C 1 -- true 2>&1 | grep cpu-clock 1.49 msec cpu-clock # 0.917 CPUs utilized$ perf stat -- true 2>&1 | grep task-clock 0.30 msec task-clock # 0.366 CPUs utilizedThe test uses per-task mode so this change makes it always pass, even when the number of cycles events doesn't match the PMUs.
So I'm confused by the test, but it has caused a passing test to be broken for me when I run virtualized. The test is checking a cycles event is opened on each hybrid PMU, but this is conflated with checking perf stat's "default" output. The cycles event will fall back to task-clock in per-task mode but we also open a task-clock in default mode. Should:
``` if [ "$pmus" -ne "$cycles_events" ] ``` be something like this then: ``` # The expectation is that default output will have a cycles events on each hybrid # PMU, but in situations with no cycles PMU events, like virtualized,this can fall # back to task-clock and so the end count may be 0. Fail if neither condition holds. if [ "$pmus" -ne "$cycles_events" ] && [ "$pmus" -ne "0" ] ```
Thanks,
Ian
James Clark
reviewerQuoted 63 lines · Ian Rogers
Quoted 38 lines · James Clark
Quoted 20 lines · Ian Rogers
The cycles event will fallback to task-clock in the hybrid test when running virtualized. Change the test to not fail for this.
Fixes a6b8bb2addd0 ("perf test: Add a test for default perf stat command")Signed-off-by Ian Rogers <[email protected]>--- tools/perf/tests/shell/stat.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)tools/perf/tests/shell/stat.sh +0
-3@@ -165,9 +165,13 @@ test_hybrid() { if [ "$pmus" -ne "$cycles_events" ] then - echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" - err=1 - returntools/perf/tests/shell/stat.sh test_hybrid() { · line 177
Quoted 10 lines
tools/perf/tests/shell/stat.sh +7
-0+ # If virtualized the software task-clock event will be used. + if ! perf stat -- true 2>&1 | grep -q "task-clock" + then + echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" + err=1 + return + fi fi echo "hybrid test [Success]" }Hi Ian,
Isn't the distinction between task-clock and cpu-clock whether the event is per-cpu or not?
Quoted 8 lines
$ perf stat -C 1 -- true 2>&1 | grep cpu-clock 1.49 msec cpu-clock # 0.917 CPUs utilized$ perf stat -- true 2>&1 | grep task-clock 0.30 msec task-clock # 0.366 CPUs utilizedThe test uses per-task mode so this change makes it always pass, even when the number of cycles events doesn't match the PMUs.
So I'm confused by the test, but it has caused a passing test to be broken for me when I run virtualized. The test is checking a cycles event is opened on each hybrid PMU, but this is conflated with checking perf stat's "default" output. The cycles event will fall back to task-clock in per-task mode but we also open a task-clock in default mode. Should:
``` if [ "$pmus" -ne "$cycles_events" ] ```be something like this then:
```
# The expectation is that default output will have a cycles events on each hybrid
# PMU, but in situations with no cycles PMU events, like virtualized,this can fall
Quoted 3 lines
# back to task-clock and so the end count may be 0. Fail if neither condition holds. if [ "$pmus" -ne "$cycles_events" ] && [ "$pmus" -ne "0" ]
Yes it might make sense to skip this part if pmus == 0 then. Namhyung suggested to always assume 1 PMU to cover platforms that don't publish any PMU with the cpus file, but I suppose that breaks in this case.
If you still add the fallback check for task-clock it covers hybrid, 1 PMU and virtualized and we could even rename the test to test_default_stat_2.
Quoted 4 lines
```
Thanks,
Ian