sw: Make tests agnostic of core num

pulp-platform · Jul 27, 2024 · 5e09528 · 5e09528
1 parent 54aeece
commit 5e09528
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 27 deletions.
diff --git a/sw/tests/caq.c b/sw/tests/caq.c
@@ -7,7 +7,7 @@
 
 #include <snrt.h>
 
-#define NUM_WORKERS 8
+#define NUM_WORKERS 4
 
 // To prevent X reads on non-CAQ-proofed systems, we need a sync
 inline void fp_sync() {

diff --git a/sw/tests/non_null_exitcode.c b/sw/tests/non_null_exitcode.c
@@ -8,4 +8,9 @@
 // Should be used as a test to check that the simulator or whoever
 // is running the program actually captures an error when it occurs.
 
-int main() { return 14; }
+// Minimum number of cores the hardware must have for this test to pass
+#define MIN_CORES 4
+
+int main() {
+    if (snrt_cluster_core_idx() < MIN_CORES) return 14;
+}
diff --git a/sw/tests/openmp_parallel.c b/sw/tests/openmp_parallel.c
@@ -16,7 +16,7 @@ unsigned __attribute__((noinline)) parallel_section(void) {
         tx = read_csr(minstret) - tx;
         __atomic_add_fetch(&sum, 10, __ATOMIC_RELAXED);
     }
-    return sum != 8 * 10;
+    return sum != snrt_cluster_compute_core_num() * 10;
 }
 
 int main() {

diff --git a/sw/tests/team_global.c b/sw/tests/team_global.c
diff --git a/target/snitch_cluster/sw/run.yaml b/target/snitch_cluster/sw/run.yaml
@@ -70,7 +70,7 @@ runs:
   - elf: tests/build/varargs_2.elf
   - elf: tests/build/zero_mem.elf
   - elf: tests/build/non_null_exitcode.elf
-    retcode: 126
+    retcode: 56
   - elf: tests/build/caq.elf
   - elf: tests/build/caq_frep.elf
     simulators: [vsim, vcs, verilator] # banshee does not model FREP timing