From 18a4d5fc8d7a459abe7c9dce990960e0836f21d3 Mon Sep 17 00:00:00 2001
From: Noah Boorstin <nboorstin@hmc.edu>
Date: Wed, 14 Apr 2021 00:00:27 -0400
Subject: [PATCH] busybear testbench updates

start speculative checking on CSR* satp, *
add some slight delays in some CSR checkings to make them deterministic

I realize this verilog is incredibly un-idiomatic. But I still don't
know of anything better. If you figure it out, please let me know
---
 wally-pipelined/testbench/testbench-busybear.sv | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv
index b3f74ea62..47f949248 100644
--- a/wally-pipelined/testbench/testbench-busybear.sv
+++ b/wally-pipelined/testbench/testbench-busybear.sv
@@ -279,14 +279,18 @@ module testbench_busybear();
     end
   end
 
-  string sepc_lit = "SEPC";
+  function logic icmp(string x, y);
+    return x.icompare(y);
+  endfunction
   `define CHECK_CSR2(CSR, PATH) \
     string CSR; \
     logic [63:0] expected``CSR``; \
     //CSR checking \
     always @(``PATH``.``CSR``_REGW) begin \
         if ($time > 1) begin \
-          if (sepc_lit.icompare(`"CSR`")) begin #1; end \
+          if (icmp("SEPC", `"CSR`")) begin #1; end \
+          if (icmp("SCAUSE", `"CSR`")) begin #2; end \
+          if (icmp("SSTATUS", `"CSR`")) begin #3; end \
           scan_file_csr = $fscanf(data_file_csr, "%s\n", CSR); \
           scan_file_csr = $fscanf(data_file_csr, "%x\n", expected``CSR``); \
           if(CSR.icompare(`"CSR`")) begin \
@@ -463,8 +467,10 @@ module testbench_busybear();
               32'bXXXXXXXXXXXXXXXX111XXXXXXXXXXX01, // C.BNEZ
               32'bXXXXXXXXXXXXXXXX101XXXXXXXXXXX01: // C.J
                 speculative = 1;
-              32'bXXXXXXXXXXXXXXXX1001000000000010: // C.EBREAK:
+              32'bXXXXXXXXXXXXXXXX1001000000000010, // C.EBREAK:
+              32'bXXXXXXXXXXXXXXXXX000XXXXX1110011: // Something that's not CSRR*
                 speculative = 0; // tbh don't really know what should happen here
+              32'b000110000000XXXXXXXXXXXXX1110011, // CSR* SATP, *
               32'bXXXXXXXXXXXXXXXX1000XXXXX0000010, // C.JR
               32'bXXXXXXXXXXXXXXXX1001XXXXX0000010: // C.JALR //this is RV64 only so no C.JAL
                 speculative = 1;