miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: x400: Add Replay to 100 and 200 MHz images

Browse Source 
This adds the RFNoC replay block to the defautl 100 and 200 MHz images
for X410.


Original-commit: 6031a935df7e41c9fc1857b5b708a9034c850970
This commit is contained in:
Wade Fife
2022-02-07 13:08:11 -07:00
parent c2477b9519
commit c885f401c0
2 changed files with 107 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
top/x400/x410_100_rfnoc_image_core.yml
+54 -18
View File
@@ -17,18 +17,34 @@ stream_endpoints:
ctrl: True # Endpoint passes control traffic ctrl: True # Endpoint passes control traffic
data: True # Endpoint passes data traffic data: True # Endpoint passes data traffic
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144 # Ingress buffer size for data
ep1: # Stream endpoint name ep1:
ctrl: False # Endpoint passes control traffic ctrl: False
data: True # Endpoint passes data traffic data: True
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144
ep2: # Stream endpoint name ep2:
ctrl: False # Endpoint passes control traffic ctrl: False
data: True # Endpoint passes data traffic data: True
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144
ep3: # Stream endpoint name ep3:
ctrl: False # Endpoint passes control traffic ctrl: False
data: True # Endpoint passes data traffic data: True
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144
ep4:
ctrl: False
data: True
buff_size_bytes: 4096
ep5:
ctrl: False
data: True
buff_size_bytes: 4096
ep6:
ctrl: False
data: True
buff_size_bytes: 4096
ep7:
ctrl: False
data: True
buff_size_bytes: 4096
# A list of all NoC blocks in design # A list of all NoC blocks in design
# ---------------------------------- # ----------------------------------
@@ -59,6 +75,12 @@ noc_blocks:
parameters: parameters:
NUM_PORTS: 2 NUM_PORTS: 2
NIPC: RADIO_NIPC NIPC: RADIO_NIPC
replay0:
block_desc: 'replay.yml'
parameters:
NUM_PORTS: 4
MEM_DATA_W: 64
MEM_ADDR_W: 32
# A list of all static connections in design # A list of all static connections in design
# ------------------------------------------ # ------------------------------------------
@@ -93,6 +115,17 @@ connections:
# radio1(1) to ep3 - RFB:1 RX # radio1(1) to ep3 - RFB:1 RX
- { srcblk: radio1, srcport: out_1, dstblk: ddc1, dstport: in_1 } - { srcblk: radio1, srcport: out_1, dstblk: ddc1, dstport: in_1 }
- { srcblk: ddc1, srcport: out_1, dstblk: ep3, dstport: in0 } - { srcblk: ddc1, srcport: out_1, dstblk: ep3, dstport: in0 }
#
# Replay
- { srcblk: ep4, srcport: out0, dstblk: replay0, dstport: in_0 }
- { srcblk: replay0, srcport: out_0, dstblk: ep4, dstport: in0 }
- { srcblk: ep5, srcport: out0, dstblk: replay0, dstport: in_1 }
- { srcblk: replay0, srcport: out_1, dstblk: ep5, dstport: in0 }
- { srcblk: ep6, srcport: out0, dstblk: replay0, dstport: in_2 }
- { srcblk: replay0, srcport: out_2, dstblk: ep6, dstport: in0 }
- { srcblk: ep7, srcport: out0, dstblk: replay0, dstport: in_3 }
- { srcblk: replay0, srcport: out_3, dstblk: ep7, dstport: in0 }
#
# BSP Connections # BSP Connections
- { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 } - { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 }
- { srcblk: radio1, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio1 } - { srcblk: radio1, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio1 }
@@ -100,6 +133,7 @@ connections:
- { srcblk: _device_, srcport: radio1, dstblk: radio1, dstport: radio } - { srcblk: _device_, srcport: radio1, dstblk: radio1, dstport: radio }
- { srcblk: _device_, srcport: time, dstblk: radio0, dstport: time } - { srcblk: _device_, srcport: time, dstblk: radio0, dstport: time }
- { srcblk: _device_, srcport: time, dstblk: radio1, dstport: time } - { srcblk: _device_, srcport: time, dstblk: radio1, dstport: time }
- { srcblk: replay0, srcport: axi_ram, dstblk: _device_, dstport: dram }
# A list of all clock domain connections in design # A list of all clock domain connections in design
# ------------------------------------------ # ------------------------------------------
@@ -109,9 +143,11 @@ connections:
# - dstblk = Destination block to connect # - dstblk = Destination block to connect
# - dstport = Clock domain on the destination block to connect # - dstport = Clock domain on the destination block to connect
clk_domains: clk_domains:
- { srcblk: _device_, srcport: radio, dstblk: radio0, dstport: radio } - { srcblk: _device_, srcport: radio, dstblk: radio0, dstport: radio }
- { srcblk: _device_, srcport: radio, dstblk: duc0, dstport: ce } - { srcblk: _device_, srcport: radio, dstblk: duc0, dstport: ce }
- { srcblk: _device_, srcport: radio, dstblk: ddc0, dstport: ce } - { srcblk: _device_, srcport: radio, dstblk: ddc0, dstport: ce }
- { srcblk: _device_, srcport: radio, dstblk: radio1, dstport: radio } - { srcblk: _device_, srcport: radio, dstblk: radio1, dstport: radio }
- { srcblk: _device_, srcport: radio, dstblk: duc1, dstport: ce } - { srcblk: _device_, srcport: radio, dstblk: duc1, dstport: ce }
- { srcblk: _device_, srcport: radio, dstblk: ddc1, dstport: ce } - { srcblk: _device_, srcport: radio, dstblk: ddc1, dstport: ce }
- { srcblk: _device_, srcport: dram, dstblk: replay0, dstport: mem }
top/x400/x410_200_rfnoc_image_core.yml
+53 -18
View File
@@ -17,18 +17,34 @@ stream_endpoints:
ctrl: True # Endpoint passes control traffic ctrl: True # Endpoint passes control traffic
data: True # Endpoint passes data traffic data: True # Endpoint passes data traffic
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144 # Ingress buffer size for data
ep1: # Stream endpoint name ep1:
ctrl: False # Endpoint passes control traffic ctrl: False
data: True # Endpoint passes data traffic data: True
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144
ep2: # Stream endpoint name ep2:
ctrl: False # Endpoint passes control traffic ctrl: False
data: True # Endpoint passes data traffic data: True
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144
ep3: # Stream endpoint name ep3:
ctrl: False # Endpoint passes control traffic ctrl: False
data: True # Endpoint passes data traffic data: True
buff_size_bytes: 262144 # Ingress buffer size for data buff_size_bytes: 262144
ep4:
ctrl: False
data: True
buff_size_bytes: 4096
ep5:
ctrl: False
data: True
buff_size_bytes: 4096
ep6:
ctrl: False
data: True
buff_size_bytes: 4096
ep7:
ctrl: False
data: True
buff_size_bytes: 4096
# A list of all NoC blocks in design # A list of all NoC blocks in design
# ---------------------------------- # ----------------------------------
@@ -59,6 +75,12 @@ noc_blocks:
parameters: parameters:
NUM_PORTS: 2 NUM_PORTS: 2
NIPC: RADIO_NIPC NIPC: RADIO_NIPC
replay0:
block_desc: 'replay.yml'
parameters:
NUM_PORTS: 4
MEM_DATA_W: 64
MEM_ADDR_W: 32
# A list of all static connections in design # A list of all static connections in design
# ------------------------------------------ # ------------------------------------------
@@ -93,6 +115,17 @@ connections:
# radio1(1) to ep3 - RFB:1 RX # radio1(1) to ep3 - RFB:1 RX
- { srcblk: radio1, srcport: out_1, dstblk: ddc1, dstport: in_1 } - { srcblk: radio1, srcport: out_1, dstblk: ddc1, dstport: in_1 }
- { srcblk: ddc1, srcport: out_1, dstblk: ep3, dstport: in0 } - { srcblk: ddc1, srcport: out_1, dstblk: ep3, dstport: in0 }
#
# Replay
- { srcblk: ep4, srcport: out0, dstblk: replay0, dstport: in_0 }
- { srcblk: replay0, srcport: out_0, dstblk: ep4, dstport: in0 }
- { srcblk: ep5, srcport: out0, dstblk: replay0, dstport: in_1 }
- { srcblk: replay0, srcport: out_1, dstblk: ep5, dstport: in0 }
- { srcblk: ep6, srcport: out0, dstblk: replay0, dstport: in_2 }
- { srcblk: replay0, srcport: out_2, dstblk: ep6, dstport: in0 }
- { srcblk: ep7, srcport: out0, dstblk: replay0, dstport: in_3 }
- { srcblk: replay0, srcport: out_3, dstblk: ep7, dstport: in0 }
#
# BSP Connections # BSP Connections
- { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 } - { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 }
- { srcblk: radio1, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio1 } - { srcblk: radio1, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio1 }
@@ -100,6 +133,7 @@ connections:
- { srcblk: _device_, srcport: radio1, dstblk: radio1, dstport: radio } - { srcblk: _device_, srcport: radio1, dstblk: radio1, dstport: radio }
- { srcblk: _device_, srcport: time, dstblk: radio0, dstport: time } - { srcblk: _device_, srcport: time, dstblk: radio0, dstport: time }
- { srcblk: _device_, srcport: time, dstblk: radio1, dstport: time } - { srcblk: _device_, srcport: time, dstblk: radio1, dstport: time }
- { srcblk: replay0, srcport: axi_ram, dstblk: _device_, dstport: dram }
# A list of all clock domain connections in design # A list of all clock domain connections in design
# ------------------------------------------ # ------------------------------------------
@@ -109,9 +143,10 @@ connections:
# - dstblk = Destination block to connect # - dstblk = Destination block to connect
# - dstport = Clock domain on the destination block to connect # - dstport = Clock domain on the destination block to connect
clk_domains: clk_domains:
- { srcblk: _device_, srcport: radio, dstblk: radio0, dstport: radio } - { srcblk: _device_, srcport: radio, dstblk: radio0, dstport: radio }
- { srcblk: _device_, srcport: radio_2x, dstblk: duc0, dstport: ce } - { srcblk: _device_, srcport: radio_2x, dstblk: duc0, dstport: ce }
- { srcblk: _device_, srcport: radio_2x, dstblk: ddc0, dstport: ce } - { srcblk: _device_, srcport: radio_2x, dstblk: ddc0, dstport: ce }
- { srcblk: _device_, srcport: radio, dstblk: radio1, dstport: radio } - { srcblk: _device_, srcport: radio, dstblk: radio1, dstport: radio }
- { srcblk: _device_, srcport: radio_2x, dstblk: duc1, dstport: ce } - { srcblk: _device_, srcport: radio_2x, dstblk: duc1, dstport: ce }
- { srcblk: _device_, srcport: radio_2x, dstblk: ddc1, dstport: ce } - { srcblk: _device_, srcport: radio_2x, dstblk: ddc1, dstport: ce }
- { srcblk: _device_, srcport: dram, dstblk: replay0, dstport: mem }