Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

read from MSTATUS workaround because QEMU has incorrect MSTATUS

Browse Source
This commit is contained in:
bbracker 2021-06-20 10:11:39 -04:00
parent 14ae87ff0a
commit 2643130c41
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wally-pipelined/regression/regression-wally.py
View File

@ -31,7 +31,7 @@ configs = [
TestCase( TestCase(
name="buildroot", name="buildroot",
cmd="vsim -do wally-buildroot-batch.do -c > {}", cmd="vsim -do wally-buildroot-batch.do -c > {}",
grepstr="# loaded 600000 instructions" grepstr="# loaded 2000000 instructions"
), ),
TestCase( TestCase(
name="rv32ic", name="rv32ic",

7
wally-pipelined/testbench/testbench-linux.sv
View File

@ -49,7 +49,7 @@ module testbench();
logic ignoreRFwrite; logic ignoreRFwrite;
parameter waveOnICount = 690000; // # of instructions at which to turn on waves in graphical sim parameter waveOnICount = 2060000; // # of instructions at which to turn on waves in graphical sim
assign GPIOPinsIn = 0; assign GPIOPinsIn = 0;
assign UARTSin = 1; assign UARTSin = 1;
@ -498,6 +498,9 @@ module testbench();
scan_file_rf = $fscanf(data_file_rf, "%d\n", regNumExpected); scan_file_rf = $fscanf(data_file_rf, "%d\n", regNumExpected);
scan_file_rf = $fscanf(data_file_rf, "%x\n", regExpected); scan_file_rf = $fscanf(data_file_rf, "%x\n", regExpected);
force dut.hart.ieu.dp.regf.wd3 = regExpected; force dut.hart.ieu.dp.regf.wd3 = regExpected;
// Hack to compensate for QEMU's incorrect MSTATUS
end else if (PCtextW.substr(0,3) == "csrr" && PCtextW.substr(10,16) == "mstatus") begin
force dut.hart.ieu.dp.regf.wd3 = dut.hart.ieu.dp.WriteDataW & ~64'ha00000000;
end else end else
release dut.hart.ieu.dp.regf.wd3; release dut.hart.ieu.dp.regf.wd3;
end end
@ -590,7 +593,7 @@ module testbench();
scan_file_PC = $fscanf(data_file_PC, "%x\n", pcExpected); scan_file_PC = $fscanf(data_file_PC, "%x\n", pcExpected);
if (instrs <= 10 || (instrs <= 100 && instrs % 10 == 0) || if (instrs <= 10 || (instrs <= 100 && instrs % 10 == 0) ||
(instrs <= 1000 && instrs % 100 == 0) || (instrs <= 10000 && instrs % 1000 == 0) || (instrs <= 1000 && instrs % 100 == 0) || (instrs <= 10000 && instrs % 1000 == 0) ||
(instrs <= 100000 && instrs % 10000 == 0) || (instrs <= 1000000 && instrs % 100000 == 0)) begin (instrs <= 100000 && instrs % 10000 == 0) || (instrs % 100000 == 0)) begin
$display("loaded %0d instructions", instrs); $display("loaded %0d instructions", instrs);
end end
if (instrs == waveOnICount) begin if (instrs == waveOnICount) begin