Add TileId parameter, generalizing GroundTestId

This usually shouldn't be used in Tiles that are meant to be P&R'd once
and multiply instantiated, as their RTL would no longer be homogeneous.
However, it is useful for conditionalizing RTL generation for
heterogeneous tiles.

src/main/scala/groundtest/Generator.scala

@@ -190,7 +190,7 @@ class HellaCacheGenerator(id: Int)
 class GeneratorTest(implicit p: Parameters)
     extends GroundTest()(p) with HasGeneratorParameters {
 
-  val idStart = p(GroundTestKey).take(tileId)
+  val idStart = p(GroundTestKey).take(p(TileId))
     .map(settings => settings.cached + settings.uncached)
     .foldLeft(0)(_ + _)
 

src/main/scala/groundtest/NastiTest.scala

@@ -4,6 +4,7 @@ import Chisel._
 import uncore.tilelink._
 import uncore.converters._
 import junctions._
+import rocket.TileId
 import cde.Parameters
 
 class NastiGenerator(id: Int)(implicit val p: Parameters) extends Module
@@ -107,7 +108,7 @@ class NastiConverterTest(implicit p: Parameters) extends GroundTest()(p)
     with HasNastiParameters {
   require(tileSettings.uncached == 1 && tileSettings.cached == 0)
 
-  val genId = p(GroundTestKey).take(tileId)
+  val genId = p(GroundTestKey).take(p(TileId))
     .map(settings => settings.cached + settings.uncached)
     .foldLeft(0)(_ + _)
 

src/main/scala/groundtest/Tile.scala

@@ -13,7 +13,6 @@ case object BuildGroundTest extends Field[Parameters => GroundTest]
 case class GroundTestTileSettings(
   uncached: Int = 0, cached: Int = 0, ptw: Int = 0, maxXacts: Int = 1)
 case object GroundTestKey extends Field[Seq[GroundTestTileSettings]]
-case object GroundTestId extends Field[Int]
 
 trait HasGroundTestConstants {
   val timeoutCodeBits = 4
@@ -22,8 +21,7 @@ trait HasGroundTestConstants {
 
 trait HasGroundTestParameters extends HasAddrMapParameters {
   implicit val p: Parameters
-  val tileId = p(GroundTestId)
-  val tileSettings = p(GroundTestKey)(tileId)
+  val tileSettings = p(GroundTestKey)(p(TileId))
   val nUncached = tileSettings.uncached
   val nCached = tileSettings.cached
   val nPTW = tileSettings.ptw

src/main/scala/groundtest/TraceGen.scala

@@ -613,7 +613,7 @@ class GroundTestTraceGenerator(implicit p: Parameters)
   require(io.mem.size <= 1)
   require(io.cache.size == 1)
 
-  val traceGen = Module(new TraceGenerator(p(GroundTestId)))
+  val traceGen = Module(new TraceGenerator(p(TileId)))
   io.cache.head <> traceGen.io.mem
 
   if (io.mem.size == 1) {