mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-21 09:26:29 +08:00
wrpll.core: add CSRs to monitor the collector outputs
This commit is contained in:
parent
f2f942a8b4
commit
87911810d6
@ -8,6 +8,13 @@ from artiq.gateware.drtio.wrpll.ddmtd import DDMTD, Collector
|
|||||||
from artiq.gateware.drtio.wrpll import thls, filters
|
from artiq.gateware.drtio.wrpll import thls, filters
|
||||||
|
|
||||||
|
|
||||||
|
def _eq_sign_extend(t, s):
|
||||||
|
"""Assign target signal `t` from source `s`, sign-extending `s` to the
|
||||||
|
full width.
|
||||||
|
"""
|
||||||
|
return t.eq(Cat(s, Replicate(s[-1], len(t) - len(s))))
|
||||||
|
|
||||||
|
|
||||||
class FrequencyCounter(Module, AutoCSR):
|
class FrequencyCounter(Module, AutoCSR):
|
||||||
def __init__(self, timer_width=23, counter_width=23, domains=["helper", "rtio", "rtio_rx0"]):
|
def __init__(self, timer_width=23, counter_width=23, domains=["helper", "rtio", "rtio_rx0"]):
|
||||||
for domain in domains:
|
for domain in domains:
|
||||||
@ -55,6 +62,12 @@ class WRPLL(Module, AutoCSR):
|
|||||||
self.adpll_offset_helper = CSRStorage(24)
|
self.adpll_offset_helper = CSRStorage(24)
|
||||||
self.adpll_offset_main = CSRStorage(24)
|
self.adpll_offset_main = CSRStorage(24)
|
||||||
|
|
||||||
|
self.tag_arm = CSR()
|
||||||
|
self.main_diff_tag = CSRStatus(32)
|
||||||
|
self.helper_diff_tag = CSRStatus(32)
|
||||||
|
self.ref_tag = CSRStatus(N)
|
||||||
|
self.main_tag = CSRStatus(N)
|
||||||
|
|
||||||
self.clock_domains.cd_helper = ClockDomain()
|
self.clock_domains.cd_helper = ClockDomain()
|
||||||
self.clock_domains.cd_filter = ClockDomain()
|
self.clock_domains.cd_filter = ClockDomain()
|
||||||
self.helper_reset.storage.attr.add("no_retiming")
|
self.helper_reset.storage.attr.add("no_retiming")
|
||||||
@ -93,6 +106,34 @@ class WRPLL(Module, AutoCSR):
|
|||||||
self.collector.main_stb.eq(self.ddmtd_main.h_tag_update)
|
self.collector.main_stb.eq(self.ddmtd_main.h_tag_update)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
collector_stb_ps = PulseSynchronizer("helper", "sys")
|
||||||
|
self.submodules += collector_stb_ps
|
||||||
|
self.sync.helper += collector_stb_ps.i.eq(self.collector.out_stb)
|
||||||
|
collector_stb_sys = Signal()
|
||||||
|
self.sync += collector_stb_sys.eq(collector_stb_ps.o)
|
||||||
|
|
||||||
|
main_diff_tag_sys = Signal((N+2, True))
|
||||||
|
helper_diff_tag_sys = Signal((N+2, True))
|
||||||
|
ref_tag_sys = Signal(N)
|
||||||
|
main_tag_sys = Signal(N)
|
||||||
|
self.specials += MultiReg(self.collector.out_main, main_diff_tag_sys)
|
||||||
|
self.specials += MultiReg(self.collector.out_helper, helper_diff_tag_sys)
|
||||||
|
self.specials += MultiReg(self.collector.tag_ref, ref_tag_sys)
|
||||||
|
self.specials += MultiReg(self.collector.tag_main, main_tag_sys)
|
||||||
|
|
||||||
|
self.sync += [
|
||||||
|
If(self.tag_arm.re & self.tag_arm.r, self.tag_arm.w.eq(1)),
|
||||||
|
If(collector_stb_sys,
|
||||||
|
self.tag_arm.w.eq(0),
|
||||||
|
If(self.tag_arm.w,
|
||||||
|
_eq_sign_extend(self.main_diff_tag.status, main_diff_tag_sys),
|
||||||
|
_eq_sign_extend(self.helper_diff_tag.status, helper_diff_tag_sys),
|
||||||
|
self.ref_tag.status.eq(ref_tag_sys),
|
||||||
|
self.main_tag.status.eq(main_tag_sys)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
self.comb += [
|
self.comb += [
|
||||||
self.filter_helper.input.eq(self.collector.out_helper << 22),
|
self.filter_helper.input.eq(self.collector.out_helper << 22),
|
||||||
self.filter_helper.input_stb.eq(self.collector.out_stb),
|
self.filter_helper.input_stb.eq(self.collector.out_stb),
|
||||||
|
Loading…
Reference in New Issue
Block a user