From 2a58f387ed5abecdbda2547ca6dcf95c88fdb8c8 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Tue, 28 May 2019 01:50:39 +0000 Subject: [PATCH] Fix some test suite handling --- build.sbt | 4 ++-- generators/firechip/src/main/scala/TargetConfigs.scala | 2 +- generators/firechip/src/test/scala/ScalaTestSuite.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 6e52c683..99d2ea3f 100644 --- a/build.sbt +++ b/build.sbt @@ -21,11 +21,11 @@ lazy val commonSettings = Seq( val rocketChipDir = file("generators/rocket-chip") -lazy val firesimAsLibrary = sys.env.get("FIRESIM_IS_TOP") == None +lazy val firesimAsLibrary = sys.env.get("FIRESIM_STANDALONE") == None lazy val firesimDir = if (firesimAsLibrary) { file("sims/firesim/sim/") } else { - file("../../sim/") + file("../../") } // Checks for -DROCKET_USE_MAVEN. diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index 5c1cade1..6e20364d 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -17,7 +17,7 @@ import icenet._ class WithBootROM extends Config((site, here, up) => { case BootROMParams => { val rebarBootROM = new File(s"./generators/testchipip/bootrom/bootrom.rv${site(XLen)}.img") - val firesimBootROM = new File(s"./target-rtl/testchipip/bootrom/bootrom.rv${site(XLen)}.img") + val firesimBootROM = new File(s"./target-rtl/firechip/generators/testchipip/bootrom/bootrom.rv${site(XLen)}.img") val bootROMPath = if (rebarBootROM.exists()) { rebarBootROM.getAbsolutePath() diff --git a/generators/firechip/src/test/scala/ScalaTestSuite.scala b/generators/firechip/src/test/scala/ScalaTestSuite.scala index 588c7c2a..54848ac8 100644 --- a/generators/firechip/src/test/scala/ScalaTestSuite.scala +++ b/generators/firechip/src/test/scala/ScalaTestSuite.scala @@ -19,7 +19,7 @@ abstract class FireSimTestSuite( targetConfigs: String, platformConfigs: String, N: Int = 8 - ) extends firesim.midasexamples.TestSuiteCommon with HasFireSimGeneratorUtilities { + ) extends firesim.TestSuiteCommon with IsFireSimGeneratorLike { import scala.concurrent.duration._ import ExecutionContext.Implicits.global