mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Imporove yosys-smtbmc error handling, Improve VCD output

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-03-05 12:08:41 +01:00
parent 61a9e2eeb3
commit cedbc35f4b
2 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backends/smt2/smtbmc.py
View file

@ -719,9 +719,12 @@ def write_vlogtb_trace(steps_start, steps_stop, index):
if vlogtbtop is not None: if vlogtbtop is not None:
for item in vlogtbtop.split("."): for item in vlogtbtop.split("."):
assert item in smt.modinfo[vlogtb_topmod].cells if item in smt.modinfo[vlogtb_topmod].cells:
vlogtb_state = "(|%s_h %s| %s)" % (vlogtb_topmod, item, vlogtb_state) vlogtb_state = "(|%s_h %s| %s)" % (vlogtb_topmod, item, vlogtb_state)
vlogtb_topmod = smt.modinfo[vlogtb_topmod].cells[item] vlogtb_topmod = smt.modinfo[vlogtb_topmod].cells[item]
else:
print_msg("Vlog top module '%s' not found: no cell '%s' in module '%s'" % (vlogtbtop, item, vlogtb_topmod))
break
with open(filename, "w") as f: with open(filename, "w") as f:
print("`ifndef VERILATOR", file=f) print("`ifndef VERILATOR", file=f)

63
backends/smt2/smtio.py
View file

@ -37,21 +37,30 @@ if resource.getrlimit(resource.RLIMIT_STACK)[0] < smtio_stacksize:
# currently running solvers (so we can kill them) # currently running solvers (so we can kill them)
running_solvers = dict() running_solvers = dict()
got_term_signal = False forced_shutdown = False
solvers_index = 0 solvers_index = 0
def sig_handler(signum, frame): def force_shutdown(signum, frame):
global got_term_signal global forced_shutdown
if not got_term_signal: if not forced_shutdown:
print("<%s>" % signal.Signals(signum).name) forced_shutdown = True
got_term_signal = True if signum is not None:
for p in running_solvers.values(): print("<%s>" % signal.Signals(signum).name)
os.killpg(os.getpgid(p.pid), signal.SIGTERM) for p in running_solvers.values():
# os.killpg(os.getpgid(p.pid), signal.SIGTERM)
os.kill(p.pid, signal.SIGTERM)
sys.exit(1) sys.exit(1)
signal.signal(signal.SIGINT, sig_handler) signal.signal(signal.SIGINT, force_shutdown)
signal.signal(signal.SIGHUP, sig_handler) signal.signal(signal.SIGHUP, force_shutdown)
signal.signal(signal.SIGTERM, sig_handler) signal.signal(signal.SIGTERM, force_shutdown)
def except_hook(exctype, value, traceback):
if not forced_shutdown:
sys.__excepthook__(exctype, value, traceback)
force_shutdown(None, None)
sys.excepthook = except_hook
hex_dict = { hex_dict = {
@ -133,7 +142,7 @@ class SmtIo:
self.setup_done = False self.setup_done = False
def __del__(self): def __del__(self):
if self.p is not None: if self.p is not None and not forced_shutdown:
os.killpg(os.getpgid(self.p.pid), signal.SIGTERM) os.killpg(os.getpgid(self.p.pid), signal.SIGTERM)
if running_solvers is not None: if running_solvers is not None:
del running_solvers[self.p_index] del running_solvers[self.p_index]
@ -948,7 +957,7 @@ class MkVcd:
print("b%s %s" % (bits, self.nets[path][0]), file=self.f) print("b%s %s" % (bits, self.nets[path][0]), file=self.f)
def escape_name(self, name): def escape_name(self, name):
name = re.sub(r"\[([a-zA-Z_][0-9a-zA-Z_]*)\]", r".\1", name) name = re.sub(r"\[([0-9a-zA-Z_]*[a-zA-Z_][0-9a-zA-Z_]*)\]", r"<\1>", name)
if re.match("[\[\]]", name) and name[0] != "\\": if re.match("[\[\]]", name) and name[0] != "\\":
name = "\\" + name name = "\\" + name
return name return name
@ -959,21 +968,35 @@ class MkVcd:
if self.t == -1: if self.t == -1:
print("$var integer 32 t smt_step $end", file=self.f) print("$var integer 32 t smt_step $end", file=self.f)
print("$var event 1 ! smt_clock $end", file=self.f) print("$var event 1 ! smt_clock $end", file=self.f)
scope = [] scope = []
for path in sorted(self.nets): for path in sorted(self.nets):
while len(scope)+1 > len(path) or (len(scope) > 0 and scope[-1] != path[len(scope)-1]): key, width = self.nets[path]
uipath = list(path)
if "." in uipath[-1]:
uipath = uipath[0:-1] + uipath[-1].split(".")
for i in range(len(uipath)):
uipath[i] = re.sub(r"\[([^\]]*)\]", r"<\1>", uipath[i])
while uipath[:len(scope)] != scope[:-1]:
print("$upscope $end", file=self.f) print("$upscope $end", file=self.f)
scope = scope[:-1] scope = scope[:-1]
while len(scope)+1 < len(path): print(scope, file=self.f)
print("$scope module %s $end" % path[len(scope)], file=self.f)
scope.append(path[len(scope)-1]) while uipath[:-1] != scope:
key, width = self.nets[path] print("$scope module %s $end" % uipath[len(scope)], file=self.f)
scope.append(uipath[len(scope)])
print(scope, file=self.f)
if path in self.clocks and self.clocks[path][1] == "event": if path in self.clocks and self.clocks[path][1] == "event":
print("$var event 1 %s %s $end" % (key, self.escape_name(path[-1])), file=self.f) print("$var event 1 %s %s $end" % (key, uipath[-1]), file=self.f)
else: else:
print("$var wire %d %s %s $end" % (width, key, self.escape_name(path[-1])), file=self.f) print("$var wire %d %s %s $end" % (width, key, uipath[-1]), file=self.f)
for i in range(len(scope)): for i in range(len(scope)):
print("$upscope $end", file=self.f) print("$upscope $end", file=self.f)
print("$enddefinitions $end", file=self.f) print("$enddefinitions $end", file=self.f)
self.t = t self.t = t