[FORNEY] Flatten 2D errValAccumVec(i)(j) into 1D errValVec(idx).

egorman44 · Feb 13, 2025 · d757aa5 · d757aa5
1 parent 295c53a
commit d757aa5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/scala/Config/GfConfig.scala b/src/main/scala/Config/GfConfig.scala
@@ -210,6 +210,7 @@ case class Config(
   println(s"forneyErrEvalLatencyFull      = $forneyErrEvalLatencyFull")
   println(s"forneyEEXlInvTermsPerCycle    = $forneyEEXlInvTermsPerCycle")
   println(s"forneyEEXlInvShiftLatencyFull = $forneyEEXlInvShiftLatencyFull")
+  println(s"forneyEvTermsPerCycle         = $forneyEvTermsPerCycle")
   println(s"forneyEvFullLatency           = $forneyEvFullLatency")
   println(s"FdToEvLatencyAxisClk          = $FdToEvLatencyAxisClk")
   println(s"=== FIFO ENABLE ===")

diff --git a/src/main/scala/RsForney/ErrVal.scala b/src/main/scala/RsForney/ErrVal.scala
@@ -75,17 +75,25 @@ class ErrVal(c: Config) extends Module {
   val errValAccumVec = Reg(Vec(c.forneyEvShiftLatency, Vec(c.forneyEvTermsPerCycle, UInt(c.SYMB_WIDTH.W))))
   val errValVec = Wire(Vec(c.T_LEN, UInt(c.SYMB_WIDTH.W)))
 
+  // forneyEvTermsPerCycle = 2
+  // forneyEvShiftLatency = 4
+
   for(i <- 0 until c.forneyEvShiftLatency) {
     when(shiftMod.io.vecOut.valid){
       if(i == 0)
         errValAccumVec(c.forneyEvShiftLatency-1) := errValStageOut
       else
         errValAccumVec(c.forneyEvShiftLatency-1-i) := errValAccumVec(c.forneyEvShiftLatency-i)
     }
-    for(k <- 0 until c.forneyEvTermsPerCycle) {
-      if(i*c.forneyEvShiftLatency+k < c.T_LEN)
-        errValVec(i*c.forneyEvShiftLatency+k) := errValAccumVec(i)(k)
-    }
+  }
+
+  // Flatten 2D errValAccumVec(i)(j) into 1D errValVec(idx)
+  // where idx = i * c.forneyEvTermsPerCycle + j
+  for (idx <- 0 until c.T_LEN) {
+    // Compute row/col from idx
+    val i = idx / c.forneyEvTermsPerCycle
+    val j = idx % c.forneyEvTermsPerCycle
+    errValVec(idx) := errValAccumVec(i)(j)
   }
 
   ///////////////////////////////////