github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-23 21:39:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

arbiter fixes

Browse source
This commit is contained in:
Blaise Tine 2024-08-12 20:08:08 -07:00
parent 14ae4b8c13
commit 6c1ee9bfea
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
hw/rtl/libs/VX_cyclic_arbiter.sv
View file

@ -30,6 +30,7 @@ module VX_cyclic_arbiter #(
`UNUSED_VAR (clk)
`UNUSED_VAR (reset)
`UNUSED_VAR (grant_ready)
assign grant_index = '0;
assign grant_onehot = requests;
@ -39,29 +40,35 @@ module VX_cyclic_arbiter #(
localparam IS_POW2 = (1 << LOG_NUM_REQS) == NUM_REQS;
wire [LOG_NUM_REQS-1:0] grant_index_um, grant_index_ql;
reg [LOG_NUM_REQS-1:0] grant_index_r;
always @(posedge clk) begin
if (reset) begin
grant_index_r <= '0;
end else begin
if (!IS_POW2 && grant_index_r == LOG_NUM_REQS'(NUM_REQS-1)) begin
end else if (grant_valid && grant_ready) begin
if (!IS_POW2 && grant_index_ql == LOG_NUM_REQS'(NUM_REQS-1)) begin
grant_index_r <= '0;
end else if (~grant_valid || grant_ready) begin
grant_index_r <= grant_index_r + LOG_NUM_REQS'(1);
end else begin
grant_index_r <= grant_index_ql + LOG_NUM_REQS'(1);
end
end
end
reg [NUM_REQS-1:0] grant_onehot_r;
always @(*) begin
grant_onehot_r = '0;
grant_onehot_r[grant_index_r] = 1'b1;
end
VX_priority_encoder #(
.N (NUM_REQS)
) priority_encoder (
.data_in (requests),
`UNUSED_PIN (onehot_out),
.index_out (grant_index_um),
`UNUSED_PIN (valid_out)
);
assign grant_index = grant_index_r;
assign grant_onehot = grant_onehot_r;
assign grant_valid = requests[grant_index_r];
assign grant_index_ql = requests[grant_index_r] ? grant_index_r : grant_index_um;
assign grant_index = grant_index_ql;
assign grant_onehot = NUM_REQS'(1) << grant_index_ql;
assign grant_valid = (| requests);
end

2
hw/rtl/libs/VX_generic_arbiter.sv
View file

@ -90,5 +90,7 @@ module VX_generic_arbiter #(
end
`RUNTIME_ASSERT ((~grant_valid || (requests[grant_index] != 0)), ("invalid arbiter grant!"))
endmodule
`TRACING_ON

2
hw/rtl/libs/VX_rr_arbiter.sv
View file

@ -459,7 +459,7 @@ module VX_rr_arbiter #(
grant_table[i] = 'x;
for (integer j = NUM_REQS-1; j >= 0; --j) begin
if (requests[(i+j+1) % NUM_REQS]) begin
grant_table[i] = LOG_NUM_REQS'(i+j+1);
grant_table[i] = LOG_NUM_REQS'((i+j+1) % NUM_REQS);
end
end
end