Co-authored-by: Mohamed Gaber <[email protected]>

.gitignore

@@ -29,3 +29,4 @@ parsetab.py
 
 .swiftpm/
 abc.history
+temp.txt

Benchmarks/Benchmarks/aes128.v

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-module aes128(clk, state, key, out);
+module aes128(clk, state, key, out, reset);
     input          clk;
+    input reset;
     input  [127:0] state, key;
     output [127:0] out;
     reg    [127:0] s0, k0;

Benchmarks/test.sh

@@ -10,7 +10,7 @@ function usage() {
   echo "  --all               Runs Fault's complete flow"
   echo "  --synth             Runs synthesis script"
   echo "  --cut               Runs cut option on the synthesized netlist" 
-  echo "  -g, --tvgen         Runs fault simulation using the specified TV generator (swift, atalanta, LFSR, PODEM)"
+  echo "  -g, --tvgen         Runs fault simulation using the specified TV generator (swift, atalanta, LFSR, PODEM, PodemQuest)"
   echo "  --delay             Runs the transition fault simulator" 
   echo "  --chain             Runs chain option on the synthesized netlist" 
   echo "  --tap               Runs tap option on the chained netlist" 
@@ -194,7 +194,7 @@ do
         ignoring="-i $ignored_input,$clock_signal,$reset_signal"
     fi
     # Check tvgen type
-    if [ $tvgen = "atalanta" ] || [ $tvgen = "podem" ];
+    if [ $tvgen = "atalanta" ] || [ $tvgen = "podem" ] || [ $tvgen = "PodemQuest" ];
         then
         bench=$cut_netlist.bench
         echo "Generating bench circuit for $cut_netlist"

Sources/Fault/Entries/atpg.swift

@@ -217,6 +217,8 @@ extension Fault {
                             evtInputsMinusIgnored.append(input)
                         }
                     }
+                    print(inputsMinusIgnored);
+                    print(evtInputsMinusIgnored);
                     assert(inputsMinusIgnored.count == evtInputsMinusIgnored.count);
                     inputsMinusIgnored = evtInputsMinusIgnored
                 }

Sources/Fault/Entries/main.swift

@@ -38,6 +38,7 @@ _ = [ // Register all TVGens
     Atalanta.registered,
     Quaigh.registered,
     PODEM.registered,
+    PodemQuest.registered,
 ]
 
 let yosysTest = "'\(yosysExecutable)' -V".sh(silent: true)

Sources/Fault/Synthesis.swift

@@ -36,6 +36,7 @@ enum Synthesis {
 
         # check design hierarchy
         hierarchy \(checkHierarchy ? "-check" : "") -top \(module)
+        flatten;
 
         # translate processes (always blocks)
         proc; \(opt)
@@ -60,6 +61,7 @@ enum Synthesis {
 
         # mapping logic to mycells.lib
         abc -liberty \(libertyFile)
+        splitnets -ports
 
         # print gate count
         stat

Sources/Fault/TVGenerator.swift

@@ -316,3 +316,28 @@ class PODEM: ExternalTestVectorGenerator {
 
     static let registered = ETVGFactory.register(name: "PODEM", type: PODEM.self)
 }
+
+
+class PodemQuest: ExternalTestVectorGenerator {
+
+    required init() {}
+
+    func generate(file: String, module: String) -> ([TestVector], [Port]) {
+        let output = file.replacingExtension(".bench", with: ".test")
+        let podemQuest = "podemquest -i\(file) -o \(output)".sh()
+
+        if podemQuest != EX_OK {
+            exit(podemQuest)
+        }
+
+        do {
+            let (testvectors, inputs) = try TVSet.readFromTest(output, withInputsFrom: file)
+            return (vectors: testvectors, inputs: inputs)
+        } catch {
+            Stderr.print("Internal software error: \(error)")
+            exit(EX_SOFTWARE)
+        }
+    }
+
+    static let registered = ETVGFactory.register(name: "PodemQuest", type: PodemQuest.self)
+}

docs/Source/installation.md

@@ -56,3 +56,4 @@ are some pointers nevertheless.
 - [Quaigh](https://github.com/coloquinte/quaigh) (Optional but really recommended)
 - [Atalanta](https://github.com/hsluoyz/atalanta) (Optional)
 - [NTU EE PODEM](https://github.com/donn/VLSI-Testing) (Optional)
+//todo: add PodemQuest

flake.nix

@@ -2,7 +2,7 @@
   inputs = {
     nix-eda.url = github:efabless/nix-eda;
     nl2bench = {
-      url = github:donn/nl2bench;
+      url = github:donn/nl2bench/dirtiest_workaround_imaginable;
       inputs.nix-eda.follows = "nix-eda";
     };
     quaigh = {
@@ -21,15 +21,14 @@
 
     devShells = nix-eda.forAllSystems { withInputs = [nix-eda quaigh nl2bench self]; } (util: with util; rec {
       mac-testing = pkgs.stdenvNoCC.mkDerivation (with pkgs; let
-        pyenv = (python3.withPackages(ps: with ps; [pyverilog pyyaml pytest]));
+        pyenv = (python3.withPackages(ps: with ps; [pyverilog pyyaml pytest pkgs.nl2bench]));
       in {
         # Use the host's Clang and Swift
         name = "shell";
         buildInputs = [
           yosys
           verilog
           pkgs.quaigh
-          pkgs.nl2bench
           pyenv
           gtkwave
         ];