mirror of
https://github.com/YosysHQ/sby.git
synced 2025-04-05 14:04:07 +00:00
sby: fixed the sby task execution to accept the new engine internal layout
This commit is contained in:
parent
da56a3c6d1
commit
637095a8ec
|
@ -401,8 +401,8 @@ class SbyConfig:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if mode == "engines":
|
if mode == "engines":
|
||||||
entries = line.split()
|
args = line.strip().split()
|
||||||
self.engines[engine_mode].append(entries)
|
self.engines[engine_mode].append(args)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if mode == "setup":
|
if mode == "setup":
|
||||||
|
|
|
@ -25,13 +25,19 @@ def run(task):
|
||||||
task.handle_str_option("aigsmt", "yices")
|
task.handle_str_option("aigsmt", "yices")
|
||||||
|
|
||||||
for engine_idx, engine_section in task.engine_list():
|
for engine_idx, engine_section in task.engine_list():
|
||||||
engine = engine_section[1][0]
|
if isinstance(engine_section, list):
|
||||||
engine_name = engine_section[0]
|
engine = engine_section
|
||||||
|
engine_name = None
|
||||||
|
else:
|
||||||
|
engine = engine_section[1][0]
|
||||||
|
engine_name = engine_section[0]
|
||||||
|
|
||||||
if engine_name is None:
|
if engine_name is None:
|
||||||
engine_name = engine_idx
|
engine_name = engine_idx
|
||||||
|
|
||||||
assert len(engine) > 0
|
assert len(engine) > 0
|
||||||
|
|
||||||
|
|
||||||
task.log(f"""engine_{engine_name}: {" ".join(engine)}""")
|
task.log(f"""engine_{engine_name}: {" ".join(engine)}""")
|
||||||
task.makedirs(f"{task.workdir}/engine_{engine_idx}")
|
task.makedirs(f"{task.workdir}/engine_{engine_idx}")
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,13 @@ def run(task):
|
||||||
task.handle_int_option("append", 0)
|
task.handle_int_option("append", 0)
|
||||||
|
|
||||||
for engine_idx, engine_section in task.engine_list():
|
for engine_idx, engine_section in task.engine_list():
|
||||||
engine = engine_section[1][0]
|
if isinstance(engine_section, list):
|
||||||
engine_name = engine_section[0]
|
engine = engine_section
|
||||||
|
engine_name = None
|
||||||
|
else:
|
||||||
|
engine = engine_section[1][0]
|
||||||
|
engine_name = engine_section[0]
|
||||||
|
|
||||||
if engine_name is None:
|
if engine_name is None:
|
||||||
engine_name = engine_idx
|
engine_name = engine_idx
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,13 @@ def run(task):
|
||||||
task.status = "UNKNOWN"
|
task.status = "UNKNOWN"
|
||||||
|
|
||||||
for engine_idx, engine_section in task.engine_list():
|
for engine_idx, engine_section in task.engine_list():
|
||||||
engine = engine_section[1][0]
|
if isinstance(engine_section, list):
|
||||||
engine_name = engine_section[0]
|
engine = engine_section
|
||||||
|
engine_name = None
|
||||||
|
else:
|
||||||
|
engine = engine_section[1][0]
|
||||||
|
engine_name = engine_section[0]
|
||||||
|
|
||||||
if engine_name is None:
|
if engine_name is None:
|
||||||
engine_name = engine_idx
|
engine_name = engine_idx
|
||||||
|
|
||||||
|
|
|
@ -32,8 +32,13 @@ def run(task):
|
||||||
task.induction_procs = list()
|
task.induction_procs = list()
|
||||||
|
|
||||||
for engine_idx, engine_section in task.engine_list():
|
for engine_idx, engine_section in task.engine_list():
|
||||||
engine = engine_section[1][0]
|
if isinstance(engine_section, list):
|
||||||
engine_name = engine_section[0]
|
engine = engine_section
|
||||||
|
engine_name = None
|
||||||
|
else:
|
||||||
|
engine = engine_section[1][0]
|
||||||
|
engine_name = engine_section[0]
|
||||||
|
|
||||||
if engine_name is None:
|
if engine_name is None:
|
||||||
engine_name = engine_idx
|
engine_name = engine_idx
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue