From: N. Engelhardt Date: Wed, 12 Jan 2022 12:18:54 +0000 (+0100) Subject: create only a single bad when using pono solver; workaround for #137 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=257a57d8ed173538ea75e417b4474f69e93c3454;p=SymbiYosys.git create only a single bad when using pono solver; workaround for #137 --- diff --git a/sbysrc/sby_core.py b/sbysrc/sby_core.py index 372cc9b..f05b31d 100644 --- a/sbysrc/sby_core.py +++ b/sbysrc/sby_core.py @@ -449,6 +449,7 @@ class SbyTask: print("dffunmap", file=f) print("stat", file=f) print("write_btor {}-i design_{m}.info design_{m}.btor".format("-c " if self.opt_mode == "cover" else "", m=model_name), file=f) + print("write_btor -s {}-i design_{m}_single.info design_{m}_single.btor".format("-c " if self.opt_mode == "cover" else "", m=model_name), file=f) proc = SbyProc( self, diff --git a/sbysrc/sby_engine_btor.py b/sbysrc/sby_engine_btor.py index bf9216b..7985b32 100644 --- a/sbysrc/sby_engine_btor.py +++ b/sbysrc/sby_engine_btor.py @@ -153,7 +153,7 @@ def run(mode, task, engine_idx, engine): task, f"engine_{engine_idx}_{common_state.produced_cex}", task.model("btor"), - "cd {dir} ; btorsim -c --vcd engine_{idx}/trace{i}.vcd --hierarchical-symbols --info model/design_btor.info model/design_btor.btor engine_{idx}/trace{i}.wit".format(dir=task.workdir, idx=engine_idx, i=suffix), + "cd {dir} ; btorsim -c --vcd engine_{idx}/trace{i}.vcd --hierarchical-symbols --info model/design_btor{s}.info model/design_btor{s}.btor engine_{idx}/trace{i}.wit".format(dir=task.workdir, idx=engine_idx, i=suffix, s='_single' if solver_args[0] == 'pono' else ''), logfile=open(f"{task.workdir}/engine_{engine_idx}/logfile2.txt", "w") ) proc2.output_callback = output_callback2 @@ -216,7 +216,7 @@ def run(mode, task, engine_idx, engine): proc = SbyProc( task, f"engine_{engine_idx}", task.model("btor"), - f"cd {task.workdir}; {solver_cmd} model/design_btor.btor", + f"cd {task.workdir}; {solver_cmd} model/design_btor{'_single' if solver_args[0]=='pono' else ''}.btor", logfile=open(f"{task.workdir}/engine_{engine_idx}/logfile.txt", "w") )