utils: image_builder: Support parameterized number of ports on blocks

3 files changed, 25 insertions, 34 deletions

diff --git a/host/utils/rfnoc/templates/modules/drive_unused_ports.v.mako b/host/utils/rfnoc/templates/modules/drive_unused_ports.v.mako
index e6df532f0..dfa1e7eb6 100644
--- a/host/utils/rfnoc/templates/modules/drive_unused_ports.v.mako
+++ b/host/utils/rfnoc/templates/modules/drive_unused_ports.v.mako
@@ -1,5 +1,4 @@
-<%page args="connections, blocks, block_descs, seps"/>\
-\
+<%page args="connections, block_ports"/>\
 <%
   sources = []
   destinations = []
@@ -7,31 +6,16 @@
     sources.append((connection["srcblk"], connection["srcport"]))
     destinations.append((connection["dstblk"], connection["dstport"]))
 %>\
-%for sep in seps:
-  %for input in range(seps[sep]["num_data_i"]):
-    %if not (sep, "in%d" % (input)) in destinations:
-  assign s_${sep}_in${input}_tdata  =  'h0;
-  assign s_${sep}_in${input}_tlast  = 1'b0;
-  assign s_${sep}_in${input}_tvalid = 1'b0;
+%for (block_name, port_name, direction) in block_ports:
+  %if direction == "input":
+    %if not (block_name, port_name) in destinations:
+  assign s_${block_name}_${port_name}_tdata  = {CHDR_W{1'b0}};
+  assign s_${block_name}_${port_name}_tlast  = 1'b0;
+  assign s_${block_name}_${port_name}_tvalid = 1'b0;
     %endif
-  %endfor
-  %for output in range(seps[sep]["num_data_o"]):
-    %if not (sep, "out%d" % (output)) in sources:
-  assign m_${sep}_out${output}_tready = 1'b1;
+  %elif direction == "output":
+    %if not (block_name, port_name) in sources:
+  assign m_${block_name}_${port_name}_tready = 1'b1;
     %endif
-  %endfor
-%endfor
-%for block in blocks:
-  %for input in block_descs[blocks[block]["block_desc"]].data["inputs"]:
-    %if not (block, input) in destinations:
-  assign s_${block}_${input}_tdata  = ${block_descs[blocks[block]["block_desc"]].chdr_width}'h0;
-  assign s_${block}_${input}_tlast  = 1'b0;
-  assign s_${block}_${input}_tvalid = 1'b0;
-    %endif
-  %endfor
-  %for output in block_descs[blocks[block]["block_desc"]].data["outputs"]:
-    %if not (block, output) in sources:
-  assign m_${block}_${output}_tready = 1'b1;
-    %endif
-  %endfor
+  %endif
 %endfor
diff --git a/host/utils/rfnoc/templates/modules/rfnoc_block.v.mako b/host/utils/rfnoc/templates/modules/rfnoc_block.v.mako
index 061e4dc8e..ee4a811a8 100644
--- a/host/utils/rfnoc/templates/modules/rfnoc_block.v.mako
+++ b/host/utils/rfnoc/templates/modules/rfnoc_block.v.mako
@@ -1,15 +1,22 @@
-<%page args="block_id, block_number, block_name, block, block_params"/>\
+<%page args="block_id, block_number, block_name, block, block_params, block_ports"/>\
 \
 <%
   import re
   import six
+
+  # Create two strings, one for the input and one for the output, that each
+  # contains all the signal names to be connected to the input or output 
+  # AXIS-CHDR ports of this block.
   axis_inputs = ""
   axis_outputs = ""
-  for input in list(block.data["inputs"].keys()):
-    axis_inputs = "{0}_%s_%s_{1}, " % (block_name, input) + axis_inputs
+  for port_desc in block_ports:
+    if port_desc[0] == block_name:
+      port_name = port_desc[1]
+      if port_desc[2] == "input":
+        axis_inputs = "{0}_%s_%s_{1}, " % (block_name, port_name) + axis_inputs
+      elif port_desc[2] == "output":
+        axis_outputs = "{0}_%s_%s_{1}, " % (block_name, port_name) + axis_outputs
   axis_inputs = axis_inputs[:-2]
-  for output in list(block.data["outputs"].keys()):
-    axis_outputs = "{0}_%s_%s_{1}, " % (block_name, output) + axis_outputs
   axis_outputs = axis_outputs[:-2]
 %>\
 
diff --git a/host/utils/rfnoc/templates/rfnoc_image_core.v.mako b/host/utils/rfnoc/templates/rfnoc_image_core.v.mako
index fb3cb3d2e..a18ff53a1 100644
--- a/host/utils/rfnoc/templates/rfnoc_image_core.v.mako
+++ b/host/utils/rfnoc/templates/rfnoc_image_core.v.mako
@@ -131,7 +131,7 @@ module rfnoc_image_core #(
   // Blocks
   // ----------------------------------------------------
 %for i, name in enumerate(config.noc_blocks):
-<%include file="/modules/rfnoc_block.v.mako" args="block_id=i + len(ctrl_seps) + 1, block_number=i, block_name=name, block=config.blocks[config.noc_blocks[name]['block_desc']], block_params=config.noc_blocks[name]['parameters']"/>
+<%include file="/modules/rfnoc_block.v.mako" args="block_id=i + len(ctrl_seps) + 1, block_number=i, block_name=name, block=config.blocks[config.noc_blocks[name]['block_desc']], block_params=config.noc_blocks[name]['parameters'], block_ports=config.block_ports"/>
 %endfor
 
   // ----------------------------------------------------
@@ -142,7 +142,7 @@ module rfnoc_image_core #(
   // ----------------------------------------------------
   // Unused Ports
   // ----------------------------------------------------
-<%include file="/modules/drive_unused_ports.v.mako" args="connections=config.block_con, blocks=config.noc_blocks, block_descs=config.blocks, seps=config.stream_endpoints"/>\
+<%include file="/modules/drive_unused_ports.v.mako" args="connections=config.block_con, block_ports=config.block_ports"/>\
 
   // ----------------------------------------------------
   // Clock Domains