3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-04-05 06:04:06 +00:00

Fixes and improvements in BTOR engine

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-12-08 07:16:19 +01:00
parent a362b35349
commit 3d66e7cec5
2 changed files with 7 additions and 3 deletions

View file

@ -533,8 +533,8 @@ class SbyJob:
self.opt_skip = None
else:
for engine in self.engines:
if engine[0] != "smtbmc":
self.error("Option skip is only valid for smtbmc engine.")
if engine[0] not in ["smtbmc", "btor"]:
self.error("Option skip is only valid for smtbmc and btor engines.")
self.copy_src()

View file

@ -29,7 +29,7 @@ def run(mode, job, engine_idx, engine):
job.error("Unexpected BTOR engine options.")
if solver_args[0] == "btormc":
solver_cmd = job.exe_paths["btormc"] + " --stop-first -v 1 -kmax %d" % job.opt_depth
solver_cmd = job.exe_paths["btormc"] + " --stop-first -v 1 -kmax %d" % (job.opt_depth - 1)
if job.opt_skip is not None:
solver_cmd += " -kmin %d" % job.opt_skip
solver_cmd += " ".join([""] + solver_args[1:])
@ -64,6 +64,10 @@ def run(mode, job, engine_idx, engine):
return "No CEX up to depth %d." % (int(line[1:])-1)
if solver_args[0] == "btormc":
if "calling BMC on" in line:
return line
if "SATISFIABLE" in line:
return line
if "bad state properties at bound" in line:
return line
if "deleting model checker:" in line: