From 320900f76cda66b252477b0be68978d4c86f9609 Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Tue, 2 Jan 2018 17:55:54 -0800
Subject: [PATCH] tile: BaseTileModule => BaseTileModuleImp

---
 src/main/scala/groundtest/Tile.scala     | 4 ++--
 src/main/scala/groundtest/TraceGen.scala | 4 ++--
 src/main/scala/tile/BaseTile.scala       | 4 ++--
 src/main/scala/tile/LazyRoCC.scala       | 2 +-
 src/main/scala/tile/RocketTile.scala     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/groundtest/Tile.scala b/src/main/scala/groundtest/Tile.scala
index 73e831b0..e38ebb05 100644
--- a/src/main/scala/groundtest/Tile.scala
+++ b/src/main/scala/groundtest/Tile.scala
@@ -39,10 +39,10 @@ abstract class GroundTestTile(params: GroundTestTileParams)
 
   val dcacheOpt = params.dcache.map { dc => LazyModule(new DCache(0)) }
 
-  override lazy val module = new GroundTestTileModule(this)
+  override lazy val module = new GroundTestTileModuleImp(this)
 }
 
-class GroundTestTileModule(outer: GroundTestTile) extends BaseTileModule(outer) {
+class GroundTestTileModuleImp(outer: GroundTestTile) extends BaseTileModuleImp(outer) {
   val status = IO(new GroundTestStatus)
   val halt_and_catch_fire = None
 
diff --git a/src/main/scala/groundtest/TraceGen.scala b/src/main/scala/groundtest/TraceGen.scala
index 4b50cc28..496d574b 100644
--- a/src/main/scala/groundtest/TraceGen.scala
+++ b/src/main/scala/groundtest/TraceGen.scala
@@ -580,10 +580,10 @@ class TraceGenerator(val params: TraceGenParams)(implicit val p: Parameters) ext
 
 class TraceGenTile(val id: Int, val params: TraceGenParams)(implicit p: Parameters) extends GroundTestTile(params) {
   val masterNode: TLOutwardNode = dcacheOpt.map(_.node).getOrElse(TLIdentityNode())
-  override lazy val module = new TraceGenTileModule(this)
+  override lazy val module = new TraceGenTileModuleImp(this)
 }
 
-class TraceGenTileModule(outer: TraceGenTile) extends GroundTestTileModule(outer) {
+class TraceGenTileModuleImp(outer: TraceGenTile) extends GroundTestTileModuleImp(outer) {
 
   val tracegen = Module(new TraceGenerator(outer.params))
   tracegen.io.hartid := constants.hartid
diff --git a/src/main/scala/tile/BaseTile.scala b/src/main/scala/tile/BaseTile.scala
index 088b6134..c8c669a2 100644
--- a/src/main/scala/tile/BaseTile.scala
+++ b/src/main/scala/tile/BaseTile.scala
@@ -125,7 +125,7 @@ trait HasTileParameters {
 abstract class BaseTile(tileParams: TileParams, val crossing: CoreplexClockCrossing)
                        (implicit p: Parameters) extends LazyModule with HasTileParameters with HasCrossing
 {
-  def module: BaseTileModule[BaseTile]
+  def module: BaseTileModuleImp[BaseTile]
   def masterNode: TLOutwardNode
   def slaveNode: TLInwardNode
   def intInwardNode: IntInwardNode
@@ -171,7 +171,7 @@ abstract class BaseTile(tileParams: TileParams, val crossing: CoreplexClockCross
   }
 }
 
-class BaseTileModule[+L <: BaseTile](val outer: L) extends LazyModuleImp(outer) with HasTileParameters {
+class BaseTileModuleImp[+L <: BaseTile](val outer: L) extends LazyModuleImp(outer) with HasTileParameters {
 
   require(xLen == 32 || xLen == 64)
   require(paddrBits <= maxPAddrBits)
diff --git a/src/main/scala/tile/LazyRoCC.scala b/src/main/scala/tile/LazyRoCC.scala
index 9a80bddd..49dff340 100644
--- a/src/main/scala/tile/LazyRoCC.scala
+++ b/src/main/scala/tile/LazyRoCC.scala
@@ -91,7 +91,7 @@ trait HasLazyRoCC extends CanHavePTW { this: BaseTile =>
 }
 
 trait HasLazyRoCCModule[+L <: BaseTile with HasLazyRoCC] extends CanHavePTWModule
-    with HasCoreParameters { this: BaseTileModule[L] =>
+    with HasCoreParameters { this: BaseTileModuleImp[L] =>
 
   val roccCore = Wire(new RoCCCoreIO()(outer.p))
 
diff --git a/src/main/scala/tile/RocketTile.scala b/src/main/scala/tile/RocketTile.scala
index de1b5641..e2126ebe 100644
--- a/src/main/scala/tile/RocketTile.scala
+++ b/src/main/scala/tile/RocketTile.scala
@@ -92,10 +92,10 @@ class RocketTile(
     Resource(cpuDevice, "reg").bind(ResourceInt(BigInt(hartId)))
   }
 
-  override lazy val module = new RocketTileModule(this)
+  override lazy val module = new RocketTileModuleImp(this)
 }
 
-class RocketTileModule(outer: RocketTile) extends BaseTileModule(outer)
+class RocketTileModuleImp(outer: RocketTile) extends BaseTileModuleImp(outer)
     with HasLazyRoCCModule[RocketTile]
     with HasHellaCacheModule
     with HasICacheFrontendModule {