perf test -F 83 ("perf stat CSV output linter") fails on s390. Reason is the wrong number of fields for certain CPU core/die/socket related output. On x84_64 the output of command: # ./perf stat -x, -A -a --no-merge true CPU0,1.50,msec,cpu-clock,1502781,100.00,1.052,CPUs utilized CPU1,1.48,msec,cpu-clock,1476113,100.00,1.034,CPUs utilized ... results in 8 fields with 7 comma separators. On s390 the output of command: # ./perf stat -x, -A -a --no-merge -- true 0.95,msec,cpu-clock,949800,100.00,1.060,CPUs utilized ... results in 7 fields with 6 comma separators. Therefore this tests fails on s390. Similar issues exist for per-die and per-socket output which is not supported on s390. I have rewritten the python program to count commas in each output line into a bash function to achieve the same result. I hope this makes it a bit easier. Output before: # ./perf test -F 83 83: perf stat CSV output linter : Checking CSV output: no args [Success] Checking CSV output: system wide [Success] Checking CSV output: system wide Checking CSV output: \ system wide no aggregation 6.92,msec,cpu-clock,\ 6918131,100.00,6.972,CPUs utilized ... RuntimeError: wrong number of fields. expected 7 in \ 6.92,msec,cpu-clock,6918131,100.00,6.972,CPUs utilized FAILED! # Output after: # ./perf test -F 83 83: perf stat CSV output linter : Checking CSV output: no args [Success] Checking CSV output: system wide [Success] Checking CSV output: system wide Checking CSV output:\ system wide no aggregation [Success] Checking CSV output: interval [Success] Checking CSV output: event [Success] Checking CSV output: per core [Success] Checking CSV output: per thread [Success] Checking CSV output: per die [Success] Checking CSV output: per node [Success] Checking CSV output: per socket [Success] Ok # Committer notes: Continues to work on x86_64 $ perf test lint 89: perf stat CSV output linter : Ok $ perf test -v lint Couldn't bump rlimit(MEMLOCK), failures may take place when creating BPF maps, etc 89: perf stat CSV output linter : --- start --- test child forked, pid 53133 Checking CSV output: no args [Success] Checking CSV output: system wide [Skip] paranoid and not root Checking CSV output: system wide [Skip] paranoid and not root Checking CSV output: interval [Success] Checking CSV output: event [Success] Checking CSV output: per core [Skip] paranoid and not root Checking CSV output: per thread [Skip] paranoid and not root Checking CSV output: per die [Skip] paranoid and not root Checking CSV output: per node [Skip] paranoid and not root Checking CSV output: per socket [Skip] paranoid and not root test child finished with 0 ---- end ---- perf stat CSV output linter: Ok $ Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> Acked-by: Ian Rogers <irogers@google.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Claire Jensen <cjense@google.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: linux390-list@tuxmaker.boeblingen.de.ibm.com Link: https://lore.kernel.org/r/20220603113034.2009728-1-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
168 lines
3.3 KiB
Bash
Executable file
168 lines
3.3 KiB
Bash
Executable file
#!/bin/bash
|
|
# perf stat CSV output linter
|
|
# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
|
|
# Tests various perf stat CSV output commands for the
|
|
# correct number of fields and the CSV separator set to ','.
|
|
|
|
set -e
|
|
|
|
function commachecker()
|
|
{
|
|
local -i cnt=0 exp=0
|
|
|
|
case "$1"
|
|
in "--no-args") exp=6
|
|
;; "--system-wide") exp=6
|
|
;; "--event") exp=6
|
|
;; "--interval") exp=7
|
|
;; "--per-thread") exp=7
|
|
;; "--system-wide-no-aggr") exp=7
|
|
[ $(uname -m) = "s390x" ] && exp=6
|
|
;; "--per-core") exp=8
|
|
;; "--per-socket") exp=8
|
|
;; "--per-node") exp=8
|
|
;; "--per-die") exp=8
|
|
esac
|
|
|
|
while read line
|
|
do
|
|
# Check for lines beginning with Failed
|
|
x=${line:0:6}
|
|
[ "$x" = "Failed" ] && continue
|
|
|
|
# Count the number of commas
|
|
x=$(echo $line | tr -d -c ',')
|
|
cnt="${#x}"
|
|
# echo $line $cnt
|
|
[ "$cnt" -ne "$exp" ] && {
|
|
echo "wrong number of fields. expected $exp in $line" 1>&2
|
|
exit 1;
|
|
}
|
|
done
|
|
return 0
|
|
}
|
|
|
|
# Return true if perf_event_paranoid is > $1 and not running as root.
|
|
function ParanoidAndNotRoot()
|
|
{
|
|
[ $(id -u) != 0 ] && [ $(cat /proc/sys/kernel/perf_event_paranoid) -gt $1 ]
|
|
}
|
|
|
|
check_no_args()
|
|
{
|
|
echo -n "Checking CSV output: no args "
|
|
perf stat -x, true 2>&1 | commachecker --no-args
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_system_wide()
|
|
{
|
|
echo -n "Checking CSV output: system wide "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
perf stat -x, -a true 2>&1 | commachecker --system-wide
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_system_wide_no_aggr()
|
|
{
|
|
echo -n "Checking CSV output: system wide "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
echo -n "Checking CSV output: system wide no aggregation "
|
|
perf stat -x, -A -a --no-merge true 2>&1 | commachecker --system-wide-no-aggr
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_interval()
|
|
{
|
|
echo -n "Checking CSV output: interval "
|
|
perf stat -x, -I 1000 true 2>&1 | commachecker --interval
|
|
echo "[Success]"
|
|
}
|
|
|
|
|
|
check_event()
|
|
{
|
|
echo -n "Checking CSV output: event "
|
|
perf stat -x, -e cpu-clock true 2>&1 | commachecker --event
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_per_core()
|
|
{
|
|
echo -n "Checking CSV output: per core "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
perf stat -x, --per-core -a true 2>&1 | commachecker --per-core
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_per_thread()
|
|
{
|
|
echo -n "Checking CSV output: per thread "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
perf stat -x, --per-thread -a true 2>&1 | commachecker --per-thread
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_per_die()
|
|
{
|
|
echo -n "Checking CSV output: per die "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
perf stat -x, --per-die -a true 2>&1 | commachecker --per-die
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_per_node()
|
|
{
|
|
echo -n "Checking CSV output: per node "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
perf stat -x, --per-node -a true 2>&1 | commachecker --per-node
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_per_socket()
|
|
{
|
|
echo -n "Checking CSV output: per socket "
|
|
if ParanoidAndNotRoot 0
|
|
then
|
|
echo "[Skip] paranoid and not root"
|
|
return
|
|
fi
|
|
perf stat -x, --per-socket -a true 2>&1 | commachecker --per-socket
|
|
echo "[Success]"
|
|
}
|
|
|
|
check_no_args
|
|
check_system_wide
|
|
check_system_wide_no_aggr
|
|
check_interval
|
|
check_event
|
|
check_per_core
|
|
check_per_thread
|
|
check_per_die
|
|
check_per_node
|
|
check_per_socket
|
|
exit 0
|