MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-13 04:39:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf test: Make test_arm_callgraph_fp.sh more robust

Browse Source 
[ Upstream commit ff16aeb9b8 ]

The 2 second sleep can cause the test to fail on very slow network file
systems because Perf ends up being killed before it finishes starting
up.

Fix it by making the leafloop workload end after a fixed time like the
other workloads so there is no need to kill it after 2 seconds.

Also remove the 1 second start sampling delay because it is similarly
fragile. Instead, search through all samples for a matching one, rather
than just checking the first sample and hoping it's in the right place.

Fixes: cd6382d827 ("perf test arm64: Test unwinding using fame-pointer (fp) mode")
Signed-off-by: James Clark <james.clark@arm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: German Gomez <german.gomez@arm.com>
Cc: Spoorthy S <spoorts2@in.ibm.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240612140316.3006660-1-james.clark@arm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
James Clark 2024-06-12 15:03:14 +01:00 committed by Greg Kroah-Hartman
parent 98c14a4d37
commit fa423fe6d9
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/perf/tests/shell/test_arm_callgraph_fp.sh
View File

@ -14,28 +14,21 @@ cleanup_files()
trap cleanup_files EXIT TERM INT trap cleanup_files EXIT TERM INT
# Add a 1 second delay to skip samples that are not in the leaf() function
# shellcheck disable=SC2086 # shellcheck disable=SC2086
perf record -o "$PERF_DATA" --call-graph fp -e cycles//u -D 1000 --user-callchains -- $TEST_PROGRAM 2> /dev/null & perf record -o "$PERF_DATA" --call-graph fp -e cycles//u --user-callchains -- $TEST_PROGRAM
PID=$!
echo " + Recording (PID=$PID)..." # Try opening the file so any immediate errors are visible in the log
sleep 2 perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4
echo " + Stopping perf-record..."
kill $PID # expected perf-script output if 'leaf' has been inserted correctly:
wait $PID
# expected perf-script output:
# #
# program # perf
# 728 leaf # 728 leaf
# 753 parent # 753 parent
# 76c leafloop # 76c leafloop
# ... # ... remaining stack to main() ...
perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4 # Each frame is separated by a tab, some spaces and an address
perf script -i "$PERF_DATA" -F comm,ip,sym | head -n4 | \ SEP="[[:space:]]+ [[:xdigit:]]+"
awk '{ if ($2 != "") sym[i++] = $2 } END { if (sym[0] != "leaf" || perf script -i "$PERF_DATA" -F comm,ip,sym | tr '\n' ' ' | \
sym[1] != "parent" || grep -E -q "perf $SEP leaf $SEP parent $SEP leafloop"
sym[2] != "leafloop") exit 1 }'

20
tools/perf/tests/workloads/leafloop.c
View File

@ -1,6 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <unistd.h>
#include "../tests.h" #include "../tests.h"
/* We want to check these symbols in perf script */ /* We want to check these symbols in perf script */
@ -8,10 +10,16 @@ noinline void leaf(volatile int b);
noinline void parent(volatile int b); noinline void parent(volatile int b);
static volatile int a; static volatile int a;
static volatile sig_atomic_t done;
static void sighandler(int sig __maybe_unused)
{
done = 1;
}
noinline void leaf(volatile int b) noinline void leaf(volatile int b)
{ {
for (;;) while (!done)
a += b; a += b;
} }
@ -22,12 +30,16 @@ noinline void parent(volatile int b)
static int leafloop(int argc, const char **argv) static int leafloop(int argc, const char **argv)
{ {
int c = 1; int sec = 1;
if (argc > 0) if (argc > 0)
c = atoi(argv[0]); sec = atoi(argv[0]);
parent(c); signal(SIGINT, sighandler);
signal(SIGALRM, sighandler);
alarm(sec);
parent(sec);
return 0; return 0;
} }