mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-08 12:02:33 +02:00
[ Upstream commite272628902] On s390 'perf test's 'perf stat tests', subtest test_hybrid fails for z/VM systems. The root cause is this statement: $(perf stat -a -- sleep 0.1 2>&1 |\ grep -E "/cpu-cycles/[uH]*| cpu-cycles[:uH]* -c) The 'perf stat' output on a s390 z/VM system is # perf stat -a -- sleep 0.1 2>&1 Performance counter stats for 'system wide': 56 context-switches # 46.3 cs/sec cs_per_second 1,210.41 msec cpu-clock # 11.9 CPUs CPUs_utilized 12 cpu-migrations # 9.9 migrations/sec ... 81 page-faults # 66.9 faults/sec ... 0.100891009 seconds time elapsed The grep command does not match any single line and exits with error code 1. As the bash script is executed with 'set -e', it aborts with the first error code being non-zero. Fix this and use 'wc -l' to count matching lines instead of 'grep ... -c'. Output before: # perf test 102 102: perf stat tests : FAILED! # Output after: # perf test 102 102: perf stat tests : Ok # Fixes:bb6e7cb11d("perf tools: Add fallback for exclude_guest") Reviewed-by: Ian Rogers <irogers@google.com> Reviewed-by: James Clark <james.clark@linaro.org> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Jan Polensky <japo@linux.ibm.com> Cc: linux-s390@vger.kernel.org Cc: Namhyung Kim <namhyung@kernel.org> Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
186 lines
5.4 KiB
Bash
Executable File
186 lines
5.4 KiB
Bash
Executable File
#!/bin/sh
|
|
# perf stat tests
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
set -e
|
|
|
|
err=0
|
|
test_default_stat() {
|
|
echo "Basic stat command test"
|
|
if ! perf stat true 2>&1 | grep -E -q "Performance counter stats for 'true':"
|
|
then
|
|
echo "Basic stat command test [Failed]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "Basic stat command test [Success]"
|
|
}
|
|
|
|
test_stat_record_report() {
|
|
echo "stat record and report test"
|
|
if ! perf stat record -e task-clock -o - true | perf stat report -i - 2>&1 | \
|
|
grep -E -q "Performance counter stats for 'pipe':"
|
|
then
|
|
echo "stat record and report test [Failed]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "stat record and report test [Success]"
|
|
}
|
|
|
|
test_stat_record_script() {
|
|
echo "stat record and script test"
|
|
if ! perf stat record -e task-clock -o - true | perf script -i - 2>&1 | \
|
|
grep -E -q "CPU[[:space:]]+THREAD[[:space:]]+VAL[[:space:]]+ENA[[:space:]]+RUN[[:space:]]+TIME[[:space:]]+EVENT"
|
|
then
|
|
echo "stat record and script test [Failed]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "stat record and script test [Success]"
|
|
}
|
|
|
|
test_stat_repeat_weak_groups() {
|
|
echo "stat repeat weak groups test"
|
|
if ! perf stat -e '{cycles,cycles,cycles,cycles,cycles,cycles,cycles,cycles,cycles,cycles}' \
|
|
true 2>&1 | grep -q 'seconds time elapsed'
|
|
then
|
|
echo "stat repeat weak groups test [Skipped event parsing failed]"
|
|
return
|
|
fi
|
|
if ! perf stat -r2 -e '{cycles,cycles,cycles,cycles,cycles,cycles,cycles,cycles,cycles,cycles}:W' \
|
|
true > /dev/null 2>&1
|
|
then
|
|
echo "stat repeat weak groups test [Failed]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "stat repeat weak groups test [Success]"
|
|
}
|
|
|
|
test_topdown_groups() {
|
|
# Topdown events must be grouped with the slots event first. Test that
|
|
# parse-events reorders this.
|
|
echo "Topdown event group test"
|
|
if ! perf stat -e '{slots,topdown-retiring}' true > /dev/null 2>&1
|
|
then
|
|
echo "Topdown event group test [Skipped event parsing failed]"
|
|
return
|
|
fi
|
|
if perf stat -e '{slots,topdown-retiring}' true 2>&1 | grep -E -q "<not supported>"
|
|
then
|
|
echo "Topdown event group test [Failed events not supported]"
|
|
err=1
|
|
return
|
|
fi
|
|
if perf stat -e '{topdown-retiring,slots}' true 2>&1 | grep -E -q "<not supported>"
|
|
then
|
|
echo "Topdown event group test [Failed slots not reordered first]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "Topdown event group test [Success]"
|
|
}
|
|
|
|
test_topdown_weak_groups() {
|
|
# Weak groups break if the perf_event_open of multiple grouped events
|
|
# fails. Breaking a topdown group causes the events to fail. Test a very large
|
|
# grouping to see that the topdown events aren't broken out.
|
|
echo "Topdown weak groups test"
|
|
ok_grouping="{slots,topdown-bad-spec,topdown-be-bound,topdown-fe-bound,topdown-retiring},branch-instructions,branch-misses,bus-cycles,cache-misses,cache-references,cpu-cycles,instructions,mem-loads,mem-stores,ref-cycles,cache-misses,cache-references"
|
|
if ! perf stat --no-merge -e "$ok_grouping" true > /dev/null 2>&1
|
|
then
|
|
echo "Topdown weak groups test [Skipped event parsing failed]"
|
|
return
|
|
fi
|
|
group_needs_break="{slots,topdown-bad-spec,topdown-be-bound,topdown-fe-bound,topdown-retiring,branch-instructions,branch-misses,bus-cycles,cache-misses,cache-references,cpu-cycles,instructions,mem-loads,mem-stores,ref-cycles,cache-misses,cache-references}:W"
|
|
if perf stat --no-merge -e "$group_needs_break" true 2>&1 | grep -E -q "<not supported>"
|
|
then
|
|
echo "Topdown weak groups test [Failed events not supported]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "Topdown weak groups test [Success]"
|
|
}
|
|
|
|
test_cputype() {
|
|
# Test --cputype argument.
|
|
echo "cputype test"
|
|
|
|
# Bogus PMU should fail.
|
|
if perf stat --cputype="123" -e instructions true > /dev/null 2>&1
|
|
then
|
|
echo "cputype test [Bogus PMU didn't fail]"
|
|
err=1
|
|
return
|
|
fi
|
|
|
|
# Find a known PMU for cputype.
|
|
pmu=""
|
|
for i in cpu cpu_atom armv8_pmuv3_0
|
|
do
|
|
if test -d "/sys/devices/$i"
|
|
then
|
|
pmu="$i"
|
|
break
|
|
fi
|
|
if perf stat -e "$i/instructions/" true > /dev/null 2>&1
|
|
then
|
|
pmu="$i"
|
|
break
|
|
fi
|
|
done
|
|
if test "x$pmu" = "x"
|
|
then
|
|
echo "cputype test [Skipped known PMU not found]"
|
|
return
|
|
fi
|
|
|
|
# Test running with cputype produces output.
|
|
if ! perf stat --cputype="$pmu" -e instructions true 2>&1 | grep -E -q "instructions"
|
|
then
|
|
echo "cputype test [Failed count missed with given filter]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "cputype test [Success]"
|
|
}
|
|
|
|
test_hybrid() {
|
|
# Test the default stat command on hybrid devices opens one cycles event for
|
|
# each CPU type.
|
|
echo "hybrid test"
|
|
|
|
# Count the number of core PMUs, assume minimum of 1
|
|
pmus=$(ls /sys/bus/event_source/devices/*/cpus 2>/dev/null | wc -l)
|
|
if [ "$pmus" -lt 1 ]
|
|
then
|
|
pmus=1
|
|
fi
|
|
|
|
# Run default Perf stat
|
|
cycles_events=$(perf stat -a -- sleep 0.1 2>&1 | grep -E "/cpu-cycles/[uH]*| cpu-cycles[:uH]* " | wc -l)
|
|
|
|
# The expectation is that default output will have a cycles events on each
|
|
# hybrid PMU. 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" ] && [ "0" -ne "$cycles_events" ]
|
|
then
|
|
echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]"
|
|
err=1
|
|
return
|
|
fi
|
|
echo "hybrid test [Success]"
|
|
}
|
|
|
|
test_default_stat
|
|
test_stat_record_report
|
|
test_stat_record_script
|
|
test_stat_repeat_weak_groups
|
|
test_topdown_groups
|
|
test_topdown_weak_groups
|
|
test_cputype
|
|
test_hybrid
|
|
exit $err
|