From 895a4f48320c7848cab6fe9127e5a1abf68cddf1 Mon Sep 17 00:00:00 2001
From: Kip Macsai-Goren <kipmacsaigoren@gmail.com>
Date: Wed, 4 May 2022 21:19:23 +0000
Subject: [PATCH] updated makefrag and tests.vh to reflect removed tests, new
 names

---
 pipelined/testbench/tests.vh                  | 48 +++++++++----------
 .../rv32i_m/privilege/Makefrag                | 21 ++++----
 .../rv64i_m/privilege/Makefrag                | 25 +++++-----
 3 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/pipelined/testbench/tests.vh b/pipelined/testbench/tests.vh
index 1a150dbf..46b5d068 100644
--- a/pipelined/testbench/tests.vh
+++ b/pipelined/testbench/tests.vh
@@ -46,15 +46,15 @@ string tvpaths[] = '{
 
   string wally64a[] = '{
     `WALLYTEST,
-    "rv64i_m/privilege/WALLY-AMO", "2210",
-    "rv64i_m/privilege/WALLY-LRSC", "2410",
+    "rv64i_m/privilege/WALLY-amo", "2210",
+    "rv64i_m/privilege/WALLY-lrsc", "2410",
     "rv64i_m/privilege/WALLY-status-fp-enabled-01", "50a0"
   };
 
     string wally32a[] = '{
     `WALLYTEST,
-    "rv32i_m/privilege/WALLY-AMO", "2310",
-    "rv32i_m/privilege/WALLY-LRSC", "2310",
+    "rv32i_m/privilege/WALLY-amo", "2310",
+    "rv32i_m/privilege/WALLY-lrsc", "2310",
     "rv32i_m/privilege/WALLY-status-fp-enabled-01", "5080"
 
   };
@@ -1453,33 +1453,31 @@ string imperas32f[] = '{
 
  string wally64priv[] = '{
     `WALLYTEST,
-    "rv64i_m/privilege/WALLY-CSR-permission-s-01", "0060a0",
-    "rv64i_m/privilege/WALLY-CSR-permission-u-01", "0060a0",
+    "rv64i_m/privilege/WALLY-csr-permission-s-01", "0060a0",
+    "rv64i_m/privilege/WALLY-csr-permission-u-01", "0060a0",
     "rv64i_m/privilege/WALLY-minfo-01", "0050a0",
     "rv64i_m/privilege/WALLY-misa-01", "0050a0",
-    "rv64i_m/privilege/WALLY-MMU-SV39", "0050a0",
-    "rv64i_m/privilege/WALLY-MMU-SV48", "0050a0",
-    "rv64i_m/privilege/WALLY-PMA", "0050a0",
-    "rv64i_m/privilege/WALLY-PMP", "0050a0",
+    "rv64i_m/privilege/WALLY-mmu-sv39", "0050a0",
+    "rv64i_m/privilege/WALLY-mmu-sv48", "0050a0",
+    "rv64i_m/privilege/WALLY-pma", "0050a0",
+    "rv64i_m/privilege/WALLY-pmp", "0050a0",
     "rv64i_m/privilege/WALLY-trap-01", "0050a0",
     "rv64i_m/privilege/WALLY-trap-s-01", "0050a0",
     "rv64i_m/privilege/WALLY-trap-u-01", "0050a0",
-    "rv64i_m/privilege/WALLY-MIE-01", "0050a0",
-    "rv64i_m/privilege/WALLY-SIE-01", "0050a0",
+    "rv64i_m/privilege/WALLY-mie-01", "0050a0",
+    "rv64i_m/privilege/WALLY-sie-01", "0050a0",
     "rv64i_m/privilege/WALLY-mtvec-01", "0050a0",
     "rv64i_m/privilege/WALLY-stvec-01", "0050a0",
     "rv64i_m/privilege/WALLY-status-mie-01", "0050a0",
     "rv64i_m/privilege/WALLY-status-sie-01", "0050a0",
     "rv64i_m/privilege/WALLY-trap-sret-01", "0050a0",
     // "rv64i_m/privilege/WALLY-status-tw-01", "0050a0",
-    "rv64i_m/privilege/WALLY-WFI-01", "0050a0",
-    "rv64i_m/privilege/WALLY-status-fp-disabled-01", "50a0"
-
+    "rv64i_m/privilege/WALLY-wfi-01", "0050a0"
  };
 
  string wally64periph[] = '{
     `WALLYTEST,
-    "rv64i_m/privilege/WALLY-PERIPH", "3310"
+    "rv64i_m/privilege/WALLY-periph", "3310"
  };
 
  string wally32e[] = '{
