Name output files according to ChiselConfig.toString

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main/scala/Chisel/Driver.scala b/src/main/scala/Chisel/Driver.scala
index 5edda019..20463344 100644
--- a/src/main/scala/Chisel/Driver.scala
+++ b/src/main/scala/Chisel/Driver.scala
@@ -87,7 +87,7 @@ object Driver extends FileSystemUtilities {
     val world = if(collectConstraints) config.toCollector else config.toInstance 
     val p = Parameters.root(world)
     config.topConstraints.foreach(c => p.constrain(c))
-    elaborate(gen, p)
+    elaborate(gen, p, config)
   }
     
   /** Elaborates the circuit specified in the gen function, optionally uses
@@ -95,14 +95,17 @@ object Driver extends FileSystemUtilities {
     *  TODO: Distinguish between cases where we dump to file vs return IR for
     *        use by other Drivers.
     */
-  def elaborate[T <: Module](gen: () => T, p: Parameters = Parameters.empty) {
+  private[Chisel] def elaborateWrappedModule[T <: Module](gen: () => T, p: Parameters, c: Option[ChiselConfig]) {
     try {
       ChiselError.clear()
       ChiselError.info("Elaborating design...")
-      val ir = build(Module(gen())(p))
+      val ir = build(gen())
       ChiselError.info("Done elaborating.")
 
-      val name = ir.main +"."+ p.getClass.getSimpleName
+      val name = c match {
+        case None => ir.main
+        case Some(config) => s"${ir.main}.$config"
+      }
       createOutputFile(s"$name.knb", p.getKnobs)
       createOutputFile(s"$name.cst", p.getConstraints)
       createOutputFile(s"$name.prm", Dump.getDump)
@@ -111,4 +114,10 @@ object Driver extends FileSystemUtilities {
       ChiselError.report
     }
   }
+  def elaborate[T <: Module](gen: () => T): Unit =
+    elaborate(gen, Parameters.empty)
+  def elaborate[T <: Module](gen: () => T, p: Parameters): Unit =
+    elaborateWrappedModule(() => Module(gen())(p), p, None)
+  def elaborate[T <: Module](gen: () => T, p: Parameters, c: ChiselConfig): Unit =
+    elaborateWrappedModule(() => Module(gen())(p), p, Some(c))
 }
diff --git a/src/main/scala/Chisel/Parameters.scala b/src/main/scala/Chisel/Parameters.scala
index b6d2f328..2c9c7f69 100644
--- a/src/main/scala/Chisel/Parameters.scala
+++ b/src/main/scala/Chisel/Parameters.scala
@@ -121,6 +121,7 @@ class ChiselConfig(
 
   def toCollector = new Collector(this.topDefinitions, this.knobValues)
   def toInstance = new Instance(this.topDefinitions, this.knobValues)
+  override def toString = this.getClass.getSimpleName
 }
 
 object Dump {