RTLA runtime tests verify the -c/--cpus options, but do not check whether the correct affinity is actually applied.
Add a script named check-cpus.sh that retrieves the affinity of all workload threads and use it to check the -c/--cpus option for both osnoise and timerlat tools. Also add missing -c/--cpus test for osnoise. Signed-off-by: Tomas Glozar <[email protected]> --- tools/tracing/rtla/tests/osnoise.t | 2 ++ tools/tracing/rtla/tests/scripts/check-cpus.sh | 9 +++++++++ tools/tracing/rtla/tests/timerlat.t | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 tools/tracing/rtla/tests/scripts/check-cpus.sh diff --git a/tools/tracing/rtla/tests/osnoise.t b/tools/tracing/rtla/tests/osnoise.t index ed6ff0cc3329..5edffb23981b 100644 --- a/tools/tracing/rtla/tests/osnoise.t +++ b/tools/tracing/rtla/tests/osnoise.t @@ -18,6 +18,8 @@ check_top_q_hist "verify the --trace param" \ "osnoise TOOL -s 30 -T 1 -t" 2 "Saving trace to osnoise_trace.txt" check "verify the --entries/-E param" \ "osnoise hist -P F:1 -c 0 -r 900000 -d 10s -b 10 -E 25" +check_top_q_hist "verify the -c/--cpus param" \ + "osnoise TOOL -P F:1 -c 0 -r 900000 -d 10s -S 1 --on-threshold shell,command=tests/scripts/check-cpus.sh" 2 "^Affinity of threads: 0$" # Test setting default period by putting an absurdly high period # and stopping on threshold. diff --git a/tools/tracing/rtla/tests/scripts/check-cpus.sh b/tools/tracing/rtla/tests/scripts/check-cpus.sh new file mode 100755 index 000000000000..0b016d4a7945 --- /dev/null +++ b/tools/tracing/rtla/tests/scripts/check-cpus.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +. "$(dirname $0)/lib/get_workload_pids.sh" +echo -n "Affinity of threads: " +for pid in $(get_workload_pids) +do + echo -n $(taskset -c -p $pid | cut -d ':' -f 2) +done +echo diff --git a/tools/tracing/rtla/tests/timerlat.t b/tools/tracing/rtla/tests/timerlat.t index 765dffd9d42a..fb60022aaa64 100644 --- a/tools/tracing/rtla/tests/timerlat.t +++ b/tools/tracing/rtla/tests/timerlat.t @@ -39,8 +39,8 @@ check "print the auto-analysis if hits the stop tracing condition" \ "timerlat top --aa-only 5" 2 check_top_hist "disable auto-analysis" \ "timerlat TOOL -s 3 -T 10 -t --no-aa" 2 -check_top_hist "verify -c/--cpus" \ - "timerlat TOOL -c 0 -d 10s" +check_top_q_hist "verify -c/--cpus" \ + "timerlat TOOL -c 0 -d 10s -T 1 --on-threshold shell,command=tests/scripts/check-cpus.sh" 2 "^Affinity of threads: 0$" # Actions tests check_top_q_hist "trace output through -t" \ -- 2.53.0
