Skip to content

Commit 1dde0ef

Browse files
authored
[debug tests] increase remotetimeout for all spike-based targets (#553)
Spike simulator is very demanding to CPU resources. This causes debug tests to sporadically fail on slower machines. Increasing of gdb's `remotetimeout` should get rid of such failures, unless we run the testsuite on a potato. The only downside is that if OpenOCD is broken, tests can run longer. However, I think this is the sacrifice we can make, since execution time is not affected if everything works as expected.
1 parent 6b1d737 commit 1dde0ef

File tree

8 files changed

+8
-10
lines changed

8 files changed

+8
-10
lines changed

debug/targets/RISC-V/spike-multi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class multispike(targets.Target):
1111
spike64.spike64_hart(misa=0x8000000000341129, system=1),
1212
spike64.spike64_hart(misa=0x8000000000341129, system=1)]
1313
openocd_config_path = "spike-multi.cfg"
14-
timeout_sec = 30
14+
timeout_sec = 180
1515
server_timeout_sec = 120
1616
implements_custom_test = True
1717
support_hasel = False

debug/targets/RISC-V/spike32-2-hwthread.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class spike32_2(targets.Target):
77
harts = [spike32.spike32_hart(misa=0x40341129),
88
spike32.spike32_hart(misa=0x40341129)]
99
openocd_config_path = "spike-2-hwthread.cfg"
10-
timeout_sec = 5
10+
timeout_sec = 180
1111
implements_custom_test = True
1212
support_memory_sampling = False # not supported without sba
1313
support_unavailable_control = True

debug/targets/RISC-V/spike32-2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class spike32_2(targets.Target):
77
harts = [spike32.spike32_hart(misa=0x40141125),
88
spike32.spike32_hart(misa=0x40141125)]
99
openocd_config_path = "spike-2.cfg"
10-
timeout_sec = 30
10+
timeout_sec = 180
1111
implements_custom_test = True
1212
support_unavailable_control = True
1313

debug/targets/RISC-V/spike32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class spike32_hart(targets.Hart):
1313
class spike32(targets.Target):
1414
harts = [spike32_hart(misa=0x4034112d)]
1515
openocd_config_path = "spike-1.cfg"
16-
timeout_sec = 30
16+
timeout_sec = 180
1717
implements_custom_test = True
1818
support_memory_sampling = False # Needs SBA
1919
freertos_binary = "bin/RTOSDemo32.axf"

debug/targets/RISC-V/spike64-2-hwthread.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ class spike64_2(targets.Target):
77
harts = [spike64.spike64_hart(misa=0x8000000000341129),
88
spike64.spike64_hart(misa=0x8000000000341129)]
99
openocd_config_path = "spike-2-hwthread.cfg"
10-
# Increased timeout because we use abstract_rti to artificially slow things
11-
# down.
12-
timeout_sec = 20
10+
timeout_sec = 180
1311
implements_custom_test = True
1412
support_hasel = False
1513
support_memory_sampling = False # Needs SBA

debug/targets/RISC-V/spike64-2-rtos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class spike64_2_rtos(targets.Target):
77
harts = [spike64.spike64_hart(misa=0x8000000000141129),
88
spike64.spike64_hart(misa=0x8000000000141129)]
99
openocd_config_path = "spike-rtos.cfg"
10-
timeout_sec = 60
10+
timeout_sec = 180
1111
implements_custom_test = True
1212
support_hasel = False
1313
test_semihosting = False

debug/targets/RISC-V/spike64-2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class spike64_2(targets.Target):
77
harts = [spike64.spike64_hart(misa=0x8000000000141129),
88
spike64.spike64_hart(misa=0x8000000000141129)]
99
openocd_config_path = "spike-2.cfg"
10-
timeout_sec = 5
10+
timeout_sec = 180
1111
implements_custom_test = True
1212
support_memory_sampling = False # Needs SBA
1313
support_unavailable_control = True

debug/targets/RISC-V/spike64.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class spike64_hart(targets.Hart):
1414
class spike64(targets.Target):
1515
harts = [spike64_hart()]
1616
openocd_config_path = "spike-1.cfg"
17-
timeout_sec = 30
17+
timeout_sec = 180
1818
implements_custom_test = True
1919
freertos_binary = "bin/RTOSDemo64.axf"
2020
support_unavailable_control = True

0 commit comments

Comments
 (0)