automatic bench conversion

Sources/Fault/Entries/atpg.swift

@@ -94,9 +94,18 @@ extension Fault {
 
     @Option(
       name: [.short, .long],
-      help: "Netlist in bench format. (Required iff generator is set to Atalanta or PODEM.)")
+      help:
+        "Netlist in bench format. (Required if generator is set to Atalanta or PODEM and a liberty file is not passed.)"
+    )
     var bench: String?
 
+    @Option(
+      name: [.customShort("l"), .long],
+      help:
+        "Liberty file. (Required if generator is set to Atalanta or PODEM and a bench file is not passed.)"
+    )
+    var liberty: String?
+
     @Flag(help: "Generate only one testbench for inspection, and do not delete it.")
     var sampleRun: Bool = false
 
@@ -182,8 +191,28 @@ extension Fault {
           Stderr.print("Unknown external test vector generator '\(tvGenerator)'.")
           Foundation.exit(EX_USAGE)
         }
+        if bench == nil && liberty == nil {
+          Stderr.print(
+            "Either --bench or --liberty must be passed when using an external test vector generator."
+          )
+          Foundation.exit(EX_USAGE)
+        }
 
-        let benchUnwrapped = bench!  // Program exits if etvGen.value isn't nil and bench.value is or vice versa
+        let benchUnwrapped =
+          bench
+          ?? ({
+            let nl2bench = Python.import("nl2bench")
+            let pyPath = Python.import("pathlib").Path
+            let benchPath = file.replacingExtension(".v", with: ".bench")
+            let benchPathF = Python.open(benchPath, "w", encoding: "utf8")
+            nl2bench.nl2bench.verilog_netlist_to_bench(
+              pyPath(file),
+              [
+                liberty!
+              ],
+              benchPathF, Array(bypass.bypassedIOs))
+            return benchPath
+          })()
 
         if !fileManager.fileExists(atPath: benchUnwrapped) {
           throw ValidationError("Bench file '\(benchUnwrapped)' not found.")

Sources/Fault/Entries/main.swift

@@ -21,7 +21,7 @@ import Foundation
 import PythonKit
 import Yams
 
-let VERSION = "0.9.0"
+let VERSION = "0.10.0"
 
 var env = ProcessInfo.processInfo.environment
 let iverilogBase = env["FAULT_IVL_BASE"] ?? "/usr/local/lib/ivl"