wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix some test suite handling

Browse Source
This commit is contained in:
David Biancolin
2019-05-28 01:50:39 +00:00
parent c0d4e848ba
commit 2a58f387ed
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@@ -21,11 +21,11 @@ lazy val commonSettings = Seq(
val rocketChipDir = file("generators/rocket-chip") 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) { lazy val firesimDir = if (firesimAsLibrary) {
file("sims/firesim/sim/") file("sims/firesim/sim/")
} else { } else {
file("../../sim/") file("../../")
} }
// Checks for -DROCKET_USE_MAVEN. // Checks for -DROCKET_USE_MAVEN.

2
generators/firechip/src/main/scala/TargetConfigs.scala
View File

@@ -17,7 +17,7 @@ import icenet._
class WithBootROM extends Config((site, here, up) => { class WithBootROM extends Config((site, here, up) => {
case BootROMParams => { case BootROMParams => {
val rebarBootROM = new File(s"./generators/testchipip/bootrom/bootrom.rv${site(XLen)}.img") 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()) { val bootROMPath = if (rebarBootROM.exists()) {
rebarBootROM.getAbsolutePath() rebarBootROM.getAbsolutePath()

2
generators/firechip/src/test/scala/ScalaTestSuite.scala
View File

@@ -19,7 +19,7 @@ abstract class FireSimTestSuite(
targetConfigs: String, targetConfigs: String,
platformConfigs: String, platformConfigs: String,
N: Int = 8 N: Int = 8
) extends firesim.midasexamples.TestSuiteCommon with HasFireSimGeneratorUtilities { ) extends firesim.TestSuiteCommon with IsFireSimGeneratorLike {
import scala.concurrent.duration._ import scala.concurrent.duration._
import ExecutionContext.Implicits.global import ExecutionContext.Implicits.global