feat(gen_bd): use Vivado 2024.1 axi_noc:1.1 IP and sep_rt_group

rapidstream-org · Aug 8, 2024 · 13d61f7 · 13d61f7
1 parent 6fbe0f2
commit 13d61f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/gen_vivado_bd.py b/gen_vivado_bd.py
@@ -77,7 +77,7 @@ def get_hbm_noc_port(bank: int) -> str:
             f"""
 # Create mmap noc
 startgroup
-set axi_noc_dut [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.0 axi_noc_dut ]
+set axi_noc_dut [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.1 axi_noc_dut ]
 
 set_property -dict [list \
     CONFIG.NUM_CLKS {{1}} \
@@ -111,6 +111,10 @@ def get_hbm_noc_port(bank: int) -> str:
 set_property -dict [list CONFIG.CONNECTIONS {{{noc_m_port} {{ \
     read_bw {{{attr['read_bw'] - 100}}} \
     write_bw {{{attr['write_bw'] - 100}}} \
+    read_avg_burst {{8}} \
+    write_avg_burst {{8}} \\
+    # excl_group {{{'' if attr.get("noc") is None else i}}} \\
+    sep_rt_group {{{i}}} \\
 }}}}] [get_bd_intf_pins /axi_noc_dut/{noc_s_port}]
 connect_bd_intf_net [get_bd_intf_pins $dut/{port}] \
     [get_bd_intf_pins /axi_noc_dut/{noc_s_port}]
@@ -165,7 +169,7 @@ def dut_stream_noc_tcl(stream_attr: dict[str, dict[str, str]]) -> list[str]:
         tcl += [
             f"""
 set_property -dict [list CONFIG.CONNECTIONS {{{noc_m_port} \
-    {{ write_bw {{{float(attr["bandwidth"]) - 100}}} write_avg_burst {{4}}}}}}] \
+    {{ write_bw {{{float(attr["bandwidth"]) - 100}}} write_avg_burst {{8}}}}}}] \
 [get_bd_intf_pins /axis_noc_dut/{noc_s_port}]
 """
         ]
@@ -432,7 +436,7 @@ def gen_arm_bd_hbm(
     import json
 
     # manually set the following
-    TEST_DIR = "/home/jakeke/rapidstream-noc/test/serpens48_mmap2"
+    TEST_DIR = "/home/jakeke/rapidstream-noc/test/serpens32_mmap"
     TOP_MOD_NAME = "Serpens"
     HBM_BD = True
 

diff --git a/vivado_bd_helper.py b/vivado_bd_helper.py
@@ -57,7 +57,7 @@ def arm_ddr_tcl(fpd: bool) -> list[str]:
     tcl = [
         """
 # Create instance: cips_noc, and set properties
-set cips_noc [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.0 cips_noc ]
+set cips_noc [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.1 cips_noc ]
 set_property -dict [list \
     CONFIG.NUM_CLKS {9} \
     CONFIG.NUM_MI {0} \
@@ -234,7 +234,7 @@ def arm_ddr_tcl(fpd: bool) -> list[str]:
 
 # Create instance: noc_lpddr4_0, and set properties
 set noc_lpddr4_0 [ create_bd_cell -type ip \
-    -vlnv xilinx.com:ip:axi_noc:1.0 noc_lpddr4_0 ]
+    -vlnv xilinx.com:ip:axi_noc:1.1 noc_lpddr4_0 ]
 set_property -dict [list \
     CONFIG.CH0_LPDDR4_0_BOARD_INTERFACE {ch0_lpddr4_trip1} \
     CONFIG.CH1_LPDDR4_0_BOARD_INTERFACE {ch1_lpddr4_trip1} \
@@ -257,7 +257,7 @@ def arm_ddr_tcl(fpd: bool) -> list[str]:
 
 
 # Create instance: noc_lpddr4_1, and set properties
-set noc_lpddr4_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.0 noc_lpddr4_1]
+set noc_lpddr4_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.1 noc_lpddr4_1]
 set_property -dict [list \
     CONFIG.CH0_LPDDR4_0_BOARD_INTERFACE {ch0_lpddr4_trip2} \
     CONFIG.CH0_LPDDR4_1_BOARD_INTERFACE {ch0_lpddr4_trip3} \
@@ -620,7 +620,7 @@ def arm_hbm_tcl(mmap_ports: dict[str, dict[str, int]], fpd: bool) -> list[str]:
     tcl = [
         f"""
 # Create instance: axi_noc_dut, and set properties
-set axi_noc_dut [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.0 axi_noc_dut ]
+set axi_noc_dut [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_noc:1.1 axi_noc_dut ]
 set_property -dict [list \
     CONFIG.HBM_NUM_CHNL {{{hbm_chnl}}} \
     CONFIG.NUM_CLKS {{9}} \