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

Tweak to workaround internal bsc compiler error

Browse Source
This commit is contained in:
rsnikhil
2019-04-10 10:36:38 -04:00
parent 5d69e3b178
commit 905583fac9
3 changed files with 1288 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2531
builds/RV64ADFIMSU_Toooba_verilator/Verilog_RTL/mkCore.v
View File

File diff suppressed because it is too large Load Diff

60
builds/RV64ADFIMSU_Toooba_verilator/Verilog_RTL/mkProc.v
View File

@@ -4746,15 +4746,6 @@ module mkProc(CLK,
.amoExec_upper_32_bits(mmioPlatform_reqBE_BIT_4___h27543 && .amoExec_upper_32_bits(mmioPlatform_reqBE_BIT_4___h27543 &&
!mmioPlatform_reqBE_BIT_0___h27583), !mmioPlatform_reqBE_BIT_0___h27583),
.amoExec(x__h32477)); .amoExec(x__h32477));
module_amoExec instance_amoExec_3(.amoExec_amo_inst({ mmioPlatform_reqFunc[3:0],
mmioPlatform_reqBE_BIT_4___h27543 &&
mmioPlatform_reqBE_BIT_0___h27583,
2'd0 }),
.amoExec_current_data(64'd0),
.amoExec_in_data(mmioPlatform_reqData__h46242),
.amoExec_upper_32_bits(mmioPlatform_reqBE_BIT_4___h27543 &&
!mmioPlatform_reqBE_BIT_0___h27583),
.amoExec(x__h40515));
module_amoExec instance_amoExec_2(.amoExec_amo_inst({ mmioPlatform_reqFunc[3:0], module_amoExec instance_amoExec_2(.amoExec_amo_inst({ mmioPlatform_reqFunc[3:0],
mmioPlatform_reqBE_BIT_4___h27543 && mmioPlatform_reqBE_BIT_4___h27543 &&
mmioPlatform_reqBE_BIT_0___h27583, mmioPlatform_reqBE_BIT_0___h27583,
@@ -4764,6 +4755,15 @@ module mkProc(CLK,
.amoExec_upper_32_bits(mmioPlatform_reqBE_BIT_4___h27543 && .amoExec_upper_32_bits(mmioPlatform_reqBE_BIT_4___h27543 &&
!mmioPlatform_reqBE_BIT_0___h27583), !mmioPlatform_reqBE_BIT_0___h27583),
.amoExec(x__h38422)); .amoExec(x__h38422));
module_amoExec instance_amoExec_3(.amoExec_amo_inst({ mmioPlatform_reqFunc[3:0],
mmioPlatform_reqBE_BIT_4___h27543 &&
mmioPlatform_reqBE_BIT_0___h27583,
2'd0 }),
.amoExec_current_data(64'd0),
.amoExec_in_data(mmioPlatform_reqData__h46242),
.amoExec_upper_32_bits(mmioPlatform_reqBE_BIT_4___h27543 &&
!mmioPlatform_reqBE_BIT_0___h27583),
.amoExec(x__h40515));
assign DONTCARE_CONCAT_IF_mmioPlatform_reqFunc_99_BIT_ETC___d643 = assign DONTCARE_CONCAT_IF_mmioPlatform_reqFunc_99_BIT_ETC___d643 =
{ 1'h0, { 1'h0,
(mmioPlatform_reqFunc[5:4] == 2'd2) ? (mmioPlatform_reqFunc[5:4] == 2'd2) ?
@@ -5627,6 +5627,27 @@ module mkProc(CLK,
3'd7: strb8__h125585 = llc$to_mem_toM_first[575:568]; 3'd7: strb8__h125585 = llc$to_mem_toM_first[575:568];
endcase endcase
end end
always@(mmioPlatform_curReq or
result__h46066 or
result__h46094 or result__h46122 or result__h46150)
begin
case (mmioPlatform_curReq[2:0])
3'h0:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46066;
3'h2:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46094;
3'h4:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46122;
3'h6:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46150;
default: IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
64'd0;
endcase
end
always@(mmioPlatform_curReq or always@(mmioPlatform_curReq or
result__h45825 or result__h45825 or
result__h45853 or result__h45853 or
@@ -5662,27 +5683,6 @@ module mkProc(CLK,
result__h46021; result__h46021;
endcase endcase
end end
always@(mmioPlatform_curReq or
result__h46066 or
result__h46094 or result__h46122 or result__h46150)
begin
case (mmioPlatform_curReq[2:0])
3'h0:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46066;
3'h2:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46094;
3'h4:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46122;
3'h6:
IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
result__h46150;
default: IF_mmioPlatform_curReq_94_BITS_2_TO_0_45_EQ_0x_ETC___d786 =
64'd0;
endcase
end
always@(mmioPlatform_curReq or result__h46191 or result__h46219) always@(mmioPlatform_curReq or result__h46191 or result__h46219)
begin begin
case (mmioPlatform_curReq[2:0]) case (mmioPlatform_curReq[2:0])

2
src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv
View File

@@ -126,7 +126,7 @@ module mkCommitStage#(CommitInput inIfc)(CommitStage);
Bool verbose = False; Bool verbose = False;
// Bluespec: for lightweight verbosity trace // Bluespec: for lightweight verbosity trace
Integer verbosity = 0; Integer verbosity = 1;
Reg #(Bit #(64)) rg_instret <- mkReg (0); Reg #(Bit #(64)) rg_instret <- mkReg (0);
// func units // func units