From f00b3ac27e00abc6cc368c6b41ae7bf61557fe76 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Tue, 8 Feb 2022 15:24:37 +0000
Subject: [PATCH] Fixed TIM tests; rv32e test still failing

---
 pipelined/testbench/testbench.sv | 2 ++
 pipelined/testbench/tests.vh     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipelined/testbench/testbench.sv b/pipelined/testbench/testbench.sv
index e1a36274..3117c111 100644
--- a/pipelined/testbench/testbench.sv
+++ b/pipelined/testbench/testbench.sv
@@ -193,6 +193,7 @@ logic [3:0] dummy;
       memfilename = {pathname, tests[test], ".elf.memfile"};
       if (`IMEM == `MEM_TIM) $readmemh(memfilename, dut.core.ifu.irom.irom.ram.RAM);
       else              $readmemh(memfilename, dut.uncore.ram.ram.RAM);
+      if (`DMEM == `MEM_TIM) $readmemh(memfilename, dut.core.lsu.dtim.dtim.ram.RAM);
 
       ProgramAddrMapFile = {pathname, tests[test], ".elf.objdump.addr"};
       ProgramLabelMapFile = {pathname, tests[test], ".elf.objdump.lab"};
@@ -290,6 +291,7 @@ logic [3:0] dummy;
             //$readmemh(memfilename, dut.uncore.ram.ram.RAM);
             if (`IMEM == `MEM_TIM) $readmemh(memfilename, dut.core.ifu.irom.irom.ram.RAM);
             else                   $readmemh(memfilename, dut.uncore.ram.ram.RAM);
+            if (`DMEM == `MEM_TIM) $readmemh(memfilename, dut.core.lsu.dtim.dtim.ram.RAM);
 
             ProgramAddrMapFile = {pathname, tests[test], ".elf.objdump.addr"};
             ProgramLabelMapFile = {pathname, tests[test], ".elf.objdump.lab"};
diff --git a/pipelined/testbench/tests.vh b/pipelined/testbench/tests.vh
index 42ea2a25..4a78455e 100644
--- a/pipelined/testbench/tests.vh
+++ b/pipelined/testbench/tests.vh
@@ -1432,7 +1432,6 @@ string imperas32f[] = '{
 
   string arch32i[] = '{
     `RISCVARCHTEST,
-    "rv32i_m/I/fence-01", "2010",
     "rv32i_m/I/add-01", "5010",
     "rv32i_m/I/addi-01", "4010",
     "rv32i_m/I/and-01", "5010",