mirror of
https://github.com/torvalds/linux.git
synced 2026-11-10 17:11:02 +01:00
perf test: Fix hybrid testing of event fallback test
The mem-loads-aux event exists on hybrid systems but the "cpu" PMU
does not. This causes an event parsing error which erroneously makes
the test look like it is failing. Avoid naming the PMU to avoid
this. Rather than cleaning up perf.data in the directory the test is
run, explicitly send the 'perf record' output to /dev/null and avoid
any cleanup scripts.
Fixes: fc9c17b223 ("perf test: Add a perf event fallback test")
Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
parent
441863ae3d
commit
44f6b44027
|
|
@ -6,24 +6,9 @@ skip_cnt=0
|
|||
ok_cnt=0
|
||||
err_cnt=0
|
||||
|
||||
cleanup()
|
||||
{
|
||||
rm -f perf.data
|
||||
rm -f perf.data.old
|
||||
trap - EXIT TERM INT
|
||||
}
|
||||
|
||||
trap_cleanup()
|
||||
{
|
||||
cleanup
|
||||
exit 1
|
||||
}
|
||||
|
||||
trap trap_cleanup EXIT TERM INT
|
||||
|
||||
perf_record()
|
||||
{
|
||||
perf record "$@" -- true 1>/dev/null 2>&1
|
||||
perf record -o /dev/null "$@" -- true 1>/dev/null 2>&1
|
||||
}
|
||||
|
||||
test_decrease_precise_ip()
|
||||
|
|
@ -49,7 +34,7 @@ test_decrease_precise_ip_complicated()
|
|||
|
||||
perf list pmu | grep -q 'mem-loads-aux' || return 2
|
||||
|
||||
if ! perf_record -e '{cpu/mem-loads-aux/S,cpu/mem-loads/PS}'; then
|
||||
if ! perf_record -e '{mem-loads-aux:S,mem-loads:PS}'; then
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user