Fix IBusCachedPlugin Pass all dhrystone tests

src/main/scala/vexriscv/TestsWorkspace.scala

@@ -48,7 +48,7 @@ object TestsWorkspace {
               cpuDataWidth = 32,
               memDataWidth = 32,
               catchIllegalAccess = false,
-              catchAccessFault = false,
+              catchAccessFault = true,
               catchMemoryTranslationMiss = false,
               asyncTagMemory = false,
               twoCycleRam = false

src/main/scala/vexriscv/plugin/CsrPlugin.scala

@@ -379,7 +379,7 @@ class CsrPlugin(config : CsrPluginConfig) extends Plugin[VexRiscv] with Exceptio
         when(enable){
           fetcher.haltIt()
         }
-        val done = ! List(execute, memory, writeBack).map(_.arbitration.isValid).orR && fetcher.nextPc()._1
+        val done = ! List(execute, memory, writeBack).map(_.arbitration.isValid).orR && !fetcher.nextPc()._1
 //        val done = History(doneAsync, 0 to 0).andR
       }
 

src/main/scala/vexriscv/plugin/Fetcher.scala

@@ -27,9 +27,9 @@ abstract class IBusFetcherImpl(val catchAccessFault : Boolean,
   assert(cmdToRspStageCount >= 1)
   assert(!(compressedGen && !decodePcGen))
   var fetcherHalt : Bool = null
-  lazy val decodeNextPcValid = Bool
+  lazy val decodeNextPcValid = Bool //TODO remove me ?
   lazy val decodeNextPc = UInt(32 bits)
-  def nextPc() = (decodeNextPcValid, decodeNextPc)
+  def nextPc() = (False, decodeNextPc)
 
   var predictionJumpInterface : Flow[UInt] = null
 
@@ -230,7 +230,7 @@ abstract class IBusFetcherImpl(val catchAccessFault : Boolean,
       bufferValid clearWhen(output.fire)
       when(input.ready){
         when(input.valid) {
-          bufferValid := !(!isRvc && !input.pc(1) && !bufferValid) && !(isRvc && input.pc(1))
+          bufferValid := !(!isRvc && !input.pc(1) && !bufferValid) && !(isRvc && input.pc(1) && output.ready)
           bufferData := input.rsp.inst(31 downto 16)
         }
       }
@@ -238,18 +238,19 @@ abstract class IBusFetcherImpl(val catchAccessFault : Boolean,
       iBusRsp.readyForError.clearWhen(bufferValid && isRvc)
     })
 
+    //TODO never colalpse buble of the last stage
     def condApply[T](that : T, cond : Boolean)(func : (T) => T) = if(cond)func(that) else that
     val injector = new Area {
       val inputBeforeHalt = condApply(if(decodePcGen) decompressor.output else iBusRsp.output, injectorReadyCutGen)(_.s2mPipe(flush))
       if(injectorReadyCutGen) iBusRsp.readyForError.clearWhen(inputBeforeHalt.valid)
-      val decodeInput = if(injectorStage){
+      val decodeInput = (if(injectorStage){
-        val decodeInput = inputBeforeHalt.m2sPipeWithFlush(killLastStage)
+        val decodeInput = inputBeforeHalt.m2sPipeWithFlush(killLastStage, collapsBubble = false)
         decode.insert(INSTRUCTION_ANTICIPATED) := Mux(decode.arbitration.isStuck, decode.input(INSTRUCTION), inputBeforeHalt.rsp.inst)
         iBusRsp.readyForError.clearWhen(decodeInput.valid)
         decodeInput
       } else {
         inputBeforeHalt
-      }.haltWhen(fetcherHalt)
+      }).haltWhen(fetcherHalt)
 
       if(decodePcGen){
         decodeNextPcValid := True

src/main/scala/vexriscv/plugin/IBusCachedPlugin.scala

@@ -28,6 +28,7 @@ class IBusCachedPlugin(config : InstructionCacheConfig, memoryTranslatorPortConf
   var mmuBus : MemoryTranslatorBus = null
   var privilegeService : PrivilegeService = null
   var redoBranch : Flow[UInt] = null
+  var decodeExceptionPort : Flow[ExceptionCause] = null
 
   object FLUSH_ALL extends Stageable(Bool)
   object IBUS_ACCESS_ERROR extends Stageable(Bool)
@@ -50,10 +51,10 @@ class IBusCachedPlugin(config : InstructionCacheConfig, memoryTranslatorPortConf
 
     redoBranch = pipeline.service(classOf[JumpService]).createJumpInterface(pipeline.decode, priority = 1) //Priority 1 will win against branch predictor
 
-//    if(catchSomething) {
+    if(catchSomething) {
-//      val exceptionService = pipeline.service(classOf[ExceptionService])
+      val exceptionService = pipeline.service(classOf[ExceptionService])
-//      decodeExceptionPort = exceptionService.newExceptionPort(pipeline.decode,1)
+      decodeExceptionPort = exceptionService.newExceptionPort(pipeline.decode,1)
-//    }
+    }
 
 //    if(pipeline.serviceExist(classOf[MemoryTranslator]))
 //      ??? //TODO
@@ -82,6 +83,7 @@ class IBusCachedPlugin(config : InstructionCacheConfig, memoryTranslatorPortConf
     }
   }
 
+
   override def build(pipeline: VexRiscv): Unit = {
     import pipeline._
     import pipeline.config._
@@ -99,7 +101,7 @@ class IBusCachedPlugin(config : InstructionCacheConfig, memoryTranslatorPortConf
 
       //Connect fetch cache side
       cache.io.cpu.fetch.isValid := iBusRsp.inputPipeline(0).valid
-      cache.io.cpu.fetch.isStuck := !iBusRsp.inputPipeline(0).ready
+      cache.io.cpu.fetch.isStuck := !iBusRsp.input.ready
       cache.io.cpu.fetch.pc := iBusRsp.inputPipeline(0).payload
 
       if (mmuBus != null) {
@@ -114,15 +116,43 @@ class IBusCachedPlugin(config : InstructionCacheConfig, memoryTranslatorPortConf
         cache.io.cpu.fetch.mmuBus.rsp.miss := False
       }
 
-      val missHalt = cache.io.cpu.fetch.isValid && cache.io.cpu.fetch.cacheMiss
+//      val missHalt = cache.io.cpu.fetch.isValid && cache.io.cpu.fetch.cacheMiss
-      iBusRsp.outputBeforeStage.arbitrationFrom(iBusRsp.inputPipeline(0).haltWhen(missHalt))
+      var issueDetected = False
+
+      val redoFetch = False //RegNext(False) init(False)
+      when(cache.io.cpu.fetch.isValid && cache.io.cpu.fetch.cacheMiss && !issueDetected){
+        issueDetected \= True
+        redoFetch := iBusRsp.readyForError
+//        if(decodePcGen) {
+//          redoFetch := !flush && iBusRsp.readyForError
+//        } else {
+//          redoFetch := !flush && iBusRsp.readyForError
+//        }
+      }
+      cache.io.cpu.fill.valid  := redoFetch
+      redoBranch.valid   := redoFetch
+      assert(decodePcGen == compressedGen)
+      redoBranch.payload := (if(decodePcGen) decode.input(PC) else cache.io.cpu.fetch.pc)
+      cache.io.cpu.fill.payload := cache.io.cpu.fetch.pc
+
+      if(catchSomething){
+//        val missHalt = cache.io.cpu.fetch.isValid && cache.io.cpu.fetch.cacheMiss
+
+        decodeExceptionPort.valid := False
+        decodeExceptionPort.code  := 1
+        decodeExceptionPort.badAddr := cache.io.cpu.fetch.pc
+        when(cache.io.cpu.fetch.isValid && cache.io.cpu.fetch.error && !issueDetected){
+          issueDetected \= True
+          decodeExceptionPort.valid  := iBusRsp.readyForError
+        }
+      }
+
+
+      iBusRsp.outputBeforeStage.arbitrationFrom(iBusRsp.inputPipeline(0).haltWhen(issueDetected))
       iBusRsp.outputBeforeStage.rsp.inst := cache.io.cpu.fetch.data
       iBusRsp.outputBeforeStage.pc := iBusRsp.inputPipeline(0).payload
 
-      cache.io.cpu.fill.valid   := missHalt && iBusRsp.readyForError
+
-      cache.io.cpu.fill.payload := cache.io.cpu.fetch.pc
-      redoBranch.valid   := (RegNext(cache.io.cpu.fill.valid  && !flush) init(False))
-      redoBranch.payload := decode.input(PC)
 //      if (dataOnDecode) {
 //        decode.insert(INSTRUCTION) := cache.io.cpu.decode.data
 //      } else {

src/test/python/tool/disasm.s

@@ -1 +1 @@
-.word 0x301c63
+.word 0xc12083