Provide a GeneratorApp object per user package. Extract RocketTestSuite from coreplex into rocketchip and provide GeneratorApp defaults for other target packages.

src/main/scala/groundtest/Generator.scala

@@ -2,11 +2,7 @@
 
 package groundtest
 
-import Chisel._
-import util.Generator
-
-object GroundtestGenerator extends Generator
-{
+object Generator extends util.GeneratorApp {
   val longName = names.topModuleProject + "." + names.configs
   generateFirrtl
   generateTestSuiteMakefrags // TODO: Needed only for legacy make targets

src/main/scala/rocketchip/Generator.scala

@@ -2,14 +2,12 @@
 
 package rocketchip
 
-import Chisel._
 import rocket.{XLen, UseVM, UseAtomics, UseCompressed, FPUKey}
-import util.Generator
 import scala.collection.mutable.LinkedHashSet
 
 /** A Generator for platforms containing Rocket Coreplexes */
-object RocketChipGenerator extends Generator
-{
+object Generator extends util.GeneratorApp {
+
   val rv64RegrTestNames = LinkedHashSet(
         "rv64ud-v-fcvt",
         "rv64ud-p-fdiv",

src/main/scala/unittest/Generator.scala

@@ -2,11 +2,7 @@
 
 package unittest
 
-import Chisel._
-import util.Generator
-
-object UnitTestGenerator extends Generator
-{
+object Generator extends util.GeneratorApp {
   val longName = names.topModuleProject + "." + names.configs
   generateFirrtl
   generateTestSuiteMakefrags // TODO: Needed only for legacy make targets

src/main/scala/util/GeneratorUtils.scala

@@ -60,7 +60,7 @@ trait HasGeneratorUtilities {
 
 
 /** Standardized command line interface for Scala entry point */
-trait Generator extends App with HasGeneratorUtilities {
+trait GeneratorApp extends App with HasGeneratorUtilities {
   lazy val names: ParsedInputNames = {
     require(args.size == 5, "Usage: sbt> " + 
       "run TargetDir TopModuleProjectName TopModuleName " +