mirror of
https://github.com/YosysHQ/sby.git
synced 2025-04-05 14:04:07 +00:00
modified the mode runners to accept the modified engine layout in preperation for the per-mode engine sections
This commit is contained in:
parent
f1a645bb18
commit
9293081308
|
@ -247,7 +247,7 @@ class SbyConfig:
|
|||
def __init__(self):
|
||||
self.options = dict()
|
||||
# Define a default case for the engine block
|
||||
self.engines = list() # { None: list() }
|
||||
self.engines = { None: list() }
|
||||
self.setup = dict()
|
||||
self.stage = dict()
|
||||
self.script = list()
|
||||
|
@ -387,8 +387,7 @@ class SbyConfig:
|
|||
|
||||
if mode == "engines":
|
||||
entries = line.split()
|
||||
# self.engines[engine_mode].append(entries)
|
||||
self.engines.append(entries)
|
||||
self.engines[engine_mode].append(entries)
|
||||
continue
|
||||
|
||||
if mode == "setup":
|
||||
|
@ -565,7 +564,7 @@ class SbyTask(SbyConfig):
|
|||
print(line, file=f)
|
||||
|
||||
def engine_list(self):
|
||||
return list(enumerate(self.engines))
|
||||
return list(enumerate(self.engines.items()))
|
||||
|
||||
def check_timeout(self):
|
||||
if self.opt_timeout is not None:
|
||||
|
|
|
@ -24,10 +24,15 @@ def run(task):
|
|||
task.handle_int_option("append", 0)
|
||||
task.handle_str_option("aigsmt", "yices")
|
||||
|
||||
for engine_idx, engine in task.engine_list():
|
||||
for engine_idx, engine_section in task.engine_list():
|
||||
engine = engine_section[1][0]
|
||||
engine_name = engine_section[0]
|
||||
if engine_name is None:
|
||||
engine_name = engine_idx
|
||||
|
||||
assert len(engine) > 0
|
||||
|
||||
task.log(f"""engine_{engine_idx}: {" ".join(engine)}""")
|
||||
task.log(f"""engine_{engine_name}: {" ".join(engine)}""")
|
||||
task.makedirs(f"{task.workdir}/engine_{engine_idx}")
|
||||
|
||||
if engine[0] == "smtbmc":
|
||||
|
|
|
@ -23,10 +23,16 @@ def run(task):
|
|||
task.handle_int_option("depth", 20)
|
||||
task.handle_int_option("append", 0)
|
||||
|
||||
for engine_idx, engine in task.engine_list():
|
||||
for engine_idx, engine_section in task.engine_list():
|
||||
engine = engine_section[1][0]
|
||||
engine_name = engine_section[0]
|
||||
if engine_name is None:
|
||||
engine_name = engine_idx
|
||||
|
||||
|
||||
assert len(engine) > 0
|
||||
|
||||
task.log(f"""engine_{engine_idx}: {" ".join(engine)}""")
|
||||
task.log(f"""engine_{engine_name}: {" ".join(engine)}""")
|
||||
task.makedirs(f"{task.workdir}/engine_{engine_idx}")
|
||||
|
||||
if engine[0] == "smtbmc":
|
||||
|
|
|
@ -24,10 +24,15 @@ def run(task):
|
|||
|
||||
task.status = "UNKNOWN"
|
||||
|
||||
for engine_idx, engine in task.engine_list():
|
||||
for engine_idx, engine_section in task.engine_list():
|
||||
engine = engine_section[1][0]
|
||||
engine_name = engine_section[0]
|
||||
if engine_name is None:
|
||||
engine_name = engine_idx
|
||||
|
||||
assert len(engine) > 0
|
||||
|
||||
task.log(f"""engine_{engine_idx}: {" ".join(engine)}""")
|
||||
task.log(f"""engine_{engine_name}: {" ".join(engine)}""")
|
||||
task.makedirs(f"{task.workdir}/engine_{engine_idx}")
|
||||
|
||||
if engine[0] == "aiger":
|
||||
|
|
|
@ -31,10 +31,15 @@ def run(task):
|
|||
task.basecase_procs = list()
|
||||
task.induction_procs = list()
|
||||
|
||||
for engine_idx, engine in task.engine_list():
|
||||
for engine_idx, engine_section in task.engine_list():
|
||||
engine = engine_section[1][0]
|
||||
engine_name = engine_section[0]
|
||||
if engine_name is None:
|
||||
engine_name = engine_idx
|
||||
|
||||
assert len(engine) > 0
|
||||
|
||||
task.log(f"""engine_{engine_idx}: {" ".join(engine)}""")
|
||||
task.log(f"""engine_{engine_name}: {" ".join(engine)}""")
|
||||
task.makedirs(f"{task.workdir}/engine_{engine_idx}")
|
||||
|
||||
if engine[0] == "smtbmc":
|
||||
|
|
Loading…
Reference in a new issue