From cfd49f87c1c80bf9e78eb2eec8380e21e31d039c Mon Sep 17 00:00:00 2001
From: Schuyler Eldridge <schuyler.eldridge@gmail.com>
Date: Mon, 15 Jan 2018 16:53:36 -0500
Subject: [PATCH] Use longname for ElaborationArtefact emission

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@gmail.com>
---
 emulator/Makefrag-verilator              | 2 +-
 src/main/scala/util/GeneratorUtils.scala | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/emulator/Makefrag-verilator b/emulator/Makefrag-verilator
index 0310b702..0f5043f5 100644
--- a/emulator/Makefrag-verilator
+++ b/emulator/Makefrag-verilator
@@ -60,7 +60,7 @@ VERILATOR_FLAGS := --top-module $(MODEL) \
   --output-split-cfuncs 20000 \
 	-Wno-STMTDLY --x-assign unique \
   -I$(base_dir)/vsrc \
-  -O3 -CFLAGS "$(CXXFLAGS) -DVERILATOR -DTEST_HARNESS=V$(MODEL) -include $(base_dir)/csrc/verilator.h -include $(generated_dir)/$(CONFIG).plusArgs"
+  -O3 -CFLAGS "$(CXXFLAGS) -DVERILATOR -DTEST_HARNESS=V$(MODEL) -include $(base_dir)/csrc/verilator.h -include $(generated_dir)/$(PROJECT).$(CONFIG).plusArgs"
 cppfiles = $(addprefix $(base_dir)/csrc/, $(addsuffix .cc, $(CXXSRCS)))
 headers = $(wildcard $(base_dir)/csrc/*.h)
 
diff --git a/src/main/scala/util/GeneratorUtils.scala b/src/main/scala/util/GeneratorUtils.scala
index 5d67ff32..081bcf26 100644
--- a/src/main/scala/util/GeneratorUtils.scala
+++ b/src/main/scala/util/GeneratorUtils.scala
@@ -71,7 +71,7 @@ trait HasGeneratorUtilities {
   }
 
   def writeOutputFile(targetDir: String, fname: String, contents: String): File = {
-    val f = new File(targetDir, fname) 
+    val f = new File(targetDir, fname)
     val fw = new FileWriter(f)
     fw.write(contents)
     fw.close
@@ -83,7 +83,7 @@ trait HasGeneratorUtilities {
 /** Standardized command line interface for Scala entry point */
 trait GeneratorApp extends App with HasGeneratorUtilities {
   lazy val names: ParsedInputNames = {
-    require(args.size == 5, "Usage: sbt> " + 
+    require(args.size == 5, "Usage: sbt> " +
       "run TargetDir TopModuleProjectName TopModuleName " +
       "ConfigProjectName ConfigNameString")
     ParsedInputNames(
@@ -125,7 +125,7 @@ trait GeneratorApp extends App with HasGeneratorUtilities {
     TestGeneration.addSuite(DefaultTestSuites.groundtest64("p"))
     TestGeneration.addSuite(DefaultTestSuites.emptyBmarks)
     TestGeneration.addSuite(DefaultTestSuites.singleRegression)
-  } 
+  }
 
   def generateROMs {
     writeOutputFile(td, s"$longName.rom.conf", enumerateROMs(circuit))
@@ -134,7 +134,7 @@ trait GeneratorApp extends App with HasGeneratorUtilities {
   /** Output files created as a side-effect of elaboration */
   def generateArtefacts {
     ElaborationArtefacts.files.foreach { case (extension, contents) =>
-      writeOutputFile(td, s"${names.configs}.${extension}", contents ())
+      writeOutputFile(td, s"$longName.$extension", contents ())
     }
   }
 }