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

16
nmigen/test/test_hdl_ir.py
View file

@ -561,6 +561,8 @@ class InstanceTestCase(FHDLTestCase):
o_data=Cat(self.datal, self.datah),
io_pins=self.pins
)
self.wrap = Fragment()
self.wrap.add_subfragment(self.inst)
def test_init(self):
self.setUp_cpu()
@ -572,7 +574,7 @@ class InstanceTestCase(FHDLTestCase):
def test_prepare(self):
self.setUp_cpu()
f = self.inst.prepare()
f = self.wrap.prepare()
sync_clk = f.domains["sync"].clk
self.assertEqual(f.ports, SignalDict([
(sync_clk, "i"),
@ -582,7 +584,7 @@ class InstanceTestCase(FHDLTestCase):
def test_prepare_explicit_ports(self):
self.setUp_cpu()
f = self.inst.prepare(ports=[self.rst, self.stb])
f = self.wrap.prepare(ports=[self.rst, self.stb])
sync_clk = f.domains["sync"].clk
sync_rst = f.domains["sync"].rst
self.assertEqual(f.ports, SignalDict([
@ -592,3 +594,13 @@ class InstanceTestCase(FHDLTestCase):
(self.stb, "o"),
(self.pins, "io"),
]))
def test_prepare_slice_in_port(self):
s = Signal(2)
f = Fragment()
f.add_subfragment(Instance("foo", o_O=s[0]))
f.add_subfragment(Instance("foo", o_O=s[1]))
fp = f.prepare(ports=[s], ensure_sync_exists=False)
self.assertEqual(fp.ports, SignalDict([
(s, "o"),
]))