selectively enable or disable uncached and cached generators

groundtest/src/main/scala/generator.scala

@@ -9,12 +9,16 @@ import cde.{Parameters, Field}
 
 case object NGeneratorsPerTile extends Field[Int]
 case object NGeneratorTiles extends Field[Int]
+case object GenerateUncached extends Field[Boolean]
+case object GenerateCached extends Field[Boolean]
 
 trait HasGeneratorParams {
   implicit val p: Parameters
   val nGensPerTile = p(NGeneratorsPerTile)
   val nGenTiles = p(NGeneratorTiles)
   val nGens = nGensPerTile * nGenTiles
+  val genUncached = p(GenerateUncached)
+  val genCached = p(GenerateCached)
 }
 
 class UncachedTileLinkGenerator(id: Int)

groundtest/src/main/scala/tile.scala

@@ -39,19 +39,33 @@ class GeneratorTile(id: Int, resetSignal: Bool)
 
   val gen_finished = Wire(Vec(2 * nGensPerTile, Bool()))
 
+  if (genUncached) {
     val uncacheArb = Module(new ClientUncachedTileLinkIOArbiter(nGensPerTile))
+
+    for (i <- 0 until nGensPerTile) {
+      val genid = id * nGensPerTile + i
+      val uncacheGen = Module(new UncachedTileLinkGenerator(genid))
+      uncacheArb.io.in(i) <> uncacheGen.io.mem
+      gen_finished(2 * i) := uncacheGen.io.finished
+    }
+
+    io.uncached(0) <> uncacheArb.io.out
+  } else {
+    io.uncached(0).acquire.valid := Bool(false)
+    io.uncached(0).grant.ready := Bool(false)
+    for (i <- 0 until nGensPerTile) { gen_finished(2 * i) := Bool(false) }
+  }
+
+  if (genCached) {
     val cacheArb = Module(new HellaCacheArbiter(nGensPerTile)(dcacheParams))
     val cache = Module(new HellaCache()(dcacheParams))
 
     for (i <- 0 until nGensPerTile) {
       val genid = id * nGensPerTile + i
-    val uncacheGen = Module(new UncachedTileLinkGenerator(genid))
       val cacheGen = Module(new HellaCacheGenerator(genid)(dcacheParams))
       val cacheIF = Module(new SimpleHellaCacheIF()(dcacheParams))
-    uncacheArb.io.in(i) <> uncacheGen.io.mem
       cacheIF.io.requestor <> cacheGen.io.mem
       cacheArb.io.requestor(i) <> cacheIF.io.cache
-    gen_finished(2 * i) := uncacheGen.io.finished
       gen_finished(2 * i + 1) := cacheGen.io.finished
     }
 
@@ -62,8 +76,11 @@ class GeneratorTile(id: Int, resetSignal: Bool)
     assert(!cache.io.ptw.req.valid, 
       "Cache should not be using virtual addressing")
 
-  io.uncached(0) <> uncacheArb.io.out
     io.cached(0) <> cache.io.mem
+  } else {
+    io.cached(0) <> Module(new DummyCache).io
+    for (i <- 0 until nGensPerTile) { gen_finished(2 * i + 1) := Bool(true) }
+  }
 
   val all_done = gen_finished.reduce(_ && _)