Added yosys-smtbmc --noinfo and --dummy

diff --git a/backends/smt2/smtbmc.py b/backends/smt2/smtbmc.py
index 59410ea3a12acc38530ff325967e73160378112b..bb763647c973699383d0389360d584015a0117b5 100644 (file)
--- a/backends/smt2/smtbmc.py
+++ b/backends/smt2/smtbmc.py
@@ -35,6 +35,7 @@ dumpall = False
 assume_skipped = None
 final_only = False
 topmod = None
+noinfo = False
 so = SmtOpts()
 
 
@@ -60,6 +61,10 @@ yosys-smtbmc [options] <yosys_smt2_output>
     --smtc <constr_filename>
         read constraints file
 
+    --noinfo
+        only run the core proof, do not collect and print any
+        additional information (e.g. which assert failed)
+
     --final-only
         only check final constraints, assume base case
 
@@ -89,7 +94,7 @@ yosys-smtbmc [options] <yosys_smt2_output>
 
 try:
     opts, args = getopt.getopt(sys.argv[1:], so.shortopts + "t:igm:", so.longopts +
-            ["final-only", "assume-skipped=", "smtc=", "dump-vcd=", "dump-vlogtb=", "dump-smtc=", "dump-all"])
+            ["final-only", "assume-skipped=", "smtc=", "dump-vcd=", "dump-vlogtb=", "dump-smtc=", "dump-all", "noinfo"])
 except:
     usage()
 
@@ -121,6 +126,8 @@ for o, a in opts:
         outconstr = a
     elif o == "--dump-all":
         dumpall = True
+    elif o == "--noinfo":
+        noinfo = True
     elif o == "-i":
         tempind = True
     elif o == "-g":
@@ -485,6 +492,7 @@ def print_failed_asserts_worker(mod, state, path):
 
 
 def print_failed_asserts(state, final=False):
+    if noinfo: return
     loc_list, expr_list, value_list = get_constr_expr(constr_asserts, state, final=final, getvalues=True)
 
     for loc, expr, value in zip(loc_list, expr_list, value_list):
@@ -506,6 +514,7 @@ def print_anyconsts_worker(mod, state, path):
 
 
 def print_anyconsts(state):
+    if noinfo: return
     print_anyconsts_worker(topmod, "s%d" % state, topmod)
 
 

diff --git a/backends/smt2/smtio.py b/backends/smt2/smtio.py
index e8f1c7a7d4620889a75945e2734f3ec338870272..58554572d51ba0f28ada0fdf23515be89706e060 100644 (file)
--- a/backends/smt2/smtio.py
+++ b/backends/smt2/smtio.py
@@ -47,7 +47,7 @@ class SmtModInfo:
 
 
 class SmtIo:
-    def __init__(self, logic=None, solver=None, debug_print=None, debug_file=None, timeinfo=None, unroll=None, opts=None):
+    def __init__(self, opts=None):
         self.logic = None
         self.logic_qf = True
         self.logic_ax = True
@@ -59,6 +59,7 @@ class SmtIo:
             self.solver = opts.solver
             self.debug_print = opts.debug_print
             self.debug_file = opts.debug_file
+            self.dummy_file = opts.dummy_file
             self.timeinfo = opts.timeinfo
             self.unroll = opts.unroll
 
@@ -66,27 +67,10 @@ class SmtIo:
             self.solver = "z3"
             self.debug_print = False
             self.debug_file = None
+            self.dummy_file = None
             self.timeinfo = True
             self.unroll = False
 
-        if logic is not None:
-            self.logic = logic
-
-        if solver is not None:
-            self.solver = solver
-
-        if debug_print is not None:
-            self.debug_print = debug_print
-
-        if debug_file is not None:
-            self.debug_file = debug_file
-
-        if timeinfo is not None:
-            self.timeinfo = timeinfo
-
-        if unroll is not None:
-            self.unroll = unroll
-
         if self.solver == "yices":
             popen_vargs = ['yices-smt2', '--incremental']
 
@@ -103,6 +87,14 @@ class SmtIo:
             popen_vargs = ['boolector', '--smt2', '-i']
             self.unroll = True
 
