Skip to content

[hardware] 🐛 Fix vrgather deadlock on staggered lane handshakes #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emiliengnr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[hardware] 🐛 Fix vrgather deadlock on staggered lane handshakes #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Force cheshire's sim scripts re-generation
- Fix u-boot to support RVV-linux
- Fixed src emul check for vector integer extension operation
- Fix vrgather deadlock when the lanes accept the broadcast index request on different cycles

### Added

Expand Down
15 changes: 8 additions & 7 deletions hardware/src/masku/masku.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,15 +556,16 @@ module masku import ara_pkg::*; import rvv_pkg::*; #(
for (int lane = 0; lane < NrLanes; lane++) begin
// Valid address request if the address fifo is not empty and if the valid is not masked
masku_vrgat_req_valid_o[lane] = ~vrgat_req_fifo_empty & ~vrgat_req_valid_mask_q[lane];
// Mask the next valid on this lane if the lane is handshaking
vrgat_req_valid_mask_d[lane] = masku_vrgat_req_ready_i[lane];
// Mask the next valid on this lane once it has actually handshaked (valid and ready), held until the request pops
if (masku_vrgat_req_valid_o[lane] & masku_vrgat_req_ready_i[lane])
vrgat_req_valid_mask_d[lane] = 1'b1;
end

// Don't mask if all the lanes have handshaked
if (&masku_vrgat_req_ready_i) vrgat_req_valid_mask_d = '0;

// Pop the current address if all the lanes have handshaked it
if (&(masku_vrgat_req_ready_i | vrgat_req_valid_mask_q) && ~vrgat_req_fifo_empty) vrgat_req_fifo_pop = 1'b1;
// Pop the current address once every lane has handshaked it, then release the mask for the next request
if (&vrgat_req_valid_mask_d && ~vrgat_req_fifo_empty) begin
vrgat_req_fifo_pop = 1'b1;
vrgat_req_valid_mask_d = '0;
end
end

// Overflow after 16-bits
Expand Down