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

Fix error handling in model creation

Browse source
This commit is contained in:
Clifford Wolf 2017-01-29 15:37:42 +01:00
parent 4f97a20acd
commit 170a7efe10
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sbysrc/sby_core.py
View file

@ -27,6 +27,7 @@ class SbyTask:
self.running = False self.running = False
self.finished = False self.finished = False
self.terminated = False self.terminated = False
self.checkretcode = False
self.job = job self.job = job
self.info = info self.info = info
self.deps = deps self.deps = deps
@ -95,13 +96,20 @@ class SbyTask:
self.handle_output(outs.strip()) self.handle_output(outs.strip())
if self.p.poll() is not None: if self.p.poll() is not None:
self.handle_exit(self.p.returncode)
self.job.log("%s: finished (returncode=%d)" % (self.info, self.p.returncode)) self.job.log("%s: finished (returncode=%d)" % (self.info, self.p.returncode))
self.handle_exit(self.p.returncode)
self.job.tasks_running.remove(self) self.job.tasks_running.remove(self)
self.running = False self.running = False
self.finished = True
if self.checkretcode and self.p.returncode != 0:
self.job.log("%s: job failed. terminate." % self.info)
self.terminated = True
for task in self.job.tasks_running:
task.terminate()
return
self.finished = True
for next_task in self.notify: for next_task in self.notify:
next_task.poll() next_task.poll()
return return
@ -255,6 +263,7 @@ class SbyJob:
task = SbyTask(self, "script", [], task = SbyTask(self, "script", [],
"cd %s/src; yosys -ql ../model/design.log ../model/design.ys" % (self.workdir)) "cd %s/src; yosys -ql ../model/design.log ../model/design.ys" % (self.workdir))
task.checkretcode = True
return [task] return [task]
@ -275,6 +284,7 @@ class SbyJob:
task = SbyTask(self, model_name, self.model("ilang"), task = SbyTask(self, model_name, self.model("ilang"),
"cd %s/model; yosys -ql design_%s.log design_%s.ys" % (self.workdir, model_name, model_name)) "cd %s/model; yosys -ql design_%s.log design_%s.ys" % (self.workdir, model_name, model_name))
task.checkretcode = True
return [task] return [task]
@ -296,6 +306,7 @@ class SbyJob:
task = SbyTask(self, "aig", self.model("ilang"), task = SbyTask(self, "aig", self.model("ilang"),
"cd %s/model; yosys -ql design_aiger.log design_aiger.ys" % (self.workdir)) "cd %s/model; yosys -ql design_aiger.log design_aiger.ys" % (self.workdir))
task.checkretcode = True
return [task] return [task]