From c502203b1de1ed9577e48e731afb454f856027b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= Date: Tue, 31 Oct 2023 22:22:46 +0100 Subject: [PATCH] nproc test I wondered why vsyscall_reverse_next-32 takes in CI kind of long. And suspect this has something to do with JULIA_CPU_THREADS=128 at a CPU supporting 64 threads? model name : AMD EPYC 7502 32-Core Processor nproc shows also 128 lscpu: failed to determine number of CPUs: /sys/devices/system/cpu/possible: No such file or directory --- .buildkite/lib/generate.jl | 9 ++++++++- .buildkite/lib/types.jl | 7 ------- src/test/vsyscall_reverse_next.py | 5 +++++ src/test/vsyscall_reverse_next.run | 1 + 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.buildkite/lib/generate.jl b/.buildkite/lib/generate.jl index 0c12929d844..2d6658fdc37 100644 --- a/.buildkite/lib/generate.jl +++ b/.buildkite/lib/generate.jl @@ -32,7 +32,14 @@ function generate(platform::Platform) mkdir -p Testing/Temporary mv ../.buildkite/CTestCostData.txt Testing/Temporary if bin/rr record bin/simple; then - julia ../.buildkite/capture_tmpdir.jl ctest --output-on-failure -j\$\$(expr \$\${JULIA_CPU_THREADS:?} - 2) + if [ "\$\${JULIA_CPU_THREADS:?}" == "128" ]; then + #taskset --cpu-list 0-63 julia ../.buildkite/capture_tmpdir.jl ctest --output-on-failure -j64 + #bash -c "sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000; sleep 15s; ps aux --width 1000" & + bash -c "sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q; sleep 15s; gdb -q --pid \$\$(pgrep -o rr) --batch -ex bt -ex detach -ex q" & + taskset --cpu-list 0-15 julia ../.buildkite/capture_tmpdir.jl ctest --verbose -R vsyscall_reverse_next-32-no-syscallbuf + else + julia ../.buildkite/capture_tmpdir.jl ctest --output-on-failure -j\$\$(expr \$\${JULIA_CPU_THREADS:?} - 2) + fi else echo -n -e "rr seems not able to run, skipping running test suite.\nhostname: " hostname diff --git a/.buildkite/lib/types.jl b/.buildkite/lib/types.jl index 5271abb6b10..59bec0d310d 100644 --- a/.buildkite/lib/types.jl +++ b/.buildkite/lib/types.jl @@ -23,12 +23,5 @@ const platforms = Platforms( allow_fail = false, commit_status = true, ), - Platform(; - arch = "aarch64", - rootfs_tag = "v5.22", - rootfs_treehash = "7a63218e46996b36aa108b55746a3d94a3e312c1", - allow_fail = false, - commit_status = true, - ), ] ) diff --git a/src/test/vsyscall_reverse_next.py b/src/test/vsyscall_reverse_next.py index 8de6b397449..3a6e59a618c 100644 --- a/src/test/vsyscall_reverse_next.py +++ b/src/test/vsyscall_reverse_next.py @@ -1,15 +1,20 @@ +import datetime from util import * send_gdb('break vsyscall_reverse_next.c:6') expect_gdb('Breakpoint 1') +send_gdb('print "' + datetime.datetime.now().strftime("%Y-%m-%d, %H:%M:%S.%f") + '"') send_gdb('c') expect_gdb('Breakpoint 1') +send_gdb('print "' + datetime.datetime.now().strftime("%Y-%m-%d, %H:%M:%S.%f") + '"') send_gdb('disable 1') send_gdb('n') expect_gdb('atomic_puts') +send_gdb('print "' + datetime.datetime.now().strftime("%Y-%m-%d, %H:%M:%S.%f") + '"') send_gdb('reverse-next') expect_gdb('time') +send_gdb('print "' + datetime.datetime.now().strftime("%Y-%m-%d, %H:%M:%S.%f") + '"') ok() diff --git a/src/test/vsyscall_reverse_next.run b/src/test/vsyscall_reverse_next.run index fa0871c0b30..ccce77e77f1 100644 --- a/src/test/vsyscall_reverse_next.run +++ b/src/test/vsyscall_reverse_next.run @@ -1,3 +1,4 @@ source `dirname $0`/util.sh if [ $TIMEOUT -lt 600 ]; then TIMEOUT=600; fi debug_test +failed ": test"