update rocket-chip and testchipip

src/main/scala/example/TestHarness.scala

@@ -5,8 +5,6 @@ import rocketchip._
 import testchipip._
 import chisel3._
 import config.Parameters
-import _root_.util.{HasGeneratorUtilities, ParsedInputNames}
-import java.io.File
 
 class TestHarness(implicit val p: Parameters) extends Module {
   val io = IO(new Bundle {
@@ -25,32 +23,6 @@ class TestHarness(implicit val p: Parameters) extends Module {
   io.success := ser.io.exit
 }
 
-trait ExampleGeneratorApp extends App with HasGeneratorUtilities {
+object Generator extends GeneratorApp {
-  lazy val names = ParsedInputNames(
-    targetDir = args(0),
-    topModuleProject = args(1),
-    topModuleClass = args(2),
-    configProject = args(3),
-    configs = args(4))
-
-  lazy val config = getConfig(names)
-  lazy val world = config.toInstance
-  lazy val params = Parameters.root(world)
-  lazy val circuit = Driver.elaborate(() =>
-      Class.forName(names.fullTopModuleClass)
-        .getConstructor(classOf[Parameters])
-        .newInstance(params)
-        .asInstanceOf[Module])
-
-  lazy val longName = names.topModuleProject + "." +
-                 names.topModuleClass + "." +
-                 names.configs
-
-  def generateFirrtl =
-    Driver.dumpFirrtl(circuit,
-      Some(new File(names.targetDir, s"$longName.fir")))
-}
-
-object Generator extends ExampleGeneratorApp {
   generateFirrtl
 }

src/main/scala/pwm/TestHarness.scala

@@ -2,12 +2,13 @@ package pwm
 
 import config.Parameters
 import diplomacy.LazyModule
+import testchipip.GeneratorApp
 
 class TestHarness(q: Parameters) extends example.TestHarness()(q) {
   override def buildTop(p: Parameters) =
     LazyModule(new ExampleTopWithPWM()(p))
 }
 
-object Generator extends example.ExampleGeneratorApp {
+object Generator extends GeneratorApp {
   generateFirrtl
 }