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

hdl.ir: don't expose as ports missing domains added via elaboratables.

Browse source 
The elaboratable is already likely driving the clk/rst signals in
some way appropriate for the platform; if we expose them as ports
nevertheless it will cause problems downstream.
This commit is contained in:
whitequark 2019-08-03 16:39:21 +00:00
parent 21f2f8c46e
commit 9c28b61d9f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nmigen/hdl/ir.py
View file

@ -364,6 +364,9 @@ class Fragment:
raise DomainError("Domain '{}' is used but not defined".format(domain_name)) raise DomainError("Domain '{}' is used but not defined".format(domain_name))
if type(value) is ClockDomain: if type(value) is ClockDomain:
domain = value domain = value
# Only expose ports on clock domains returned directly, i.e. not as a part of
# a fragment driving that domain.
new_domains.append(domain)
else: else:
new_fragment = Fragment.get(value, platform=None) new_fragment = Fragment.get(value, platform=None)
if new_fragment.domains.keys() != {domain_name}: if new_fragment.domains.keys() != {domain_name}:
@ -377,7 +380,6 @@ class Fragment:
self.add_subfragment(new_fragment) self.add_subfragment(new_fragment)
domain = new_fragment.domains[domain_name] domain = new_fragment.domains[domain_name]
self.add_domains(domain) self.add_domains(domain)
new_domains.append(domain)
return new_domains return new_domains
def _propagate_domains(self, missing_domain): def _propagate_domains(self, missing_domain):

2
nmigen/test/test_hdl_ir.py
View file

@ -415,7 +415,7 @@ class FragmentDomainsTestCase(FHDLTestCase):
new_domains = f1._propagate_domains(missing_domain=lambda name: f2) new_domains = f1._propagate_domains(missing_domain=lambda name: f2)
self.assertEqual(f1.domains.keys(), {"sync"}) self.assertEqual(f1.domains.keys(), {"sync"})
self.assertEqual(f1.domains["sync"], f2.domains["sync"]) self.assertEqual(f1.domains["sync"], f2.domains["sync"])
self.assertEqual(new_domains, [f1.domains["sync"]]) self.assertEqual(new_domains, [])
self.assertEqual(f1.subfragments, [ self.assertEqual(f1.subfragments, [
(f2, None) (f2, None)
]) ])