Skip to content
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

fix(redirect): fix the blockCommit condition #3992

Merged
merged 1 commit into from
Dec 7, 2024
Merged

fix(redirect): fix the blockCommit condition #3992

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
4 changes: 3 additions & 1 deletion src/main/scala/xiangshan/backend/rob/Rob.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,9 @@ class RobImp(override val wrapper: Rob)(implicit p: Parameters, params: BackendP
val deqFlushBlockCounter = Reg(UInt(3.W))
val deqFlushBlock = deqFlushBlockCounter(0)
val deqHasCommitted = io.commits.isCommit && io.commits.commitValid(0)
val deqHitRedirectReg = RegNext(io.redirect.valid && io.redirect.bits.robIdx === deqPtr)
// TODO *** WARNING ***
// Blocking commit. Don't change this before we fully understand the logic.
val deqHitRedirectReg = RegNext(io.redirect.valid && io.redirect.bits.robIdx === deqPtr) || RegNext(RegNext(io.redirect.valid && io.redirect.bits.robIdx === deqPtr))
val criticalErrorState = io.csr.criticalErrorState
when(deqNeedFlush && deqHitRedirectReg){
deqFlushBlockCounter := "b111".U
Expand Down
Loading