Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to support vectored RVFI_DII bridge directly, which enables us to successfully run memory tests with traps.

Browse Source
This commit is contained in:
Jonathan Woodruff
2019-12-09 16:34:27 +00:00
parent b79a11b44d
commit 82ba66b15e
9 changed files with 288 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src_Testbench/SoC/SoC_Top.bsv
View File

@@ -72,7 +72,7 @@ import TV_Info :: *;
`endif
`ifdef RVFI_DII
import RVFI_DII :: *;
import RVFI_DII_Types :: *;
import Types :: *;
`endif

12
src_Testbench/Top/Top_HW_Side.bsv
View File

@@ -31,6 +31,8 @@ package Top_HW_Side;
// ================================================================
// BSV lib imports
`include "ProcConfig.bsv"
import GetPut :: *;
import ClientServer :: *;
import Connectable :: *;
@@ -300,6 +302,7 @@ endmodule
(* synthesize *)
module mkTop_HW_Side(Empty)
provisos (Add#(a__, TDiv#(DataSz,8), 8), Add#(b__, DataSz, 64), Add#(c__, TDiv#(DataSz,8), 8), Add#(d__, DataSz, 64));
Reg #(Bool) rg_banner_printed <- mkReg (False);
@@ -314,15 +317,14 @@ module mkTop_HW_Side(Empty)
rg_banner_printed <= True;
endrule
RVFI_DII_Bridge #(DataSz, DataSz, SEQ_LEN) bridge <- mkRVFI_DII_Bridge("", 5001);
RVFI_DII_Bridge #(DataSz, DataSz, `sizeSup) bridge <- mkRVFI_DII_Bridge("", 5001);
let dut <- mkPre_Top_HW_Side(reset_by bridge.new_rst);
mkConnection(bridge.client.report, dut.trace_report);
(* descending_urgency = "bridge.handleReset, rl_provide_instr" *)
rule rl_provide_instr;
Dii_Id req <- dut.seqReq.get;
Bit#(32) inst <- bridge.client.getInst(req);
dut.inst.put(tuple2(inst, req));
Dii_Ids reqs <- dut.seqReq.get;
Dii_Insts insts <- bridge.client.getInst(reqs);
dut.inst.put(InstsAndIDs{insts: insts, ids: reqs});
endrule
endmodule