cbc917a1b0
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffd ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
90 lines
2 KiB
Bash
Executable file
90 lines
2 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
|
|
|
|
# shellcheck source=lib/stat_output.sh
|
|
. "$(dirname $0)"/lib/stat_output.sh
|
|
|
|
csv_sep=@
|
|
|
|
stat_output=$(mktemp /tmp/__perf_test.stat_output.csv.XXXXX)
|
|
|
|
cleanup() {
|
|
rm -f "${stat_output}"
|
|
|
|
trap - EXIT TERM INT
|
|
}
|
|
|
|
trap_cleanup() {
|
|
cleanup
|
|
exit 1
|
|
}
|
|
trap trap_cleanup EXIT TERM INT
|
|
|
|
function commachecker()
|
|
{
|
|
local -i cnt=0
|
|
local 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-7]$'
|
|
;; "--per-core") exp=8
|
|
;; "--per-socket") exp=8
|
|
;; "--per-node") exp=8
|
|
;; "--per-die") exp=8
|
|
;; "--per-cluster") exp=8
|
|
;; "--per-cache") exp=8
|
|
esac
|
|
|
|
while read line
|
|
do
|
|
# Ignore initial "started on" comment.
|
|
x=${line:0:1}
|
|
[ "$x" = "#" ] && continue
|
|
# Ignore initial blank line.
|
|
[ "$line" = "" ] && continue
|
|
|
|
# Count the number of commas
|
|
x=$(echo $line | tr -d -c $csv_sep)
|
|
cnt="${#x}"
|
|
# echo $line $cnt
|
|
[[ ! "$cnt" =~ $exp ]] && {
|
|
echo "wrong number of fields. expected $exp in $line" 1>&2
|
|
exit 1;
|
|
}
|
|
done < "${stat_output}"
|
|
return 0
|
|
}
|
|
|
|
perf_cmd="-x$csv_sep -o ${stat_output}"
|
|
|
|
skip_test=$(check_for_topology)
|
|
check_no_args "CSV" "$perf_cmd"
|
|
check_system_wide "CSV" "$perf_cmd"
|
|
check_interval "CSV" "$perf_cmd"
|
|
check_event "CSV" "$perf_cmd"
|
|
check_per_thread "CSV" "$perf_cmd"
|
|
check_per_node "CSV" "$perf_cmd"
|
|
if [ $skip_test -ne 1 ]
|
|
then
|
|
check_system_wide_no_aggr "CSV" "$perf_cmd"
|
|
check_per_core "CSV" "$perf_cmd"
|
|
check_per_cache_instance "CSV" "$perf_cmd"
|
|
check_per_cluster "CSV" "$perf_cmd"
|
|
check_per_die "CSV" "$perf_cmd"
|
|
check_per_socket "CSV" "$perf_cmd"
|
|
else
|
|
echo "[Skip] Skipping tests for system_wide_no_aggr, per_core, per_die and per_socket since socket id exposed via topology is invalid"
|
|
fi
|
|
cleanup
|
|
exit 0
|