Skip to content

hdl._ir: chain Fragment.origins with preexisting [0.5 backport] #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whitequark merged 1 commit into from
May 12, 2025
Merged

hdl._ir: chain Fragment.origins with preexisting [0.5 backport] #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amaranth/hdl/_ir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def get(obj, platform):
while True:
if isinstance(obj, Fragment):
if hasattr(obj, "origins"):
obj.origins = tuple(origins)
obj.origins = tuple(origins) + (obj.origins or ())
return obj
elif isinstance(obj, Elaboratable):
code = obj.elaborate.__code__
Expand Down
21 changes: 20 additions & 1 deletion tests/test_hdl_ir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,12 +1079,31 @@ def test_origins(self):
self.assertIs(frag.origins[1], elab2)
self.assertIs(frag.origins[2], m)

def test_origins_transformed_elaboratable(self):
renamed = DomainRenamer("sync")(elab1 := ElaboratesTo(elab2 := ElaboratesTo(m := Module())))
frag = Fragment.get(renamed, platform=None)
self.assertEqual(len(frag.origins), 4)
self.assertIsInstance(frag.origins, tuple)
self.assertIs(frag.origins[0], renamed)
self.assertIs(frag.origins[1], elab1)
self.assertIs(frag.origins[2], elab2)
self.assertIs(frag.origins[3], m)

renamed_nested = ElaboratesTo(elab2 := ElaboratesTo(renamed := DomainRenamer("sync")(m := Module())))
frag = Fragment.get(renamed_nested, platform=None)
self.assertEqual(len(frag.origins), 4)
self.assertIsInstance(frag.origins, tuple)
self.assertIs(frag.origins[0], renamed_nested)
self.assertIs(frag.origins[1], elab2)
self.assertIs(frag.origins[2], renamed)
self.assertIs(frag.origins[3], m)

def test_origins_disable(self):
inst = Instance("test")
del inst.origins
elab = ElaboratesTo(inst)
frag = Fragment.get(elab, platform=None)
self.assertFalse(hasattr(frag, "_origins"))
self.assertFalse(hasattr(frag, "origins"))


class IOBufferTestCase(FHDLTestCase):
Expand Down