Merge pull request #432 from riscv-boom/pipeview-fix

[fetch] fix pipeview
riscv-boom · Jan 23, 2020 · 7ba342a · 7ba342a
2 parents 834e179 + 117d30b
commit 7ba342a
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/main/scala/ifu/fetch-control-unit.scala b/src/main/scala/ifu/fetch-control-unit.scala
@@ -500,6 +500,15 @@ class FetchControlUnit(implicit p: Parameters) extends BoomModule
   //-------------------------------------------------------------
 
   when (f3_fire) {
+    for (i <- 0 until fetchWidth) {
+      if (i == 0) {
+        f3_fetch_bundle.debug_events(i).fetch_seq := fseq_reg
+      } else {
+        f3_fetch_bundle.debug_events(i).fetch_seq := fseq_reg +
+          PopCount(f3_fetch_bundle.mask.asUInt()(i-1,0))
+      }
+    }
+
     r_f4_req := f3_req
     r_f4_fetchpc := f3_imemresp.pc
     r_f4_taken := f3_taken
@@ -525,14 +534,6 @@ class FetchControlUnit(implicit p: Parameters) extends BoomModule
   fb.io.status := io.status
   fb.io.bp     := io.bp
 
-  for (i <- 0 until fetchWidth) {
-    if (i == 0) {
-      fb.io.enq.bits.debug_events(i).fetch_seq := fseq_reg
-    } else {
-      fb.io.enq.bits.debug_events(i).fetch_seq := fseq_reg +
-        PopCount(f3_fetch_bundle.mask.asUInt()(i-1,0))
-    }
-  }
 
   //-------------------------------------------------------------
   // **** FetchTargetQueue ****