Make separate param for response depth queue

This is not necessarily the same as NUM_NEW_IDS, the latter determines
the inflight coalescing table size but not the response queues.

src/main/scala/tilelink/Coalescing.scala

@@ -36,38 +36,40 @@ object DefaultInFlightTableSizeEnum extends InFlightTableSizeEnum {
 }
 
 case class CoalescerConfig(
-  MAX_SIZE: Int,       // maximum burst size (64 bytes)
+  NUM_LANES: Int,        // number of lanes (or threads) in a warp
-  QUEUE_DEPTH: Int,    // request window per lane
+  MAX_SIZE: Int,         // maximum burst size (64 bytes)
-  WAIT_TIMEOUT: Int,   // max cycles to wait before forced fifo dequeue, per lane
+  QUEUE_DEPTH: Int,      // request window per lane
-  ADDR_WIDTH: Int,     // assume <= 32
+  WAIT_TIMEOUT: Int,     // max cycles to wait before forced fifo dequeue, per lane
-  DATA_BUS_SIZE: Int,  // 2^4=16 bytes, 128 bit bus
+  ADDR_WIDTH: Int,       // assume <= 32
-  NUM_LANES: Int,
+  DATA_BUS_SIZE: Int,    // memory-side downstream TileLink data bus size
+                         // this has to be at least larger than the word size for
+                         // the coalescer to perform well
   // WATERMARK = 2,      // minimum buffer occupancy to start coalescing
-  WORD_SIZE: Int,      // 32-bit system
+  WORD_SIZE: Int,        // 32-bit system
-  WORD_WIDTH: Int,     // log(WORD_SIZE)
+  WORD_WIDTH: Int,       // log(WORD_SIZE)
-  NUM_OLD_IDS: Int,    // num of outstanding requests per lane, from processor
+  NUM_OLD_IDS: Int,      // num of outstanding requests per lane, from processor
-  NUM_NEW_IDS: Int,    // num of outstanding coalesced requests
+  NUM_NEW_IDS: Int,      // num of outstanding coalesced requests
+  RESP_QUEUE_DEPTH: Int, // depth of the response fifo queues
   COAL_SIZES: Seq[Int],
-  SizeEnum: InFlightTableSizeEnum
+  sizeEnum: InFlightTableSizeEnum
 )
 
 object defaultConfig extends CoalescerConfig(
+  NUM_LANES = 32,
   // TODO: bigger size
-  MAX_SIZE = 3,       // maximum burst size (64 bytes)
+  MAX_SIZE = 3,
-  QUEUE_DEPTH = 1,    // request window per lane
+  QUEUE_DEPTH = 1,
-  WAIT_TIMEOUT = 8,   // max cycles to wait before forced fifo dequeue, per lane
+  WAIT_TIMEOUT = 8,
-  ADDR_WIDTH = 24,    // assume <= 32
+  ADDR_WIDTH = 24,
-  DATA_BUS_SIZE = 3,  // 2^3=8 bytes, 64 bit bus
+  DATA_BUS_SIZE = 3, // 2^3=8 bytes, 64 bit bus
-                      // this has to be at least larger than the word size for
+  // WATERMARK = 2,
-                      // the coalescer to perform well
+  WORD_SIZE = 4,
-  NUM_LANES = 4,
+  WORD_WIDTH = 2,
-  // WATERMARK = 2,      // minimum buffer occupancy to start coalescing
+  NUM_OLD_IDS = 16,
-  WORD_SIZE = 4,      // 32-bit system
+  NUM_NEW_IDS = 4,
-  WORD_WIDTH = 2,     // log(WORD_SIZE)
+  RESP_QUEUE_DEPTH = 4,
-  NUM_OLD_IDS = 16,    // num of outstanding requests per lane, from processor
-  NUM_NEW_IDS = 4,    // num of outstanding coalesced requests
   COAL_SIZES = Seq(3),
-  SizeEnum = DefaultInFlightTableSizeEnum
+  sizeEnum = DefaultInFlightTableSizeEnum
 )
 
 class CoalescingUnit(config: CoalescerConfig)(implicit p: Parameters) extends LazyModule {
@@ -419,6 +421,10 @@ class MultiCoalescer(windowT: CoalShiftQueue[ReqQueueEntry], coalReqT: ReqQueueE
 
   io.invalidate.bits := chosenBundle.matchOH
   io.invalidate.valid := io.outReq.fire // invalidate only when fire
+
+  // uncomment the following lines to disable coalescing entirely
+  io.outReq.valid := false.B
+  io.invalidate.valid := false.B
 }
 
 class CoalescingUnitImp(outer: CoalescingUnit, config: CoalescerConfig) extends LazyModuleImp(outer) {
@@ -527,7 +533,7 @@ class CoalescingUnitImp(outer: CoalescingUnit, config: CoalescerConfig) extends
         // make queue block up in the middle of the simulation.  Ideally there
         // should be a more logical way to set this, or we should handle
         // response queue blocking.
-        config.NUM_NEW_IDS
+        config.RESP_QUEUE_DEPTH
       )
     )
   }
@@ -619,7 +625,7 @@ class CoalescingUnitImp(outer: CoalescingUnit, config: CoalescerConfig) extends
       numPerLaneReqs,
       sourceWidth,
       offsetBits,
-      config.SizeEnum
+      config.sizeEnum
     )
   )
   println(s"=========== table sourceWidth: ${sourceWidth}")
@@ -643,7 +649,7 @@ class CoalescingUnitImp(outer: CoalescingUnit, config: CoalescerConfig) extends
       r.valid := false.B
       r.source := origReqs(i).source
       r.offset := (origReqs(i).address % (1 << config.MAX_SIZE).U) >> config.WORD_WIDTH
-      r.sizeEnum := config.SizeEnum.logSizeToEnum(origReqs(i).size)
+      r.sizeEnum := config.sizeEnum.logSizeToEnum(origReqs(i).size)
     }
   }
   newEntry.lanes(0).reqs(0).valid := true.B
@@ -704,7 +710,7 @@ class UncoalescingUnit(config: CoalescerConfig) extends Module {
   //  val numLanes: Int, <-> config.NUM_LANES
   //  val numPerLaneReqs: Int, <-> config.DEPTH
   //  val sourceWidth: Int, <-> log2ceil(config.NUM_OLD_IDS)
-  //  val sizeWidth: Int, <-> config.SizeEnum.width
+  //  val sizeWidth: Int, <-> config.sizeEnum.width
   //  val coalDataWidth: Int, <-> (1 << config.MAX_SIZE)
   //  val numInflightCoalRequests: Int <-> config.NUM_NEW_IDS
   val inflightTable = Module(new InflightCoalReqTable(config))
@@ -806,7 +812,7 @@ class InflightCoalReqTable(config: CoalescerConfig) extends Module {
     config.QUEUE_DEPTH,
     log2Ceil(config.NUM_OLD_IDS),
     config.MAX_SIZE,
-    config.SizeEnum
+    config.sizeEnum
   )
 
   val entries = config.NUM_NEW_IDS
@@ -836,7 +842,7 @@ class InflightCoalReqTable(config: CoalescerConfig) extends Module {
           r.valid := false.B
           r.source := 0.U
           r.offset := 0.U
-          r.sizeEnum := config.SizeEnum.INVALID
+          r.sizeEnum := config.sizeEnum.INVALID
         }
       }
     }