+        if self.solver == "dummy":
+            assert self.dummy_file is not None
+            self.dummy_fd = open(self.dummy_file, "r")
+        else:
+            if self.dummy_file is not None:
+                self.dummy_fd = open(self.dummy_file, "w")
+            self.p = subprocess.Popen(popen_vargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
         if self.unroll:
             self.logic_uf = False
             self.unroll_idcnt = 0
@@ -113,7 +105,6 @@ class SmtIo:
             self.unroll_cache = dict()
             self.unroll_stack = list()
 
-        self.p = subprocess.Popen(popen_vargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         self.start_time = time()
 
         self.modinfo = dict()
@@ -254,8 +245,9 @@ class SmtIo:
             print(stmt, file=self.debug_file)
             self.debug_file.flush()
 
-        self.p.stdin.write(bytes(stmt + "\n", "ascii"))
-        self.p.stdin.flush()
+        if self.solver != "dummy":
+            self.p.stdin.write(bytes(stmt + "\n", "ascii"))
+            self.p.stdin.flush()
 
     def info(self, stmt):
         if not stmt.startswith("; yosys-smt2-"):
@@ -334,15 +326,22 @@ class SmtIo:
         count_brackets = 0
 
         while True:
-            line = self.p.stdout.readline().decode("ascii").strip()
+            if self.solver == "dummy":
+                line = self.dummy_fd.readline().strip()
+            else:
+                line = self.p.stdout.readline().decode("ascii").strip()
+                if self.dummy_file is not None:
+                    self.dummy_fd.write(line + "\n")
+
             count_brackets += line.count("(")
             count_brackets -= line.count(")")
             stmt.append(line)
+
             if self.debug_print:
                 print("< %s" % line)
             if count_brackets == 0:
                 break
-            if self.p.poll():
+            if self.solver != "dummy" and self.p.poll():
                 print("SMT Solver terminated unexpectedly: %s" % "".join(stmt))
                 sys.exit(1)
 
@@ -360,43 +359,44 @@ class SmtIo:
             print("; running check-sat..", file=self.debug_file)
             self.debug_file.flush()
 
-        self.p.stdin.write(bytes("(check-sat)\n", "ascii"))
-        self.p.stdin.flush()
+        if self.solver != "dummy":
+            self.p.stdin.write(bytes("(check-sat)\n", "ascii"))
+            self.p.stdin.flush()
 
-        if self.timeinfo:
-            i = 0
-            s = "/-\|"
+            if self.timeinfo:
+                i = 0
+                s = "/-\|"
 
-            count = 0
-            num_bs = 0
-            while select([self.p.stdout], [], [], 0.1) == ([], [], []):
-                count += 1
+                count = 0
+                num_bs = 0
+                while select([self.p.stdout], [], [], 0.1) == ([], [], []):
+                    count += 1
 
-                if count < 25:
-                    continue
+                    if count < 25:
+                        continue
 
-                if count % 10 == 0 or count == 25:
-                    secs = count // 10
+                    if count % 10 == 0 or count == 25:
+                        secs = count // 10
 
-                    if secs < 60:
-                        m = "(%d seconds)" % secs
-                    elif secs < 60*60:
-                        m = "(%d seconds -- %d:%02d)" % (secs, secs // 60, secs % 60)
-                    else:
-                        m = "(%d seconds -- %d:%02d:%02d)" % (secs, secs // (60*60), (secs // 60) % 60, secs % 60)
+                        if secs < 60:
+                            m = "(%d seconds)" % secs
+                        elif secs < 60*60:
+                            m = "(%d seconds -- %d:%02d)" % (secs, secs // 60, secs % 60)
+                        else:
+                            m = "(%d seconds -- %d:%02d:%02d)" % (secs, secs // (60*60), (secs // 60) % 60, secs % 60)
 
-                    print("%s %s %c" % ("\b \b" * num_bs, m, s[i]), end="", file=sys.stderr)
-                    num_bs = len(m) + 3
+                        print("%s %s %c" % ("\b \b" * num_bs, m, s[i]), end="", file=sys.stderr)
+                        num_bs = len(m) + 3
 
-                else:
-                    print("\b" + s[i], end="", file=sys.stderr)
+                    else:
+                        print("\b" + s[i], end="", file=sys.stderr)
 
-                sys.stderr.flush()
-                i = (i + 1) % len(s)
+                    sys.stderr.flush()
+                    i = (i + 1) % len(s)
 
-            if num_bs != 0:
-                print("\b \b" * num_bs, end="", file=sys.stderr)
-                sys.stderr.flush()
+                if num_bs != 0:
+                    print("\b \b" * num_bs, end="", file=sys.stderr)
+                    sys.stderr.flush()
 
         result = self.read()
         if self.debug_file:
@@ -555,16 +555,18 @@ class SmtIo:
         return [self.bv2bin(v) for v in self.get_net_list(mod_name, net_path_list, state_name)]
 
     def wait(self):
-        self.p.wait()
+        if self.solver != "dummy":
+            self.p.wait()
 
 
 class SmtOpts:
     def __init__(self):
         self.shortopts = "s:v"
-        self.longopts = ["unroll", "no-progress", "dump-smt2=", "logic="]
+        self.longopts = ["unroll", "no-progress", "dump-smt2=", "logic=", "dummy="]
         self.solver = "z3"
         self.debug_print = False
         self.debug_file = None
+        self.dummy_file = None
         self.unroll = False
         self.timeinfo = True
         self.logic = None
@@ -582,6 +584,8 @@ class SmtOpts:
             self.debug_file = open(a, "w")
         elif o == "--logic":
             self.logic = a
+        elif o == "--dummy":
+            self.dummy_file = a
         else:
             return False
         return True
@@ -589,9 +593,16 @@ class SmtOpts:
     def helpmsg(self):
         return """
     -s <solver>
-        set SMT solver: z3, cvc4, yices, mathsat
+        set SMT solver: z3, cvc4, yices, mathsat, boolector, dummy
         default: z3
 
+    --logic <smt2_logic>
+        use the specified SMT2 logic (e.g. QF_AUFBV)
+
+    --dummy <filename>
+        if solver is "dummy", read solver output from that file
+        otherwise: write solver output to that file
+
     -v
         enable debug output