Fix handling of counter examples with "abc bmc3" engine

diff --git a/sbysrc/sby_bmc.py b/sbysrc/sby_bmc.py
index feaccf8c383b80a8f50cd8cb7381831084c5e2bb..a0f3d7b3ac9ff347dd9317a793150ae82d44a626 100644 (file)
--- a/sbysrc/sby_bmc.py
+++ b/sbysrc/sby_bmc.py
@@ -112,9 +112,9 @@ def run_abc(job, engine_idx, engine):
         if job.status == "FAIL":
             copyfile("%s/model/design_aiger.aim" % job.workdir, "%s/engine_%d/trace.aim" % (job.workdir, engine_idx))
             task2 = SbyTask(job, "engine_%d" % engine_idx, job.model("smt2"),
-                    ("cd %s; yosys-smtbmc --noprogress %s -t %d --dump-vcd engine_%d/trace.vcd --dump-vlogtb engine_%d/trace_tb.v " +
+                    ("cd %s; yosys-smtbmc --noprogress -t %d --dump-vcd engine_%d/trace.vcd --dump-vlogtb engine_%d/trace_tb.v " +
                      "--dump-smtc engine_%d/trace.smtc --aig engine_%d/trace --aig-noheader model/design_smt2.smt2") %
-                            (job.workdir, " ".join(engine[1:]), job.opt_depth, engine_idx, engine_idx, engine_idx, engine_idx),
+                            (job.workdir, job.opt_depth, engine_idx, engine_idx, engine_idx, engine_idx),
                     logfile=open("%s/engine_%d/logfile2.txt" % (job.workdir, engine_idx), "w"))
 
             task2_status = None

diff --git a/sbysrc/sby_core.py b/sbysrc/sby_core.py
index 4acf18e6eee8d210718778d616fb99cd42f28df3..a9074f3a80e74e834d3cb3b311b131f31505c4b2 100644 (file)
--- a/sbysrc/sby_core.py
+++ b/sbysrc/sby_core.py
@@ -295,8 +295,9 @@ class SbyJob:
                 print("flatten", file=f)
                 print("setattr -unset keep", file=f)
                 print("delete -output", file=f)
-                print("memory_map", file=f)
                 print("opt -full", file=f)
+                print("memory_map", file=f)
+                print("opt -fast", file=f)
                 print("techmap", file=f)
                 print("opt -fast", file=f)
                 print("abc -g AND -fast", file=f)