colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28 from Wren6991/fix-21 

Coding style change for Verilator compatibility (fixes #21)
This commit is contained in:
Luke Wren 2024-12-09 05:55:00 +00:00 committed by GitHub
parent 8272910121 c57e9f4c9b
commit 787da131a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hdl/hazard3_frontend.v
View File

@ -135,7 +135,6 @@ always @ (*) begin: boundary_conditions
fifo_mem[FIFO_DEPTH] = mem_data; fifo_mem[FIFO_DEPTH] = mem_data;
fifo_predbranch[FIFO_DEPTH] = 2'b00; fifo_predbranch[FIFO_DEPTH] = 2'b00;
fifo_err[FIFO_DEPTH] = 1'b0; fifo_err[FIFO_DEPTH] = 1'b0;
fifo_valid_hw[FIFO_DEPTH] = 2'b00;
for (i = 0; i < FIFO_DEPTH; i = i + 1) begin for (i = 0; i < FIFO_DEPTH; i = i + 1) begin
fifo_valid[i] = |EXTENSION_C ? |fifo_valid_hw[i] : fifo_valid_hw[i][0]; fifo_valid[i] = |EXTENSION_C ? |fifo_valid_hw[i] : fifo_valid_hw[i][0];
// valid-to-right condition: i == 0 || fifo_valid[i - 1], but without // valid-to-right condition: i == 0 || fifo_valid[i - 1], but without
@ -158,6 +157,10 @@ always @ (posedge clk or negedge rst_n) begin: fifo_update
fifo_err[i] <= 1'b0; fifo_err[i] <= 1'b0;
fifo_predbranch[i] <= 2'b00; fifo_predbranch[i] <= 2'b00;
end end
// This exists only for loop boundary conditions, but is tied off in
// this synchronous process to work around a Verilator scheduling
// issue (see issue #21)
fifo_valid_hw[FIFO_DEPTH] <= 2'b00;
end else begin end else begin
for (i = 0; i < FIFO_DEPTH; i = i + 1) begin for (i = 0; i < FIFO_DEPTH; i = i + 1) begin
if (fifo_pop || (fifo_push && !fifo_valid[i])) begin if (fifo_pop || (fifo_push && !fifo_valid[i])) begin
@ -183,6 +186,7 @@ always @ (posedge clk or negedge rst_n) begin: fifo_update
fifo_predbranch[0] <= 2'b00; fifo_predbranch[0] <= 2'b00;
fifo_valid_hw[0] <= jump_now ? 2'b00 : 2'b11; fifo_valid_hw[0] <= jump_now ? 2'b00 : 2'b11;
end end
fifo_valid_hw[FIFO_DEPTH] <= 2'b00;
`ifdef HAZARD3_ASSERTIONS `ifdef HAZARD3_ASSERTIONS
// FIFO validity must be compact, so we can always consume from the end // FIFO validity must be compact, so we can always consume from the end
if (!fifo_valid[0]) begin if (!fifo_valid[0]) begin