riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Use longname for ElaborationArtefact emission

Browse Source 
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@gmail.com>
This commit is contained in:
Schuyler Eldridge 2018-01-15 16:53:36 -05:00
parent e52d52ae99
commit cfd49f87c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulator/Makefrag-verilator
View File

@ -60,7 +60,7 @@ VERILATOR_FLAGS := --top-module $(MODEL) \
--output-split-cfuncs 20000 \ --output-split-cfuncs 20000 \
-Wno-STMTDLY --x-assign unique \ -Wno-STMTDLY --x-assign unique \
-I$(base_dir)/vsrc \ -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))) cppfiles = $(addprefix $(base_dir)/csrc/, $(addsuffix .cc, $(CXXSRCS)))
headers = $(wildcard $(base_dir)/csrc/*.h) headers = $(wildcard $(base_dir)/csrc/*.h)

8
src/main/scala/util/GeneratorUtils.scala
View File

@ -71,7 +71,7 @@ trait HasGeneratorUtilities {
} }
def writeOutputFile(targetDir: String, fname: String, contents: String): File = { 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) val fw = new FileWriter(f)
fw.write(contents) fw.write(contents)
fw.close fw.close
@ -83,7 +83,7 @@ trait HasGeneratorUtilities {
/** Standardized command line interface for Scala entry point */ /** Standardized command line interface for Scala entry point */
trait GeneratorApp extends App with HasGeneratorUtilities { trait GeneratorApp extends App with HasGeneratorUtilities {
lazy val names: ParsedInputNames = { lazy val names: ParsedInputNames = {
require(args.size == 5, "Usage: sbt> " + require(args.size == 5, "Usage: sbt> " +
"run TargetDir TopModuleProjectName TopModuleName " + "run TargetDir TopModuleProjectName TopModuleName " +
"ConfigProjectName ConfigNameString") "ConfigProjectName ConfigNameString")
ParsedInputNames( ParsedInputNames(
@ -125,7 +125,7 @@ trait GeneratorApp extends App with HasGeneratorUtilities {
TestGeneration.addSuite(DefaultTestSuites.groundtest64("p")) TestGeneration.addSuite(DefaultTestSuites.groundtest64("p"))
TestGeneration.addSuite(DefaultTestSuites.emptyBmarks) TestGeneration.addSuite(DefaultTestSuites.emptyBmarks)
TestGeneration.addSuite(DefaultTestSuites.singleRegression) TestGeneration.addSuite(DefaultTestSuites.singleRegression)
} }
def generateROMs { def generateROMs {
writeOutputFile(td, s"$longName.rom.conf", enumerateROMs(circuit)) 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 */ /** Output files created as a side-effect of elaboration */
def generateArtefacts { def generateArtefacts {
ElaborationArtefacts.files.foreach { case (extension, contents) => ElaborationArtefacts.files.foreach { case (extension, contents) =>
writeOutputFile(td, s"${names.configs}.${extension}", contents ()) writeOutputFile(td, s"$longName.$extension", contents ())
} }
} }
} }