summaryrefslogtreecommitdiff
path: root/src/main/scala/chisel3/testers
diff options
context:
space:
mode:
authorJack Koenig2017-01-27 16:06:54 -0800
committerGitHub2017-01-27 16:06:54 -0800
commitc8045e1696f1104b3b609757e7220a0296edb7c5 (patch)
treebfd855fb87a54cd128ba85bf7083ef71efb5c1ec /src/main/scala/chisel3/testers
parentc279860c36a73984cd1b7b0ac6c213e8b44a7143 (diff)
Deprecate firrtlToVerilog in favor of compileFirrtlToVerilog (#367)
Resolves #357 Also remove uses of firrtlToVerilog within chisel3. Invoking Firrtl programmatically is preferred to on the command line. Update README to indicate that Firrtl need not be installed.
Diffstat (limited to 'src/main/scala/chisel3/testers')
-rw-r--r--src/main/scala/chisel3/testers/TesterDriver.scala33
1 files changed, 10 insertions, 23 deletions
diff --git a/src/main/scala/chisel3/testers/TesterDriver.scala b/src/main/scala/chisel3/testers/TesterDriver.scala
index 83f3c796..bcbb9cd3 100644
--- a/src/main/scala/chisel3/testers/TesterDriver.scala
+++ b/src/main/scala/chisel3/testers/TesterDriver.scala
@@ -21,8 +21,7 @@ object TesterDriver extends BackendCompilationUtilities {
/** For use with modules that should successfully be elaborated by the
* frontend, and which can be turned into executables with assertions. */
def execute(t: () => BasicTester,
- additionalVResources: Seq[String] = Seq(),
- runFirrtlasProcess: Boolean = false): Boolean = {
+ additionalVResources: Seq[String] = Seq()): Boolean = {
// Invoke the chisel compiler to get the circuit's IR
val circuit = Driver.elaborate(finishWrapper(t))
@@ -46,28 +45,16 @@ object TesterDriver extends BackendCompilationUtilities {
out
})
- if(runFirrtlasProcess) {
- // Use sys.Process to invoke a bunch of backend stuff, then run the resulting exe
- if ((firrtlToVerilog(target, path) #&&
- verilogToCpp(target, target, path, additionalVFiles, cppHarness) #&&
- cppToExe(target, path)).! == 0) {
- executeExpectingSuccess(target, path)
- } else {
- false
- }
+ // Compile firrtl
+ if (!compileFirrtlToVerilog(target, path)) {
+ return false
}
- else {
- // Compile firrtl
- if (!compileFirrtlToVerilog(target, path)) {
- return false
- }
- // Use sys.Process to invoke a bunch of backend stuff, then run the resulting exe
- if ((verilogToCpp(target, target, path, additionalVFiles, cppHarness) #&&
- cppToExe(target, path)).! == 0) {
- executeExpectingSuccess(target, path)
- } else {
- false
- }
+ // Use sys.Process to invoke a bunch of backend stuff, then run the resulting exe
+ if ((verilogToCpp(target, target, path, additionalVFiles, cppHarness) #&&
+ cppToExe(target, path)).! == 0) {
+ executeExpectingSuccess(target, path)
+ } else {
+ false
}
}
/**