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

Improve option handling

Browse source
This commit is contained in:
Clifford Wolf 2017-02-26 14:32:33 +01:00
parent 5657976ad3
commit be8c995e15
4 changed files with 49 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
sbysrc/sby_core.py
View file

@ -70,7 +70,7 @@ class SbyTask:
self.exit_callback(retcode)
def terminate(self, timeout=False):
if self.job.waitmode and not timeout:
if self.job.opt_wait and not timeout:
return
if self.running:
self.job.log("%s: terminating process" % self.info)
@ -128,6 +128,7 @@ class SbyTask:
class SbyJob:
def __init__(self, filename, workdir, early_logs):
self.options = dict()
self.used_options = set()
self.engines = list()
self.script = list()
self.files = dict()
@ -262,10 +263,10 @@ class SbyJob:
for task in self.tasks_running:
task.poll()
if "timeout" in self.options:
if self.opt_timeout is not None:
total_clock_time = int(time() - self.start_clock_time)
if total_clock_time > int(self.options["timeout"]):
self.log("Reached TIMEOUT (%d seconds). Terminating all tasks." % int(self.options["timeout"]))
if total_clock_time > self.opt_timeout:
self.log("Reached TIMEOUT (%d seconds). Terminating all tasks." % self.opt_timeout)
self.status = "TIMEOUT"
self.terminate(timeout=True)
@ -298,6 +299,28 @@ class SbyJob:
self.log("Copy '%s' to '%s'." % (srcfile, dstfile))
copyfile(srcfile, dstfile)
def handle_str_option(self, option_name, default_value):
if option_name in self.options:
self.__dict__["opt_" + option_name] = self.options[option_name]
self.used_options.add(option_name)
else:
self.__dict__["opt_" + option_name] = default_value
def handle_int_option(self, option_name, default_value):
if option_name in self.options:
self.__dict__["opt_" + option_name] = int(self.options[option_name])
self.used_options.add(option_name)
else:
self.__dict__["opt_" + option_name] = default_value
def handle_bool_option(self, option_name, default_value):
if option_name in self.options:
assert self.options[option_name] in ["on", "off"]
self.__dict__["opt_" + option_name] = self.options[option_name] == "on"
self.used_options.add(option_name)
else:
self.__dict__["opt_" + option_name] = default_value
def make_model(self, model_name):
if not os.path.exists("%s/model" % self.workdir):
os.makedirs("%s/model" % self.workdir)
@ -307,6 +330,7 @@ class SbyJob:
print("# running in %s/src/" % self.workdir, file=f)
for cmd in self.script:
print(cmd, file=f)
print("opt_clean", file=f)
print("write_ilang ../model/design.il", file=f)
task = SbyTask(self, "script", [],
@ -397,38 +421,42 @@ class SbyJob:
assert 0
def run(self):
assert "mode" in self.options
assert self.options["mode"] in ["bmc", "prove", "cover"]
self.handle_str_option("mode", None)
assert self.opt_mode in ["bmc", "prove", "cover"]
self.expect = ["PASS"]
if "expect" in self.options:
self.expect = self.options["expect"].upper().split(",")
self.used_options.add("expect")
for s in self.expect:
assert s in ["PASS", "FAIL", "UNKNOWN", "ERROR", "TIMEOUT"]
self.waitmode = False
if "wait" in self.options:
assert self.options["wait"] in ["on", "off"]
self.waitmode = self.options["wait"] == "on"
self.handle_bool_option("wait", False)
self.handle_int_option("timeout", None)
self.copy_src()
if self.options["mode"] == "bmc":
if self.opt_mode == "bmc":
import sby_mode_bmc
sby_mode_bmc.run(self)
elif self.options["mode"] == "prove":
elif self.opt_mode == "prove":
import sby_mode_prove
sby_mode_prove.run(self)
elif self.options["mode"] == "cover":
elif self.opt_mode == "cover":
import sby_mode_cover
sby_mode_cover.run(self)
else:
assert False
for opt in self.options.keys():
assert opt in self.used_options
self.taskloop()
total_clock_time = int(time() - self.start_clock_time)
ru = resource.getrusage(resource.RUSAGE_CHILDREN)

17
sbysrc/sby_mode_bmc.py
View file

@ -20,18 +20,9 @@ import re, os, getopt
from sby_core import SbyTask
def run(job):
job.opt_depth = 20
job.opt_append = 0
job.opt_aigsmt = "z3"
if "depth" in job.options:
job.opt_depth = int(job.options["depth"])
if "append" in job.options:
job.opt_append = int(job.options["append"])
if "aigsmt" in job.options:
job.opt_aigsmt = job.options["aigsmt"]
job.handle_int_option("depth", 20)
job.handle_int_option("append", 0)
job.handle_str_option("aigsmt", "z3")
for engine_idx in range(len(job.engines)):
engine = job.engines[engine_idx]
@ -51,5 +42,3 @@ def run(job):
else:
assert False
job.taskloop()

12
sbysrc/sby_mode_cover.py
View file

@ -20,14 +20,8 @@ import re, os, getopt
from sby_core import SbyTask
def run(job):
job.opt_depth = 20
job.opt_append = 0
if "depth" in job.options:
job.opt_depth = int(job.options["depth"])
if "append" in job.options:
job.opt_append = int(job.options["append"])
job.handle_int_option("depth", 20)
job.handle_int_option("append", 0)
for engine_idx in range(len(job.engines)):
engine = job.engines[engine_idx]
@ -43,5 +37,3 @@ def run(job):
else:
assert False
job.taskloop()

17
sbysrc/sby_mode_prove.py
View file

@ -20,18 +20,9 @@ import re, os, getopt
from sby_core import SbyTask
def run(job):
job.opt_depth = 20
job.opt_append = 0
job.opt_aigsmt = "z3"
if "depth" in job.options:
job.opt_depth = int(job.options["depth"])
if "append" in job.options:
job.opt_append = int(job.options["append"])
if "aigsmt" in job.options:
job.opt_aigsmt = job.options["aigsmt"]
job.handle_int_option("depth", 20)
job.handle_int_option("append", 0)
job.handle_str_option("aigsmt", "z3")
job.status = "UNKNOWN"
@ -62,5 +53,3 @@ def run(job):
else:
assert False
job.taskloop()