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

back.verilog: require Yosys >=0.35.

Browse source 
Fixes #931.
This commit is contained in:
Catherine 2023-11-21 14:43:13 +00:00
parent f9da3c0d16
commit fc06dd7644
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
amaranth/back/verilog.py
View file

@ -1,5 +1,3 @@
import warnings
from .._toolchain.yosys import * from .._toolchain.yosys import *
from ..hdl import ast, ir from ..hdl import ast, ir
from ..lib import wiring from ..lib import wiring
@ -11,15 +9,11 @@ __all__ = ["YosysError", "convert", "convert_fragment"]
def _convert_rtlil_text(rtlil_text, *, strip_internal_attrs=False, write_verilog_opts=()): def _convert_rtlil_text(rtlil_text, *, strip_internal_attrs=False, write_verilog_opts=()):
# this version requirement needs to be synchronized with the one in pyproject.toml! # this version requirement needs to be synchronized with the one in pyproject.toml!
yosys = find_yosys(lambda ver: ver >= (0, 10)) yosys = find_yosys(lambda ver: ver >= (0, 35))
yosys_version = yosys.version()
script = [] script = []
script.append(f"read_ilang <<rtlil\n{rtlil_text}\nrtlil") script.append(f"read_ilang <<rtlil\n{rtlil_text}\nrtlil")
if yosys_version >= (0, 17): script.append("proc -nomux -norom")
script.append("proc -nomux -norom")
else:
script.append("proc -nomux")
script.append("memory_collect") script.append("memory_collect")
if strip_internal_attrs: if strip_internal_attrs:

2
pyproject.toml
View file

@ -20,7 +20,7 @@ dependencies = [
[project.optional-dependencies] [project.optional-dependencies]
# this version requirement needs to be synchronized with the one in amaranth.back.verilog! # this version requirement needs to be synchronized with the one in amaranth.back.verilog!
builtin-yosys = ["amaranth-yosys>=0.10"] builtin-yosys = ["amaranth-yosys>=0.35"]
remote-build = ["paramiko~=2.7"] remote-build = ["paramiko~=2.7"]
[project.scripts] [project.scripts]