hdl.ir: fix port propagation between siblings.

This commit is contained in:
whitequark 2018-12-21 23:53:18 +00:00
parent 00ef7a78d3
commit 913339c04a
2 changed files with 20 additions and 3 deletions

View file

@ -270,9 +270,9 @@ class Fragment:
# Go through subfragments and refine our approximation for ports. # Go through subfragments and refine our approximation for ports.
for subfrag, name in self.subfragments: for subfrag, name in self.subfragments:
# Always ask subfragments to provide all signals we're using and signals we're asked # Always ask subfragments to provide all signals that are our inputs.
# to provide. If the subfragment is not driving it, it will silently ignore it. # If the subfragment is not driving it, it will silently ignore it.
sub_ins, sub_outs, sub_inouts = subfrag._propagate_ports(ports=self_used | ports) sub_ins, sub_outs, sub_inouts = subfrag._propagate_ports(ports=ins | ports)
# Refine the input port approximation: if a subfragment is driving a signal, # Refine the input port approximation: if a subfragment is driving a signal,
# it is definitely not our input. But, if a subfragment requires a signal as an input, # it is definitely not our input. But, if a subfragment requires a signal as an input,
# and we aren't driving it, it has to be our input as well. # and we aren't driving it, it has to be our input as well.

View file

@ -117,6 +117,23 @@ class FragmentPortsTestCase(FHDLTestCase):
(self.c2, "o"), (self.c2, "o"),
])) ]))
def test_input_output_sibling(self):
f1 = Fragment()
f2 = Fragment()
f2.add_statements(
self.c1.eq(self.c2)
)
f1.add_subfragment(f2)
f3 = Fragment()
f3.add_statements(
self.c2.eq(0)
)
f3.add_driver(self.c2)
f1.add_subfragment(f3)
f1._propagate_ports(ports=())
self.assertEqual(f1.ports, SignalDict())
def test_input_cd(self): def test_input_cd(self):
sync = ClockDomain() sync = ClockDomain()
f = Fragment() f = Fragment()