morgan/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Pull Requests Activity

cxp GW: add back rx debug buffer

Browse Source
This commit is contained in:
morgan 2025-01-10 16:47:23 +08:00
parent 4140468af3
commit 3c93ff219e
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/gateware/cxp.py
View File

@ -308,41 +308,42 @@ class CXP_Frame_Pipeline(Module, AutoCSR):
arr_csr.append(csr) arr_csr.append(csr)
setattr(self, name, csr) setattr(self, name, csr)
roi_pipeline = cdr(ROI_Pipeline()) # roi_pipeline = cdr(ROI_Pipeline())
self.submodules += roi_pipeline # self.submodules += roi_pipeline
framebuffers.append(roi_pipeline.pipeline[0]) # framebuffers.append(roi_pipeline.pipeline[0])
# DEBUG: # DEBUG:
# self.comb += roi_pipeline.pipeline[-1].source.ack.eq(1) # self.comb += roi_pipeline.pipeline[-1].source.ack.eq(1)
# crc_checker = cdr(CXPCRC32_Checker()) crc_checker = cdr(CXPCRC32_Checker())
# # TODO: handle full buffer gracefully # TODO: handle full buffer gracefully
# # TODO: investigate why there is a heartbeat message in the middle of the frame with k27.7 code too??? # TODO: investigate why there is a heartbeat message in the middle of the frame with k27.7 code too???
# # NOTE: sometimes there are 0xFBFBFBFB K=0b1111 # NOTE: sometimes there are 0xFBFBFBFB K=0b1111
# # perhaps the buffer is full overflowing and doing strange stuff # perhaps the buffer is full overflowing and doing strange stuff
# # it should be mem block not "cycle buffer" # it should be mem block not "cycle buffer"
# # self.submodules.dropper = dropper = cdr(DChar_Dropper()) # self.submodules.dropper = dropper = cdr(DChar_Dropper())
# buffer_cdc_fifo = cdr(Buffer(word_layout_dchar)) # to improve timing buffer = cdr(Buffer(word_layout_dchar)) # crcchecker timinig is bad
# cdc_fifo = stream.AsyncFIFO(word_layout_dchar, 2**log2_int(packet_size//word_dw)) buffer_cdc_fifo = cdr(Buffer(word_layout_dchar)) # to improve timing
# self.submodules += crc_checker, buffer_cdc_fifo cdc_fifo = stream.AsyncFIFO(word_layout_dchar, 2**log2_int(packet_size//word_dw))
# self.submodules += ClockDomainsRenamer({"write": "cxp_gtx_rx", "read": "sys"})(cdc_fifo) self.submodules += buffer, crc_checker, buffer_cdc_fifo
self.submodules += ClockDomainsRenamer({"write": "cxp_gtx_rx", "read": "sys"})(cdc_fifo)
# pipeline = [crc_checker, buffer_cdc_fifo, cdc_fifo] pipeline = [buffer, crc_checker, buffer_cdc_fifo, cdc_fifo]
# for s, d in zip(pipeline, pipeline[1:]): for s, d in zip(pipeline, pipeline[1:]):
# self.comb += s.source.connect(d.sink) self.comb += s.source.connect(d.sink)
# framebuffers.append(pipeline[0]) framebuffers.append(pipeline[0])
# # DEBUG: # DEBUG:
# if i == 0: if i == 0:
# self.submodules.debug_out = debug_out = RX_Debug_Buffer(word_layout_dchar, 2**log2_int(packet_size//word_dw)) self.submodules.debug_out = debug_out = RX_Debug_Buffer(word_layout_dchar, 2**log2_int(packet_size//word_dw))
# self.comb += pipeline[-1].source.connect(debug_out.sink) self.comb += pipeline[-1].source.connect(debug_out.sink)
# else: else:
# # remove any backpressure # remove any backpressure
# self.comb += pipeline[-1].source.ack.eq(1) self.comb += pipeline[-1].source.ack.eq(1)
self.submodules.router = router = cdr(Frame_Packet_Router(downconns, framebuffers, packet_size, pmod_pads)) self.submodules.router = router = cdr(Frame_Packet_Router(downconns, framebuffers, packet_size, pmod_pads))