usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

back.verilog: bump Yosys version requirement to 0.9.

Browse source 
Fixes #55.
This commit is contained in:
whitequark 2019-08-26 09:35:37 +00:00
parent b4b5d9e2ef
commit 2168ff512b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nmigen/back/verilog.py
View file

@ -23,14 +23,14 @@ def _yosys_version():
raise YosysError("Could not find Yosys in PATH. Place `yosys` in PATH or specify " raise YosysError("Could not find Yosys in PATH. Place `yosys` in PATH or specify "
"path explicitly via the YOSYS environment variable") from e "path explicitly via the YOSYS environment variable") from e
m = re.match(r"^Yosys ([\d.]+)\+(\d+)", version) m = re.match(r"^Yosys ([\d.]+)(?:\+(\d+))?", version)
tag, offset = m[1], m[2] tag, offset = m[1], m[2] or 0
return tuple(map(int, tag.split("."))), offset return tuple(map(int, tag.split("."))), offset
def _convert_il_text(il_text, strip_src): def _convert_il_text(il_text, strip_src):
version, offset = _yosys_version() version, offset = _yosys_version()
if version < (0, 8): if version < (0, 9):
raise YosysError("Yosys %d.%d is not suppored", *version) raise YosysError("Yosys %d.%d is not suppored", *version)
attr_map = [] attr_map = []
@ -42,7 +42,7 @@ def _convert_il_text(il_text, strip_src):
read_ilang <<rtlil read_ilang <<rtlil
{} {}
rtlil rtlil
proc_prune {prune}proc_prune
proc_init proc_init
proc_arst proc_arst
proc_dff proc_dff
@ -50,7 +50,8 @@ proc_clean
memory_collect memory_collect
attrmap {} attrmap {}
write_verilog -norename write_verilog -norename
""".format(il_text, " ".join(attr_map)) """.format(il_text, " ".join(attr_map),
prune="# " if version == (0, 9) and offset == 0 else "")
popen = subprocess.Popen([os.getenv("YOSYS", "yosys"), "-q", "-"], popen = subprocess.Popen([os.getenv("YOSYS", "yosys"), "-q", "-"],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,