fix performance counter csr write hazard

SpinalHDL · Feb 6, 2024 · 3c3be46 · 3c3be46
1 parent e956ca0
commit 3c3be46
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/scala/vexiiriscv/misc/PerformanceCounterPlugin.scala b/src/main/scala/vexiiriscv/misc/PerformanceCounterPlugin.scala
@@ -151,7 +151,9 @@ class PerformanceCounterPlugin(var additionalCounterCount : Int,
       IDLE whenIsActive{
         holdCsrWrite := False
         cmd.oh := B(for (c <- counters.list) yield idleCsrAddress === c.counterId)
-        when(flusherCmd.valid){
+        when(csrWriteCmd.valid) {
+          goto(CSR_WRITE)
+        }elsewhen(flusherCmd.valid){
           cmd.flusher := True
           cmd.oh := flusherCmd.oh
           flusherCmd.ready := True
@@ -160,8 +162,6 @@ class PerformanceCounterPlugin(var additionalCounterCount : Int,
           cmd.flusher := False
           csrReadCmd.ready := True
           goto(READ_LOW)
-        } elsewhen(csrWriteCmd.valid){
-          goto(CSR_WRITE)
         }
         carry := False
       }