github-mirrors/cva6
1
0
Fork 0
mirror of https://github.com/openhwgroup/cva6.git synced 2025-06-28 01:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix NonImdempotent and speculation condition on WAIT_OBI (#2482)

Browse source
This commit is contained in:
Yannick Casamatta 2024-08-30 16:08:45 +02:00 • committed by GitHub
parent 2a0e8119a7
commit 505b9b727d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/frontend/frontend.sv
View file

@ -466,7 +466,7 @@ module frontend
obi_vaddr_d = vaddr_d; obi_vaddr_d = vaddr_d;
data_valid_under_ex = '1; data_valid_under_ex = '1;
custom_state_d = WAIT_FLUSH; custom_state_d = WAIT_FLUSH;
end else if (obi_a_ready && spec_req_non_idempot) begin end else if (obi_a_ready && !spec_req_non_idempot) begin
obi_a_req = '1; obi_a_req = '1;
obi_vaddr_d = vaddr_d; obi_vaddr_d = vaddr_d;
vaddr_d = npc_fetch_address; vaddr_d = npc_fetch_address;
@ -517,7 +517,7 @@ module frontend
end else begin end else begin
custom_state_d = WAIT_NEW_REQ; custom_state_d = WAIT_NEW_REQ;
end end
end else if (obi_a_ready && spec_req_non_idempot) begin end else if (obi_a_ready && !spec_req_non_idempot) begin
obi_a_req = '1; obi_a_req = '1;
obi_vaddr_d = vaddr_d; obi_vaddr_d = vaddr_d;
vaddr_d = npc_fetch_address; vaddr_d = npc_fetch_address;
@ -731,7 +731,7 @@ module frontend
logic speculative_q, speculative_d; logic speculative_q, speculative_d;
assign speculative_d = (speculative_q && !resolved_branch_i.valid || |is_branch || |is_return || |is_jalr) && !flush_i; assign speculative_d = (speculative_q && !resolved_branch_i.valid || |is_branch || |is_return || |is_jalr) && !flush_i;
assign spec_req_non_idempot = (speculative_d || ((CVA6Cfg.NonIdemPotenceEn && !paddr_nonidempotent) || (!CVA6Cfg.NonIdemPotenceEn))); assign spec_req_non_idempot = CVA6Cfg.NonIdemPotenceEn ? speculative_d && paddr_nonidempotent : 1'b0;
assign bht_update.valid = resolved_branch_i.valid assign bht_update.valid = resolved_branch_i.valid