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

Consider Instances a part of containing fragment for use-def purposes.

Browse source 
Fixes #70.
This commit is contained in:
whitequark 2019-05-25 20:09:26 +00:00
parent 699fe5a675
commit 3392708e2b
2 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
nmigen/hdl/ir.py
View file

@ -366,31 +366,34 @@ class Fragment:
# Collect all signals we're driving (on LHS of statements), and signals we're using
# (on RHS of statements, or in clock domains).
if isinstance(self, Instance):
for port_name, (value, dir) in self.named_ports.items():
if dir == "i":
add_uses(value._rhs_signals())
if dir == "o":
add_defs(value._lhs_signals())
if dir == "io":
add_io(value)
else:
for stmt in self.statements:
add_uses(stmt._rhs_signals())
add_defs(stmt._lhs_signals())
for stmt in self.statements:
add_uses(stmt._rhs_signals())
add_defs(stmt._lhs_signals())
for domain, _ in self.iter_sync():
cd = self.domains[domain]
add_uses(cd.clk)
if cd.rst is not None:
add_uses(cd.rst)
for domain, _ in self.iter_sync():
cd = self.domains[domain]
add_uses(cd.clk)
if cd.rst is not None:
add_uses(cd.rst)
# Repeat for subfragments.
for subfrag, name in self.subfragments:
parent[subfrag] = self
level [subfrag] = level[self] + 1
if isinstance(subfrag, Instance):
for port_name, (value, dir) in subfrag.named_ports.items():
if dir == "i":
subfrag.add_ports(value._rhs_signals(), dir=dir)
add_uses(value._rhs_signals())
if dir == "o":
subfrag.add_ports(value._lhs_signals(), dir=dir)
add_defs(value._lhs_signals())
if dir == "io":
subfrag.add_ports(value, dir=dir)
add_io(value)
else:
parent[subfrag] = self
level [subfrag] = level[self] + 1
subfrag._prepare_use_def_graph(parent, level, uses, defs, ios, top)
subfrag._prepare_use_def_graph(parent, level, uses, defs, ios, top)
def _propagate_ports(self, ports, all_undef_as_ports):
# Take this fragment graph: