More xsthammer improvements

diff --git a/tests/xsthammer/run-check.sh b/tests/xsthammer/run-check.sh
index 4f4658a9661b538017e03b4073efd5c60c2e32e2..6604f6e08a0458987bb9ecc19d85d2dbbcbf3fbb 100644 (file)
--- a/tests/xsthammer/run-check.sh
+++ b/tests/xsthammer/run-check.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 mkdir -p check
 
 rm -rf check_temp
@@ -14,39 +14,45 @@ fi
 for job
 do
        {
-               echo "module top(a, b, y_rtl, y_xst);"
+               echo "module ${job}_top(a, b, y_rtl, y_xst);"
                sed -r '/^(input|output) / !d; /output/ { s/ y;/ y_rtl;/; p; }; s/ y_rtl;/ y_xst;/;' ../rtl/$job.v
                echo "${job}_rtl rtl_variant (.a(a), .b(b), .y(y_rtl));"
                echo "${job}_xst xst_variant (.a(a), .b(b), .y(y_xst));"
                echo "endmodule"
        } > ${job}_top.v
 
-       {
-               echo "read_verilog -DGLBL ../xst/$job.v"
-               echo "rename $job ${job}_xst"
+       for mode in nomap techmap; do
+               {
+                       echo "read_verilog -DGLBL ../xst/$job.v"
+                       echo "rename $job ${job}_xst"
 
-               echo "read_verilog ../rtl/$job.v"
-               echo "rename $job ${job}_rtl"
-               # echo "techmap ${job}_rtl"
+                       echo "read_verilog ../rtl/$job.v"
+                       echo "rename $job ${job}_rtl"
+                       if [ $mode = techmap ]; then
+                               echo "techmap ${job}_rtl"
+                       fi
 
-               echo "read_verilog ${job}_top.v"
-               echo "read_verilog ../xl_cells.v"
+                       echo "read_verilog ${job}_top.v"
+                       echo "read_verilog ../xl_cells.v"
 
-               echo "hierarchy -top top"
-               echo "flatten top"
-               echo "hierarchy -top top"
-               echo "opt_clean"
+                       echo "hierarchy -top ${job}_top"
+                       echo "flatten ${job}_top"
+                       echo "hierarchy -top ${job}_top"
+                       echo "opt_clean"
 
-               echo "write_ilang ${job}_top.il"
-       } > ${job}_top.ys
+                       echo "rename ${job}_top ${job}_top_${mode}"
+                       echo "write_ilang ${job}_top_${mode}.il"
+               } > ${job}_top_${mode}.ys
+               ../../../yosys -q ${job}_top_${mode}.ys
+       done
 
        {
-               echo "read_ilang ${job}_top.il"
-               echo "sat -verify -show a,b,y_rtl,y_xst -prove y_rtl y_xst top"
+               echo "read_ilang ${job}_top_nomap.il"
+               echo "read_ilang ${job}_top_techmap.il"
+               echo "sat -verify -show a,b,y_rtl,y_xst -prove y_rtl y_xst ${job}_top_nomap"
+               echo "sat -verify -show a,b,y_rtl,y_xst -prove y_rtl y_xst ${job}_top_techmap"
        } > ${job}_cmp.ys
 
-       ../../../yosys ${job}_top.ys
-
        if ../../../yosys -l ${job}.log ${job}_cmp.ys; then
                mv ${job}.log ../check/${job}.log
                rm -f ../check/${job}.err

diff --git a/tests/xsthammer/run-xst.sh b/tests/xsthammer/run-xst.sh
index 00c46a75225508a96e859d60692651dad794540d..879ce75c51cf76485e76bfa8205b8594a53bcee3 100644 (file)
--- a/tests/xsthammer/run-xst.sh
+++ b/tests/xsthammer/run-xst.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 mkdir -p xst
 . /opt/Xilinx/14.2/ISE_DS/settings64.sh