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

Improve handling of nomem models

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-03-15 19:11:42 +01:00
parent c003a1b078
commit 76a624a363
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sbysrc/sby_core.py
View file

@ -333,12 +333,15 @@ class SbyJob:
if not os.path.exists("%s/model" % self.workdir): if not os.path.exists("%s/model" % self.workdir):
os.makedirs("%s/model" % self.workdir) os.makedirs("%s/model" % self.workdir)
if model_name == "ilang": if model_name in ["base", "nomem"]:
with open("%s/model/design.ys" % (self.workdir), "w") as f: with open("%s/model/design%s.ys" % (self.workdir, "" if model_name == "base" else "_nomem"), "w") as f:
print("# running in %s/src/" % self.workdir, file=f) print("# running in %s/src/" % self.workdir, file=f)
for cmd in self.script: for cmd in self.script:
print(cmd, file=f) print(cmd, file=f)
print("memory_nordff", file=f) if model_name == "base":
print("memory_nordff", file=f)
else:
print("memory_map", file=f)
if self.opt_multiclock: if self.opt_multiclock:
print("clk2fflogic", file=f) print("clk2fflogic", file=f)
else: else:
@ -355,10 +358,11 @@ class SbyJob:
print("setundef -anyseq", file=f) print("setundef -anyseq", file=f)
print("opt -keepdc -fast", file=f) print("opt -keepdc -fast", file=f)
print("check", file=f) print("check", file=f)
print("write_ilang ../model/design.il", file=f) print("write_ilang ../model/design%s.il" % ("" if model_name == "base" else "_nomem"), file=f)
task = SbyTask(self, "script", [], task = SbyTask(self, model_name, [],
"cd %s/src; %s -ql ../model/design.log ../model/design.ys" % (self.workdir, self.exe_paths["yosys"])) "cd %s/src; %s -ql ../model/design%s.log ../model/design%s.ys" % (self.workdir, self.exe_paths["yosys"],
"" if model_name == "base" else "_nomem", "" if model_name == "base" else "_nomem"))
task.checkretcode = True task.checkretcode = True
return [task] return [task]
@ -366,10 +370,7 @@ class SbyJob:
if re.match(r"^smt2(_syn)?(_nomem)?(_stbv|_stdt)?$", model_name): if re.match(r"^smt2(_syn)?(_nomem)?(_stbv|_stdt)?$", model_name):
with open("%s/model/design_%s.ys" % (self.workdir, model_name), "w") as f: with open("%s/model/design_%s.ys" % (self.workdir, model_name), "w") as f:
print("# running in %s/model/" % (self.workdir), file=f) print("# running in %s/model/" % (self.workdir), file=f)
print("read_ilang design.il", file=f) print("read_ilang design%s.il" % ("_nomem" if "_nomem" in model_name else ""), file=f)
if "_nomem" in model_name:
print("memory_map", file=f)
print("opt -keepdc -fast", file=f)
if "_syn" in model_name: if "_syn" in model_name:
print("techmap", file=f) print("techmap", file=f)
print("opt -fast", file=f) print("opt -fast", file=f)
@ -383,7 +384,7 @@ class SbyJob:
else: else:
print("write_smt2 -wires design_%s.smt2" % model_name, file=f) print("write_smt2 -wires design_%s.smt2" % model_name, file=f)
task = SbyTask(self, model_name, self.model("ilang"), task = SbyTask(self, model_name, self.model("nomem" if "_nomem" in model_name else "base"),
"cd %s/model; %s -ql design_%s.log design_%s.ys" % (self.workdir, self.exe_paths["yosys"], model_name, model_name)) "cd %s/model; %s -ql design_%s.log design_%s.ys" % (self.workdir, self.exe_paths["yosys"], model_name, model_name))
task.checkretcode = True task.checkretcode = True
@ -392,13 +393,11 @@ class SbyJob:
if model_name == "aig": if model_name == "aig":
with open("%s/model/design_aiger.ys" % (self.workdir), "w") as f: with open("%s/model/design_aiger.ys" % (self.workdir), "w") as f:
print("# running in %s/model/" % (self.workdir), file=f) print("# running in %s/model/" % (self.workdir), file=f)
print("read_ilang design.il", file=f) print("read_ilang design_nomem.il", file=f)
print("flatten", file=f) print("flatten", file=f)
print("setattr -unset keep", file=f) print("setattr -unset keep", file=f)
print("delete -output", file=f) print("delete -output", file=f)
print("opt -full", file=f) print("opt -full", file=f)
print("memory_map", file=f)
print("opt -fast", file=f)
print("techmap", file=f) print("techmap", file=f)
print("opt -fast", file=f) print("opt -fast", file=f)
print("abc -g AND -fast", file=f) print("abc -g AND -fast", file=f)
@ -406,7 +405,7 @@ class SbyJob:
print("stat", file=f) print("stat", file=f)
print("write_aiger -zinit -map design_aiger.aim design_aiger.aig", file=f) print("write_aiger -zinit -map design_aiger.aim design_aiger.aig", file=f)
task = SbyTask(self, "aig", self.model("ilang"), task = SbyTask(self, "aig", self.model("nomem"),
"cd %s/model; %s -ql design_aiger.log design_aiger.ys" % (self.workdir, self.exe_paths["yosys"])) "cd %s/model; %s -ql design_aiger.log design_aiger.ys" % (self.workdir, self.exe_paths["yosys"]))
task.checkretcode = True task.checkretcode = True