Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix BranchPlugin when SRC can have hazard in execute stage

This commit is contained in:
Charles Papon 2019-06-09 20:15:36 +02:00
parent af0755d8cf
commit 5243e46ffb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/vexriscv/plugin/BranchPlugin.scala
View File

@ -84,6 +84,8 @@ class BranchPlugin(earlyBranch : Boolean,
decodePrediction
}
def hasHazardOnBranch = if(earlyBranch) pipeline.service(classOf[HazardService]).hazardOnExecuteRS else False
override def setup(pipeline: VexRiscv): Unit = {
import Riscv._
import pipeline.config._
@ -200,7 +202,7 @@ class BranchPlugin(earlyBranch : Boolean,
//Apply branchs (JAL,JALR, Bxx)
branchStage plug new Area {
import branchStage._
jumpInterface.valid := arbitration.isValid && input(BRANCH_DO)
jumpInterface.valid := arbitration.isValid && input(BRANCH_DO) && !hasHazardOnBranch
jumpInterface.payload := input(BRANCH_CALC)
when(jumpInterface.valid && !arbitration.isStuckByOthers) {
@ -282,7 +284,7 @@ class BranchPlugin(earlyBranch : Boolean,
val branchStage = if(earlyBranch) execute else memory
branchStage plug new Area {
import branchStage._
jumpInterface.valid := arbitration.isValid && input(BRANCH_DO)
jumpInterface.valid := arbitration.isValid && input(BRANCH_DO) && !hasHazardOnBranch
jumpInterface.payload := input(BRANCH_CALC)
when(jumpInterface.valid && !arbitration.isStuckByOthers) {
@ -361,7 +363,7 @@ class BranchPlugin(earlyBranch : Boolean,
input(PC)
}
jumpInterface.valid := arbitration.isValid && predictionMissmatch //Probably just isValid instead of isFiring is better
jumpInterface.valid := arbitration.isValid && predictionMissmatch && !hasHazardOnBranch
jumpInterface.payload := (input(BRANCH_DO) ? input(BRANCH_CALC) | input(NEXT_PC))

2
src/main/scala/vexriscv/plugin/HazardSimplePlugin.scala
View File

@ -19,7 +19,7 @@ class HazardSimplePlugin(bypassExecute : Boolean = false,
def hazardOnExecuteRS = {
if(pipeline.service(classOf[RegFileService]).readStage() == pipeline.execute) pipeline.execute.arbitration.isStuckByOthers else False
if(pipeline.service(classOf[RegFileService]).readStage() == pipeline.execute) pipeline.execute.arbitration.isStuckByOthers else False //TODO not so nice
}
override def setup(pipeline: VexRiscv): Unit = {