From c4fb51fad1a3f07b29bd8360dab338d9c355c058 Mon Sep 17 00:00:00 2001
From: Noah Boorstin <nboorstin@hmc.edu>
Date: Mon, 22 Mar 2021 14:47:43 -0400
Subject: [PATCH] regression: expect 200k instead of 100k busybear instrs

and a minor busybear bugfix
---
 wally-pipelined/regression/regression-wally.py  |  2 +-
 wally-pipelined/testbench/testbench-busybear.sv | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/wally-pipelined/regression/regression-wally.py b/wally-pipelined/regression/regression-wally.py
index 68957cae4..941a7e757 100755
--- a/wally-pipelined/regression/regression-wally.py
+++ b/wally-pipelined/regression/regression-wally.py
@@ -27,7 +27,7 @@ def test_config(config, print_res=True):
     cmd = "echo 'quit' | vsim -do wally-busybear.do -c >" + logname
     os.system(cmd)
     # check for success.  grep returns 0 if found, 1 if not found
-    passed = search_log_for_text("# loaded 100000 instructions", logname)
+    passed = search_log_for_text("# loaded 200000 instructions", logname)
   else:
     cmd = "vsim -c >" + logname +" <<!\ndo wally-pipelined-batch.do ../config/" + config + " " + config + "\n!\n"
     print(cmd)
diff --git a/wally-pipelined/testbench/testbench-busybear.sv b/wally-pipelined/testbench/testbench-busybear.sv
index dcd1a4c87..4f53d0796 100644
--- a/wally-pipelined/testbench/testbench-busybear.sv
+++ b/wally-pipelined/testbench/testbench-busybear.sv
@@ -190,15 +190,17 @@ module testbench_busybear();
 
   logic [`XLEN-1:0] readAdrExpected;
 
-  always @(dut.hart.MemRWM[1] or HADDR or dut.HRDATA) begin
-    if (dut.hart.MemRWM[1] && HADDR != dut.PCF && dut.HRDATA != {64{1'bx}}) begin
+  //always @(dut.hart.MemRWM[1] or HADDR or dut.HRDATA) begin
+  always @(posedge dut.HREADY) begin
+    #1;
+    if (dut.hart.MemRWM[1] && HADDR != dut.PCF && dut.HRDATA !== {64{1'bx}}) begin
+      $display("%0t", $time);
       if($feof(data_file_memR)) begin
         $display("no more memR data to read");
         `ERROR
       end
       scan_file_memR = $fscanf(data_file_memR, "%x\n", readAdrExpected);
       scan_file_memR = $fscanf(data_file_memR, "%x\n", HRDATA);
-      #2;
       if (~equal(HADDR,readAdrExpected,4)) begin
         $display("%0t ps, instr %0d: HADDR does not equal readAdrExpected: %x, %x", $time, instrs, HADDR, readAdrExpected);
         `ERROR
@@ -209,7 +211,11 @@ module testbench_busybear();
         warningCount += 1;
         `ERROR
       end
+    end else if(dut.hart.MemRWM[1]) begin
+      $display("%x, %x, %x, %t", HADDR, dut.PCF, dut.HRDATA, $time);
+
     end
+
   end
 
   logic [`XLEN-1:0] writeDataExpected, writeAdrExpected;