From aa452b2f3858e138c19b047d8febaa6fd8a7863d Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Thu, 12 May 2022 04:45:41 +0000
Subject: [PATCH] Moved some privileged tests to be simulated.

---
 bin/testlist.pl                                       |  2 +-
 .../riscv-test-suite/rv32i_m/privilege/Makefrag       | 11 +++++++----
 .../riscv-test-suite/rv64i_m/privilege/Makefrag       | 11 +++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bin/testlist.pl b/bin/testlist.pl
index 745ff29e5..12be0a913 100755
--- a/bin/testlist.pl
+++ b/bin/testlist.pl
@@ -9,7 +9,7 @@ use warnings;
 import os;
 
 if ($#ARGV != 0) {
-    die("Usage: $0 workpath [e.g. $0 $WALLY/addins/riscv-arch-test/work")
+    die("Usage: $0 workpath [e.g. $0 \$WALLY/addins/riscv-arch-test/work")
 }
 my $mypath = $ARGV[0];
 my @dirs = glob($mypath.'/*/*');
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 3b530f755..b48db0871 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,6 +36,9 @@ rv32i_sc_tests = \
     WALLY-misa-01 \
     WALLY-amo \
     WALLY-lrsc \
+    WALLY-status-mie-01 \
+    WALLY-trap-sret-01 \
+
 
 target_tests_nosim = \
     WALLY-pma \
@@ -43,15 +46,15 @@ target_tests_nosim = \
     WALLY-stvec-01 \
     WALLY-mie-01 \
     WALLY-sie-01 \
-    WALLY-status-mie-01 \
-    WALLY-status-sie-01 \
-    WALLY-trap-sret-01 \
     WALLY-trap-01 \
     WALLY-trap-s-01 \
     WALLY-trap-u-01 \
-    WALLY-status-tw-01 \
     WALLY-wfi-01 \
     WALLY-status-fp-enabled-01 \
+    WALLY-status-sie-01 \
+    WALLY-status-tw-01 \
+
+# unclear why wfi, status-fp-enabled, status-sie, and status-tw fail
 
 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 c81f1537a..319c5d930 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
@@ -38,6 +38,10 @@ rv64i_sc_tests = \
     WALLY-amo \
     WALLY-lrsc \
     WALLY-trap-sret-01 \
+    WALLY-status-mie-01 \
+    WALLY-status-sie-01 \
+    WALLY-status-tw-01 \
+
 
 # Don't simulate these because they rely on SoC features that Spike does not offer.
 target_tests_nosim = \
@@ -47,14 +51,13 @@ target_tests_nosim = \
     WALLY-stvec-01 \
     WALLY-mie-01 \
     WALLY-sie-01 \
-    WALLY-status-mie-01 \
-    WALLY-status-sie-01 \
     WALLY-trap-01 \
     WALLY-trap-s-01 \
     WALLY-trap-u-01 \
-    WALLY-status-tw-01 \
-    WALLY-wfi-01 \
     WALLY-status-fp-enabled-01 \
+    WALLY-wfi-01 \
+
+# unclear why status-fp-enabled and wfi aren't simulating ok
 
 rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests))