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

hdl.ir: fix port propagation between siblings, in the other direction.

Browse source
This commit is contained in:
whitequark 2018-12-22 00:31:31 +00:00
parent 0df543b204
commit f6772759c8
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nmigen/hdl/ir.py
View file

@ -268,16 +268,20 @@ class Fragment:
# an underapproximation: some of these signals may be driven by subfragments. # an underapproximation: some of these signals may be driven by subfragments.
outs = ports & self_driven outs = ports & self_driven
# Go through subfragments and refine our approximation for ports. # Go through subfragments and refine our approximation for inputs.
for subfrag, name in self.subfragments:
# Refine the input port approximation: if a subfragment requires a signal as an input,
# and we aren't driving it, it has to be our input as well.
sub_ins, sub_outs, sub_inouts = subfrag._propagate_ports(ports=())
ins |= sub_ins - self_driven
for subfrag, name in self.subfragments: for subfrag, name in self.subfragments:
# Always ask subfragments to provide all signals that are our inputs. # Always ask subfragments to provide all signals that are our inputs.
# 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=ins | 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 appropximation further: if any subfragment is driving a signal
# it is definitely not our input. But, if a subfragment requires a signal as an input, # that we currently think should be our input, it shouldn't actually be our input.
# and we aren't driving it, it has to be our input as well.
ins -= sub_outs ins -= sub_outs
ins |= sub_ins - self_driven
# Refine the output port approximation: if a subfragment is driving a signal, # Refine the output port approximation: if a subfragment is driving a signal,
# and we're asked to provide it, we can provide it now. # and we're asked to provide it, we can provide it now.
outs |= ports & sub_outs outs |= ports & sub_outs

17
nmigen/test/test_hdl_ir.py
View file

@ -134,6 +134,23 @@ class FragmentPortsTestCase(FHDLTestCase):
f1._propagate_ports(ports=()) f1._propagate_ports(ports=())
self.assertEqual(f1.ports, SignalDict()) self.assertEqual(f1.ports, SignalDict())
def test_output_input_sibling(self):
f1 = Fragment()
f2 = Fragment()
f2.add_statements(
self.c2.eq(0)
)
f2.add_driver(self.c2)
f1.add_subfragment(f2)
f3 = Fragment()
f3.add_statements(
self.c1.eq(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()