From d9003da8e0c2e404c2597f3c1bad5b40bd4a7ee1 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Tue, 30 Jan 2024 10:28:51 -0800
Subject: [PATCH] Moved some tests to wally-riscv-arch-test list that are
 simulated

---
 .../riscv-test-suite/rv32i_m/privilege/Makefrag        |  9 ++++-----
 .../riscv-test-suite/rv64i_m/privilege/Makefrag        | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag
index 67f7c2f93..243d9011f 100644
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag
+++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag
@@ -36,11 +36,13 @@ rv32i_sc_tests = \
     WALLY-lrsc-01 \
     WALLY-status-mie-01 \
     WALLY-trap-sret-01 \
-
+    WALLY-status-fp-enabled-01 \
+    WALLY-minfo-01 \
+    WALLY-cboz-01 \
+    WALLY-cbom-01 \
 
 target_tests_nosim = \
     WALLY-pma-01 \
-    WALLY-minfo-01 \
     WALLY-mtvec-01 \
     WALLY-stvec-01 \
     WALLY-mie-01 \
@@ -49,7 +51,6 @@ target_tests_nosim = \
     WALLY-trap-s-01 \
     WALLY-trap-u-01 \
     WALLY-wfi-01 \
-    WALLY-status-fp-enabled-01 \
     WALLY-status-sie-01 \
     WALLY-status-tw-01 \
     WALLY-gpio-01 \
@@ -57,8 +58,6 @@ target_tests_nosim = \
     WALLY-plic-01 \
     WALLY-uart-01 \
     WALLY-spi-01 \
-    WALLY-cbom-01 \
-    WALLY-cboz-01 \
 
 
 rv32i_tests = $(addsuffix .elf, $(rv32i_sc_tests))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
index a640e0c06..a96fae3db 100644
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
+++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
@@ -39,12 +39,16 @@ rv64i_sc_tests = \
     WALLY-status-mie-01 \
     WALLY-status-sie-01 \
     WALLY-status-tw-01 \
+    WALLY-status-fp-enabled-01 \
+    WALLY-misaligned-access-01 \
+    WALLY-minfo-01 \
+    WALLY-cboz-01 \
+    WALLY-cbom-01 \
 
 
 # Don't simulate these because they rely on SoC features that Spike does not offer.
 target_tests_nosim = \
     WALLY-pma-01 \
-    WALLY-minfo-01 \
     WALLY-periph-01 \
     WALLY-mtvec-01 \
     WALLY-stvec-01 \
@@ -53,14 +57,10 @@ target_tests_nosim = \
     WALLY-trap-01 \
     WALLY-trap-s-01 \
     WALLY-trap-u-01 \
-    WALLY-status-fp-enabled-01 \
     WALLY-spi-01 \
     WALLY-gpio-01 \
     WALLY-uart-01 \
     WALLY-wfi-01 \
-    WALLY-cbom-01 \
-    WALLY-cboz-01 \
-    WALLY-misaligned-access-01 \
 
 
 # unclear why status-fp-enabled and wfi aren't simulating ok