mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-21 01:51:18 +00:00
Code Issues Releases Wiki Activity

pert tests: Add tests for new "perf stat --per-cache" aggregation option

Browse source 
Add tests for the new "--per-cache" option in 'perf stat' for CSV and
JSON generation as well as for the JSON linting.

Suggested-by: Gautham Shenoy <gautham.shenoy@amd.com>
Signed-off-by: K Prateek Nayak <kprateek.nayak@amd.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ananth Narayan <ananth.narayan@amd.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wen Pu <puwen@hygon.cn>
Link: https://lore.kernel.org/r/20230517172745.5833-6-kprateek.nayak@amd.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
K Prateek Nayak 2023-05-17 22:57:45 +05:30 committed by Arnaldo Carvalho de Melo
parent aab667ca88
commit bfce728db3
3 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/perf/tests/shell/lib/perf_json_output_lint.py
View file

@ -14,6 +14,7 @@ ap.add_argument('--system-wide', action='store_true')
ap.add_argument('--event', action='store_true')
ap.add_argument('--per-core', action='store_true')
ap.add_argument('--per-thread', action='store_true')
ap.add_argument('--per-cache', action='store_true')
ap.add_argument('--per-die', action='store_true')
ap.add_argument('--per-node', action='store_true')
ap.add_argument('--per-socket', action='store_true')
@ -47,6 +48,7 @@ def check_json_output(expected_items):
'counter-value': lambda x: is_counter_value(x),
'cgroup': lambda x: True,
'cpu': lambda x: isint(x),
'cache': lambda x: True,
'die': lambda x: True,
'event': lambda x: True,
'event-runtime': lambda x: isfloat(x),
@ -83,7 +85,7 @@ try:
expected_items = 7
elif args.interval or args.per_thread or args.system_wide_no_aggr:
expected_items = 8
elif args.per_core or args.per_socket or args.per_node or args.per_die:
elif args.per_core or args.per_socket or args.per_node or args.per_die or args.per_cache_instance:
expected_items = 9
else:
# If no option is specified, don't check the number of items.

14
tools/perf/tests/shell/stat+csv_output.sh
View file

@ -40,6 +40,7 @@ function commachecker()
;; "--per-socket") exp=8
;; "--per-node") exp=8
;; "--per-die") exp=8
;; "--per-cache") exp=8
esac
while read line
@ -145,6 +146,18 @@ check_per_thread()
echo "[Success]"
}
check_per_cache_instance()
{
echo -n "Checking CSV output: per cache instance "
if ParanoidAndNotRoot 0
then
echo "[Skip] paranoid and not root"
return
fi
perf stat -x$csv_sep --per-cache -a true 2>&1 | commachecker --per-cache
echo "[Success]"
}
check_per_die()
{
echo -n "Checking CSV output: per die "
@ -222,6 +235,7 @@ if [ $skip_test -ne 1 ]
then
check_system_wide_no_aggr
check_per_core
check_per_cache_instance
check_per_die
check_per_socket
else

13
tools/perf/tests/shell/stat+json_output.sh
View file

@ -120,6 +120,18 @@ check_per_thread()
echo "[Success]"
}
check_per_cache_instance()
{
echo -n "Checking json output: per cache_instance "
if ParanoidAndNotRoot 0
then
echo "[Skip] paranoia and not root"
return
fi
perf stat -j --per-cache -a true 2>&1 | $PYTHON $pythonchecker --per-cache
echo "[Success]"
}
check_per_die()
{
echo -n "Checking json output: per die "
@ -197,6 +209,7 @@ if [ $skip_test -ne 1 ]
then
check_system_wide_no_aggr
check_per_core
check_per_cache_instance
check_per_die
check_per_socket
else