From 1dde0ef3bee0d3f86c6f41796f28625924dc6ba0 Mon Sep 17 00:00:00 2001
From: Anatoly Parshintsev <114445139+aap-sc@users.noreply.github.com>
Date: Wed, 1 May 2024 23:09:09 +0300
Subject: [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.
---
 debug/targets/RISC-V/spike-multi.py        | 2 +-
 debug/targets/RISC-V/spike32-2-hwthread.py | 2 +-
 debug/targets/RISC-V/spike32-2.py          | 2 +-
 debug/targets/RISC-V/spike32.py            | 2 +-
 debug/targets/RISC-V/spike64-2-hwthread.py | 4 +---
 debug/targets/RISC-V/spike64-2-rtos.py     | 2 +-
 debug/targets/RISC-V/spike64-2.py          | 2 +-
 debug/targets/RISC-V/spike64.py            | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debug/targets/RISC-V/spike-multi.py b/debug/targets/RISC-V/spike-multi.py
index 02be763..19f8d6c 100644
--- a/debug/targets/RISC-V/spike-multi.py
+++ b/debug/targets/RISC-V/spike-multi.py
@@ -11,7 +11,7 @@ class multispike(targets.Target):
         spike64.spike64_hart(misa=0x8000000000341129, system=1),
         spike64.spike64_hart(misa=0x8000000000341129, system=1)]
     openocd_config_path = "spike-multi.cfg"
-    timeout_sec = 30
+    timeout_sec = 180
     server_timeout_sec = 120
     implements_custom_test = True
     support_hasel = False
diff --git a/debug/targets/RISC-V/spike32-2-hwthread.py b/debug/targets/RISC-V/spike32-2-hwthread.py
index b617be2..3be3332 100644
--- a/debug/targets/RISC-V/spike32-2-hwthread.py
+++ b/debug/targets/RISC-V/spike32-2-hwthread.py
@@ -7,7 +7,7 @@ class spike32_2(targets.Target):
     harts = [spike32.spike32_hart(misa=0x40341129),
             spike32.spike32_hart(misa=0x40341129)]
     openocd_config_path = "spike-2-hwthread.cfg"
-    timeout_sec = 5
+    timeout_sec = 180
     implements_custom_test = True
     support_memory_sampling = False # not supported without sba
     support_unavailable_control = True
diff --git a/debug/targets/RISC-V/spike32-2.py b/debug/targets/RISC-V/spike32-2.py
index 1d0cc48..0d5f19e 100644
--- a/debug/targets/RISC-V/spike32-2.py
+++ b/debug/targets/RISC-V/spike32-2.py
@@ -7,7 +7,7 @@ class spike32_2(targets.Target):
     harts = [spike32.spike32_hart(misa=0x40141125),
             spike32.spike32_hart(misa=0x40141125)]
     openocd_config_path = "spike-2.cfg"
-    timeout_sec = 30
+    timeout_sec = 180
     implements_custom_test = True
     support_unavailable_control = True
 
diff --git a/debug/targets/RISC-V/spike32.py b/debug/targets/RISC-V/spike32.py
index f0afd88..a196792 100644
--- a/debug/targets/RISC-V/spike32.py
+++ b/debug/targets/RISC-V/spike32.py
@@ -13,7 +13,7 @@ class spike32_hart(targets.Hart):
 class spike32(targets.Target):
     harts = [spike32_hart(misa=0x4034112d)]
     openocd_config_path = "spike-1.cfg"
-    timeout_sec = 30
+    timeout_sec = 180
     implements_custom_test = True
     support_memory_sampling = False # Needs SBA
     freertos_binary = "bin/RTOSDemo32.axf"
diff --git a/debug/targets/RISC-V/spike64-2-hwthread.py b/debug/targets/RISC-V/spike64-2-hwthread.py
index d1d2bf7..4d6e4ba 100644
--- a/debug/targets/RISC-V/spike64-2-hwthread.py
+++ b/debug/targets/RISC-V/spike64-2-hwthread.py
@@ -7,9 +7,7 @@ class spike64_2(targets.Target):
     harts = [spike64.spike64_hart(misa=0x8000000000341129),
             spike64.spike64_hart(misa=0x8000000000341129)]
     openocd_config_path = "spike-2-hwthread.cfg"
-    # Increased timeout because we use abstract_rti to artificially slow things
-    # down.
-    timeout_sec = 20
+    timeout_sec = 180
     implements_custom_test = True
     support_hasel = False
     support_memory_sampling = False # Needs SBA
diff --git a/debug/targets/RISC-V/spike64-2-rtos.py b/debug/targets/RISC-V/spike64-2-rtos.py
index f4de8b8..0b87391 100644
--- a/debug/targets/RISC-V/spike64-2-rtos.py
+++ b/debug/targets/RISC-V/spike64-2-rtos.py
@@ -7,7 +7,7 @@ class spike64_2_rtos(targets.Target):
     harts = [spike64.spike64_hart(misa=0x8000000000141129),
             spike64.spike64_hart(misa=0x8000000000141129)]
     openocd_config_path = "spike-rtos.cfg"
-    timeout_sec = 60
+    timeout_sec = 180
     implements_custom_test = True
     support_hasel = False
     test_semihosting = False
diff --git a/debug/targets/RISC-V/spike64-2.py b/debug/targets/RISC-V/spike64-2.py
index e4c7524..ea31636 100644
--- a/debug/targets/RISC-V/spike64-2.py
+++ b/debug/targets/RISC-V/spike64-2.py
@@ -7,7 +7,7 @@ class spike64_2(targets.Target):
     harts = [spike64.spike64_hart(misa=0x8000000000141129),
             spike64.spike64_hart(misa=0x8000000000141129)]
     openocd_config_path = "spike-2.cfg"
-    timeout_sec = 5
+    timeout_sec = 180
     implements_custom_test = True
     support_memory_sampling = False # Needs SBA
     support_unavailable_control = True
diff --git a/debug/targets/RISC-V/spike64.py b/debug/targets/RISC-V/spike64.py
index 8f5ba4f..5616977 100644
--- a/debug/targets/RISC-V/spike64.py
+++ b/debug/targets/RISC-V/spike64.py
@@ -14,7 +14,7 @@ class spike64_hart(targets.Hart):
 class spike64(targets.Target):
     harts = [spike64_hart()]
     openocd_config_path = "spike-1.cfg"
-    timeout_sec = 30
+    timeout_sec = 180
     implements_custom_test = True
     freertos_binary = "bin/RTOSDemo64.axf"
     support_unavailable_control = True
-- 
cgit v1.1