[Chien] Substitute ohToNum combo function with Mux1H.

egorman44 · May 8, 2024 · 389fcb8 · 389fcb8
1 parent 5bc0ece
commit 389fcb8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/src/main/scala/GfParams.scala b/src/main/scala/GfParams.scala
@@ -153,21 +153,7 @@ trait GfParams {
     else
       (rootsNum/rootsPerCycle).toInt + 1
   }
-
-  def ohToNum(ohPos: UInt, base: UInt) : UInt = {
-    val baseArray = Wire(Vec(chienRootsPerCycle, UInt(symbWidth.W)))
-    val baseArrayAndSel = Wire(Vec(chienRootsPerCycle, UInt(symbWidth.W)))
-    for(i <- 0 until chienRootsPerCycle) {
-      baseArray(i) := base + i.U
-      when(ohPos(i) === 1.U) {
-        baseArrayAndSel(i) := baseArray(i)
-      }.otherwise{
-        baseArrayAndSel(i) := 0.U
-      }
-    }
-    baseArrayAndSel.reduce(_ | _)
-  }
-
+
   //////////////////////////////
   // GF functions
   //////////////////////////////

diff --git a/src/main/scala/RsChien/RsChienBitPosToNum.scala b/src/main/scala/RsChien/RsChienBitPosToNum.scala
@@ -74,6 +74,10 @@ class RsChienBitPosToNum extends Module with GfParams {
   val stageCapt = Reg(Vec(tLen, new PosBaseVld))
 
   for(i <- 0 until tLen) {
+    val baseArray = Wire(Vec(chienRootsPerCycle, UInt(symbWidth.W)))
+    for(i <- 0 until chienRootsPerCycle) {
+      baseArray(i) := baseComb(i) + i.U
+    }
     when(captEn) {
       when(stageComb(i).io.lsbPos =/= 0) {
         stageCapt(i).valid := 1
@@ -83,7 +87,7 @@ class RsChienBitPosToNum extends Module with GfParams {
     }.otherwise{
       stageCapt(i).valid := 0
     }
-    io.posArray.pos(i) := nLen - 1 - ohToNum(stageCapt(i).pos, baseComb(i))
+    io.posArray.pos(i) := nLen - 1 - Mux1H(stageCapt(i).pos, baseArray)
   }
 
   io.posArray.sel := VecInit(stageCapt.map(_.valid)).asTypeOf(UInt(tLen.W))
@@ -114,5 +118,5 @@ class RsChienPosOh extends Module with GfParams {
   }
 
   io.lsbPosXor := io.bitPos ^ io.lsbPos
-  
+
 }