@@ -1534,27 +1532,25 @@ string wally32i[] = '{
 
  string wally32priv[] = '{
     `WALLYTEST,
-    "rv32i_m/privilege/WALLY-CSR-permission-s-01", "6080",
-    "rv32i_m/privilege/WALLY-CSR-permission-u-01", "6080",
+    "rv32i_m/privilege/WALLY-csr-permission-s-01", "6080",
+    "rv32i_m/privilege/WALLY-csr-permission-u-01", "6080",
     "rv32i_m/privilege/WALLY-minfo-01", "5080",
     "rv32i_m/privilege/WALLY-misa-01", "5080",
-    "rv32i_m/privilege/WALLY-MMU-SV32", "5080",
-    "rv32i_m/privilege/WALLY-PMA", "5080",
-    "rv32i_m/privilege/WALLY-PMP", "5080",
+    "rv32i_m/privilege/WALLY-mmu-sv32", "5080",
+    "rv32i_m/privilege/WALLY-pma", "5080",
+    "rv32i_m/privilege/WALLY-pmp", "5080",
     "rv32i_m/privilege/WALLY-trap-01", "5080",
     "rv32i_m/privilege/WALLY-trap-s-01", "5080",
     "rv32i_m/privilege/WALLY-trap-u-01", "5080",
-    "rv32i_m/privilege/WALLY-MIE-01", "5080",
-    "rv32i_m/privilege/WALLY-SIE-01", "5080",
+    "rv32i_m/privilege/WALLY-mie-01", "5080",
+    "rv32i_m/privilege/WALLY-sie-01", "5080",
     "rv32i_m/privilege/WALLY-mtvec-01", "5080",
     "rv32i_m/privilege/WALLY-stvec-01", "5080",
     "rv32i_m/privilege/WALLY-status-mie-01", "5080",
     "rv32i_m/privilege/WALLY-status-sie-01", "5080",
     "rv32i_m/privilege/WALLY-trap-sret-01", "5080",
 //    "rv32i_m/privilege/WALLY-status-tw-01", "5080", *** this test doesn't pass yet because PC counts up while wfi is spinning
-    "rv32i_m/privilege/WALLY-WFI-01", "5080",
-    "rv32i_m/privilege/WALLY-status-fp-disabled-01", "5080"
-
+    "rv32i_m/privilege/WALLY-wfi-01", "5080"
  };
 
  string wally32periph[] = '{
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 8e99369b..3b530f75 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
@@ -28,21 +28,21 @@
 # Description: Makefrag for RV32I architectural tests
 
 rv32i_sc_tests = \
-    WALLY-MMU-SV32 \
-    WALLY-PMP \
-    WALLY-CSR-permission-s-01 \
-    WALLY-CSR-permission-u-01 \
+    WALLY-mmu-sv32 \
+    WALLY-pmp \
+    WALLY-csr-permission-s-01 \
+    WALLY-csr-permission-u-01 \
     WALLY-minfo-01 \
     WALLY-misa-01 \
-    WALLY-AMO \
-    WALLY-LRSC \
+    WALLY-amo \
+    WALLY-lrsc \
 
 target_tests_nosim = \
-    WALLY-PMA \
+    WALLY-pma \
     WALLY-mtvec-01 \
     WALLY-stvec-01 \
-    WALLY-MIE-01 \
-    WALLY-SIE-01 \
+    WALLY-mie-01 \
+    WALLY-sie-01 \
     WALLY-status-mie-01 \
     WALLY-status-sie-01 \
     WALLY-trap-sret-01 \
@@ -50,9 +50,8 @@ target_tests_nosim = \
     WALLY-trap-s-01 \
     WALLY-trap-u-01 \
     WALLY-status-tw-01 \
-    WALLY-WFI-01 \
+    WALLY-wfi-01 \
     WALLY-status-fp-enabled-01 \
-    WALLY-status-fp-disabled-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 287c12ea..c81f1537 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
@@ -28,34 +28,33 @@
 # Description: Makefrag for RV64I architectural tests
 
 rv64i_sc_tests = \
-    WALLY-MMU-SV39 \
-    WALLY-MMU-SV48 \
-    WALLY-PMP \
+    WALLY-mmu-sv39 \
+    WALLY-mmu-sv48 \
+    WALLY-pmp \
     WALLY-minfo-01 \
-    WALLY-CSR-permission-s-01 \
-    WALLY-CSR-permission-u-01 \
+    WALLY-csr-permission-s-01 \
+    WALLY-csr-permission-u-01 \
     WALLY-misa-01 \
-    WALLY-AMO \
-    WALLY-LRSC \
+    WALLY-amo \
+    WALLY-lrsc \
     WALLY-trap-sret-01 \
 
 # Don't simulate these because they rely on SoC features that Spike does not offer.
 target_tests_nosim = \
-    WALLY-PMA \
-    WALLY-PERIPH \
+    WALLY-pma \
+    WALLY-periph \
     WALLY-mtvec-01 \
     WALLY-stvec-01 \
-    WALLY-MIE-01 \
-    WALLY-SIE-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-wfi-01 \
     WALLY-status-fp-enabled-01 \
-    WALLY-status-fp-disabled-01 \
 
 rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests))