Xavi/cvw
1
0
Fork 0
forked from Github_Repos/cvw
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update busybear testbench to conform to new structure

Browse Source
This commit is contained in:
Noah Boorstin 2021-01-27 12:54:09 -05:00
parent 616afaba69
commit c9baa70e26
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
wally-pipelined/regression/wally-busybear.do
View File

@ -42,8 +42,8 @@ add wave /testbench_busybear/reset
add wave -divider add wave -divider
add wave -hex /testbench_busybear/PCtext add wave -hex /testbench_busybear/PCtext
add wave -hex /testbench_busybear/pcExpected add wave -hex /testbench_busybear/pcExpected
add wave -hex /testbench_busybear/dut/dp/PCF add wave -hex /testbench_busybear/dut/ieu/dp/PCF
add wave -hex /testbench_busybear/dut/dp/InstrF add wave -hex /testbench_busybear/dut/ieu/dp/InstrF
add wave /testbench_busybear/lastInstrF add wave /testbench_busybear/lastInstrF
add wave /testbench_busybear/speculative add wave /testbench_busybear/speculative
add wave /testbench_busybear/lastPC2 add wave /testbench_busybear/lastPC2
@ -55,63 +55,63 @@ add wave -hex /testbench_busybear/MemRWM[1]
add wave -hex /testbench_busybear/ByteMaskM add wave -hex /testbench_busybear/ByteMaskM
add wave -hex /testbench_busybear/WriteDataM add wave -hex /testbench_busybear/WriteDataM
add wave -hex /testbench_busybear/DataAdrM add wave -hex /testbench_busybear/DataAdrM
add wave -hex /testbench_busybear/dut/dp/regf/rf[1] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[1]
add wave -hex /testbench_busybear/dut/dp/regf/rf[2] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[2]
add wave -hex /testbench_busybear/dut/dp/regf/rf[3] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[3]
add wave -hex /testbench_busybear/dut/dp/regf/rf[4] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[4]
add wave -hex /testbench_busybear/dut/dp/regf/rf[5] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[5]
add wave -hex /testbench_busybear/dut/dp/regf/rf[6] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[6]
add wave -hex /testbench_busybear/dut/dp/regf/rf[7] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[7]
add wave -hex /testbench_busybear/dut/dp/regf/rf[8] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[8]
add wave -hex /testbench_busybear/dut/dp/regf/rf[9] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[9]
add wave -hex /testbench_busybear/dut/dp/regf/rf[10] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[10]
add wave -hex /testbench_busybear/dut/dp/regf/rf[11] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[11]
add wave -hex /testbench_busybear/dut/dp/regf/rf[12] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[12]
add wave -hex /testbench_busybear/dut/dp/regf/rf[13] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[13]
add wave -hex /testbench_busybear/dut/dp/regf/rf[14] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[14]
add wave -hex /testbench_busybear/dut/dp/regf/rf[15] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[15]
add wave -hex /testbench_busybear/dut/dp/regf/rf[16] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[16]
add wave -hex /testbench_busybear/dut/dp/regf/rf[17] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[17]
add wave -hex /testbench_busybear/dut/dp/regf/rf[18] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[18]
add wave -hex /testbench_busybear/dut/dp/regf/rf[19] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[19]
add wave -hex /testbench_busybear/dut/dp/regf/rf[20] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[20]
add wave -hex /testbench_busybear/dut/dp/regf/rf[21] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[21]
add wave -hex /testbench_busybear/dut/dp/regf/rf[22] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[22]
add wave -hex /testbench_busybear/dut/dp/regf/rf[23] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[23]
add wave -hex /testbench_busybear/dut/dp/regf/rf[24] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[24]
add wave -hex /testbench_busybear/dut/dp/regf/rf[25] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[25]
add wave -hex /testbench_busybear/dut/dp/regf/rf[26] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[26]
add wave -hex /testbench_busybear/dut/dp/regf/rf[27] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[27]
add wave -hex /testbench_busybear/dut/dp/regf/rf[28] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[28]
add wave -hex /testbench_busybear/dut/dp/regf/rf[29] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[29]
add wave -hex /testbench_busybear/dut/dp/regf/rf[30] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[30]
add wave -hex /testbench_busybear/dut/dp/regf/rf[31] add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[31]
add wave /testbench_busybear/InstrFName add wave /testbench_busybear/InstrFName
add wave -hex /testbench_busybear/dut/dp/PCD add wave -hex /testbench_busybear/dut/ieu/dp/PCD
#add wave -hex /testbench_busybear/dut/dp/InstrD #add wave -hex /testbench_busybear/dut/ieu/dp/InstrD
add wave /testbench_busybear/InstrDName add wave /testbench_busybear/InstrDName
#add wave -divider #add wave -divider
add wave -hex /testbench_busybear/dut/dp/PCE add wave -hex /testbench_busybear/dut/ieu/dp/PCE
##add wave -hex /testbench_busybear/dut/dp/InstrE ##add wave -hex /testbench_busybear/dut/ieu/dp/InstrE
add wave /testbench_busybear/InstrEName add wave /testbench_busybear/InstrEName
#add wave -hex /testbench_busybear/dut/dp/SrcAE #add wave -hex /testbench_busybear/dut/ieu/dp/SrcAE
#add wave -hex /testbench_busybear/dut/dp/SrcBE #add wave -hex /testbench_busybear/dut/ieu/dp/SrcBE
add wave -hex /testbench_busybear/dut/dp/ALUResultE add wave -hex /testbench_busybear/dut/ieu/dp/ALUResultE
#add wave /testbench_busybear/dut/dp/PCSrcE #add wave /testbench_busybear/dut/ieu/dp/PCSrcE
#add wave -divider #add wave -divider
add wave -hex /testbench_busybear/dut/dp/PCM add wave -hex /testbench_busybear/dut/ieu/dp/PCM
##add wave -hex /testbench_busybear/dut/dp/InstrM ##add wave -hex /testbench_busybear/dut/ieu/dp/InstrM
add wave /testbench_busybear/InstrMName add wave /testbench_busybear/InstrMName
#add wave /testbench_busybear/dut/dmem/dtim/memwrite #add wave /testbench_busybear/dut/dmem/dtim/memwrite
#add wave -hex /testbench_busybear/dut/dmem/AdrM #add wave -hex /testbench_busybear/dut/dmem/AdrM
#add wave -hex /testbench_busybear/dut/dmem/WriteDataM #add wave -hex /testbench_busybear/dut/dmem/WriteDataM
#add wave -divider #add wave -divider
add wave -hex /testbench_busybear/dut/dp/PCW add wave -hex /testbench_busybear/dut/ieu/dp/PCW
##add wave -hex /testbench_busybear/dut/dp/InstrW ##add wave -hex /testbench_busybear/dut/ieu/dp/InstrW
add wave /testbench_busybear/InstrWName add wave /testbench_busybear/InstrWName
#add wave /testbench_busybear/dut/dp/RegWriteW #add wave /testbench_busybear/dut/ieu/dp/RegWriteW
#add wave -hex /testbench_busybear/dut/dp/ResultW #add wave -hex /testbench_busybear/dut/ieu/dp/ResultW
#add wave -hex /testbench_busybear/dut/dp/RdW #add wave -hex /testbench_busybear/dut/ieu/dp/RdW
#add wave -divider #add wave -divider
##add ww ##add ww
#add wave -hex -r /testbench_busybear/* #add wave -hex -r /testbench_busybear/*

8
wally-pipelined/testbench/testbench-busybear.sv
View File

@ -76,7 +76,7 @@ module testbench_busybear();
genvar i; genvar i;
generate generate
for(i=1; i<32; i++) begin for(i=1; i<32; i++) begin
assign rf[i*64+63:i*64] = dut.dp.regf.rf[i]; assign rf[i*64+63:i*64] = dut.ieu.dp.regf.rf[i];
end end
endgenerate endgenerate
@ -174,9 +174,9 @@ module testbench_busybear();
string InstrFName, InstrDName, InstrEName, InstrMName, InstrWName; string InstrFName, InstrDName, InstrEName, InstrMName, InstrWName;
logic [31:0] InstrW; logic [31:0] InstrW;
instrNameDecTB dec(InstrF, InstrFName); instrNameDecTB dec(InstrF, InstrFName);
instrTrackerTB it(clk, reset, dut.dp.FlushE, instrTrackerTB it(clk, reset, dut.ieu.dp.FlushE,
dut.dp.InstrDecompD, dut.dp.InstrE, dut.ieu.dp.InstrDecompD, dut.ieu.dp.InstrE,
dut.dp.InstrM, InstrW, dut.ieu.dp.InstrM, InstrW,
InstrDName, InstrEName, InstrMName, InstrWName); InstrDName, InstrEName, InstrMName, InstrWName);
// generate clock to sequence tests // generate clock to sequence tests