summaryrefslogtreecommitdiff
path: root/src/main/scala/Chisel/Tester.scala
diff options
context:
space:
mode:
authorHenry Cook2015-08-04 16:53:20 -0700
committerAndrew Waterman2015-08-05 16:35:44 -0700
commitcac4a521b0eea3b715d4a8136cc0efbfd5ebaa3f (patch)
tree80fcf436290ca78d0f2ee0e24783ea6b95b9da17 /src/main/scala/Chisel/Tester.scala
parent481fb882619265c475a962ee6b664165a79cbf1e (diff)
Remove all references to Backends, only backend is FIRRTL
Diffstat (limited to 'src/main/scala/Chisel/Tester.scala')
-rw-r--r--src/main/scala/Chisel/Tester.scala19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/main/scala/Chisel/Tester.scala b/src/main/scala/Chisel/Tester.scala
index c92abfeb..f8fb23fc 100644
--- a/src/main/scala/Chisel/Tester.scala
+++ b/src/main/scala/Chisel/Tester.scala
@@ -50,7 +50,7 @@ class Snapshot(val t: Int) {
}
class ManualTester[+T <: Module]
- (val c: T, val isT: Boolean = true) {
+ (val c: T, val isT: Boolean = true, val skipVPDMessage: Boolean = true) {
var testIn: InputStream = null
var testOut: OutputStream = null
var testErr: InputStream = null
@@ -360,18 +360,6 @@ class ManualTester[+T <: Module]
val target = "cd " + Driver.targetDir + " && ./" + n
val cmd = target
println("RUNNING " + cmd)
- /*
- (if (Driver.backend.isInstanceOf[FloBackend]) {
- val dir = Driver.backend.asInstanceOf[FloBackend].floDir
- val command = ArrayBuffer(dir + "fix-console", ":is-debug", "true", ":filename", target + ".hex", ":flo-filename", target + ".mwe.flo")
- if (Driver.isVCD) { command ++= ArrayBuffer(":is-vcd-dump", "true") }
- if (Driver.emitTempNodes) { command ++= ArrayBuffer(":emit-temp-nodes", "true") }
- command ++= ArrayBuffer(":target-dir", Driver.targetDir)
- command.mkString(" ")
- } else {
- target + (if (Driver.backend.isInstanceOf[VerilogBackend]) " -q +vcs+initreg+0 " else "")
- })
- */
println("SEED " + Driver.testerSeed)
println("STARTING " + n)
val processBuilder = Process(Seq("bash", "-c", cmd))
@@ -380,8 +368,7 @@ class ManualTester[+T <: Module]
waitForStreams()
t = 0
reset(5)
- // Skip vpd message
- if (Driver.backend.isInstanceOf[VerilogBackend] && Driver.isDebug) {
+ if (skipVPDMessage) {
var vpdmsg = testIn.read
while (vpdmsg != '\n' && vpdmsg != -1)
vpdmsg = testIn.read
@@ -411,7 +398,7 @@ class ManualTester[+T <: Module]
}
}
-class Tester[+T <: Module](c: T, isTrace: Boolean = true) extends ManualTester(c, isTrace) {
+class Tester[+T <: Module](c: T, isTrace: Boolean = true, skipVPDMessage: Boolean = false) extends ManualTester(c, isTrace, skipVPDMessage) {
start()
}