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

back.rtlil: emit nmigen.hierarchy attribute.

Browse source 
Fixes #54.
This commit is contained in:
whitequark 2019-04-21 07:55:08 +00:00
parent 360bc9b5b4
commit 85ae99c1b4
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nmigen/back/rtlil.py
View file

@ -666,7 +666,7 @@ class _StatementCompiler(xfrm.StatementVisitor):
self.on_statement(stmt) self.on_statement(stmt)
def convert_fragment(builder, fragment, name, top): def convert_fragment(builder, fragment, hierarchy):
if isinstance(fragment, ir.Instance): if isinstance(fragment, ir.Instance):
port_map = OrderedDict() port_map = OrderedDict()
for port_name, value in fragment.named_ports.items(): for port_name, value in fragment.named_ports.items():
@ -677,7 +677,13 @@ def convert_fragment(builder, fragment, name, top):
else: else:
return "\\{}".format(fragment.type), port_map return "\\{}".format(fragment.type), port_map
with builder.module(name or "anonymous", attrs={"top": 1} if top else {}) as module: module_name = hierarchy[-1] or "anonymous"
module_attrs = {}
if len(hierarchy) == 1:
module_attrs["top"] = 1
module_attrs["nmigen.hierarchy"] = ".".join(name or "anonymous" for name in hierarchy)
with builder.module(module_name, attrs=module_attrs) as module:
compiler_state = _ValueCompilerState(module) compiler_state = _ValueCompilerState(module)
rhs_compiler = _RHSValueCompiler(compiler_state) rhs_compiler = _RHSValueCompiler(compiler_state)
lhs_compiler = _LHSValueCompiler(compiler_state) lhs_compiler = _LHSValueCompiler(compiler_state)
@ -746,7 +752,7 @@ def convert_fragment(builder, fragment, name, top):
sub_params[param_name] = param_value sub_params[param_name] = param_value
sub_type, sub_port_map = \ sub_type, sub_port_map = \
convert_fragment(builder, subfragment, top=False, name=sub_name) convert_fragment(builder, subfragment, hierarchy=hierarchy + (sub_name,))
sub_ports = OrderedDict() sub_ports = OrderedDict()
for port, value in sub_port_map.items(): for port, value in sub_port_map.items():
@ -851,5 +857,5 @@ def convert_fragment(builder, fragment, name, top):
def convert(fragment, name="top", **kwargs): def convert(fragment, name="top", **kwargs):
fragment = ir.Fragment.get(fragment, platform=None).prepare(**kwargs) fragment = ir.Fragment.get(fragment, platform=None).prepare(**kwargs)
builder = _Builder() builder = _Builder()
convert_fragment(builder, fragment, name=name, top=True) convert_fragment(builder, fragment, hierarchy=(name,))
return str(builder) return str(builder)