From 6ed41f7361d4ddb7ea4f3cb2804986a459e6c5b4 Mon Sep 17 00:00:00 2001 From: Charles Papon Date: Mon, 16 Sep 2019 13:53:55 +0200 Subject: [PATCH] Improve CSR FMax --- src/main/scala/vexriscv/plugin/CsrPlugin.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/scala/vexriscv/plugin/CsrPlugin.scala b/src/main/scala/vexriscv/plugin/CsrPlugin.scala index 5c7e032..b6b43ca 100644 --- a/src/main/scala/vexriscv/plugin/CsrPlugin.scala +++ b/src/main/scala/vexriscv/plugin/CsrPlugin.scala @@ -945,9 +945,14 @@ class CsrPlugin(val config: CsrPluginConfig) extends Plugin[VexRiscv] with Excep val readData = B(0, 32 bits) val writeInstruction = arbitration.isValid && input(IS_CSR) && input(CSR_WRITE_OPCODE) val readInstruction = arbitration.isValid && input(IS_CSR) && input(CSR_READ_OPCODE) - val writeEnable = writeInstruction && ! blockedBySideEffects && !arbitration.isStuckByOthers// && readDataRegValid - val readEnable = readInstruction && ! blockedBySideEffects && !arbitration.isStuckByOthers// && !readDataRegValid + val writeEnable = writeInstruction && ! blockedBySideEffects // && readDataRegValid + val readEnable = readInstruction && ! blockedBySideEffects // && !readDataRegValid //arbitration.isStuckByOthers, in case of the hazardPlugin is in the executeStage + val hazardStage = service(classOf[RegFileService]).readStage() + if(hazardStage == execute) when (arbitration.isStuckByOthers){ + writeEnable := False + readEnable := False + } // def readDataReg = memory.input(REGFILE_WRITE_DATA) //PIPE OPT