From 64e9f4c0d3bcc5f96a263ab6c840827cf717df7b Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Tue, 8 Feb 2022 16:41:11 +0000
Subject: [PATCH] Restored E tests to makefrag

---
 pipelined/config/rv32e/wally-config.vh        |  4 +-
 pipelined/testbench/tests.vh                  |  2 +-
 .../riscv-test-suite/rv32i_m/I/Makefrag       | 37 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/pipelined/config/rv32e/wally-config.vh b/pipelined/config/rv32e/wally-config.vh
index 2443b7ae..45d0948a 100644
--- a/pipelined/config/rv32e/wally-config.vh
+++ b/pipelined/config/rv32e/wally-config.vh
@@ -49,8 +49,8 @@
 `define UARCH_SUPERSCALR 0
 `define UARCH_SINGLECYCLE 0
 // *** replace with MEM_BUS
-`define DMEM `MEM_BUS
-`define IMEM `MEM_BUS
+`define DMEM `MEM_CACHE
+`define IMEM `MEM_CACHE
 `define VIRTMEM_SUPPORTED 0
 `define VECTORED_INTERRUPTS_SUPPORTED 0 
 
diff --git a/pipelined/testbench/tests.vh b/pipelined/testbench/tests.vh
index 4a78455e..9cce5847 100644
--- a/pipelined/testbench/tests.vh
+++ b/pipelined/testbench/tests.vh
@@ -1498,12 +1498,12 @@ string imperas32f[] = '{
 
  string wally32e[] = '{
     `WALLYTEST,
+    "rv32i_m/I/E-beq-01", "03b010",
     "rv32i_m/I/E-add-01", "005010",
     "rv32i_m/I/E-addi-01", "004010",
     "rv32i_m/I/E-and-01", "005010",
     "rv32i_m/I/E-andi-01", "004010",
     "rv32i_m/I/E-auipc-01", "002010",
-    "rv32i_m/I/E-beq-01", "03b010",
     "rv32i_m/I/E-bge-01", "034010",
     "rv32i_m/I/E-bgeu-01", "047010",
     "rv32i_m/I/E-blt-01", "038010",
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
index eda62507..792ea2e2 100644
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
+++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
@@ -28,6 +28,43 @@
 # Description: Makefrag for RV32I architectural tests
 
 rv32i_sc_tests = \
+ E-add-01 \
+   E-addi-01 \
+   E-and-01 \
+   E-andi-01 \
+   E-auipc-01 \
+   E-beq-01 \
+   E-bge-01 \
+   E-bgeu-01 \
+   E-blt-01 \
+   E-bltu-01 \
+   E-bne-01 \
+   E-jal-01 \
+   E-jalr-01 \
+   E-lb-align-01 \
+   E-lbu-align-01 \
+   E-lh-align-01 \
+   E-lhu-align-01 \
+   E-lui-01 \
+   E-lw-align-01 \
+   E-or-01 \
+   E-ori-01 \
+   E-sb-align-01 \
+   E-sh-align-01 \
+   E-sll-01 \
+   E-slli-01 \
+   E-slt-01 \
+   E-slti-01 \
+   E-sltiu-01 \
+   E-sltu-01 \
+   E-sra-01 \
+   E-srai-01 \
+   E-srl-01 \
+   E-srli-01 \
+   E-sub-01 \
+   E-sw-align-01 \
+   E-xor-01 \
+   E-xori-01 \
 	WALLY-ADD \
 	WALLY-SLT \
 	WALLY-SLTU \