From 8b56f4a54df73f21b505686c3a9a6632e901ac76 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <yamanu@xilinx.com>
Date: Tue, 30 Nov 2021 19:40:52 +0100
Subject: [PATCH] [Vitis] try to fix iface naming for 2021.2
---
.../custom_op/fpgadataflow/addstreams_batch.py | 12 +++++++++---
.../fpgadataflow/channelwise_op_batch.py | 8 ++++++--
src/finn/custom_op/fpgadataflow/concat.py | 9 +++++++--
.../fpgadataflow/convolutioninputgenerator.py | 8 ++++++--
.../fpgadataflow/convolutioninputgenerator1d.py | 8 ++++++--
src/finn/custom_op/fpgadataflow/downsampler.py | 8 ++++++--
.../fpgadataflow/duplicatestreams_batch.py | 7 +++++--
.../custom_op/fpgadataflow/fmpadding_batch.py | 8 ++++++--
.../fpgadataflow/globalaccpool_batch.py | 8 ++++++--
src/finn/custom_op/fpgadataflow/iodma.py | 4 ++--
.../custom_op/fpgadataflow/labelselect_batch.py | 8 ++++++--
src/finn/custom_op/fpgadataflow/lookup.py | 8 ++++++--
src/finn/custom_op/fpgadataflow/pool_batch.py | 8 ++++++--
.../streamingdatawidthconverter_batch.py | 8 ++++++--
.../fpgadataflow/streamingfclayer_batch.py | 11 ++++++++---
.../fpgadataflow/streamingmaxpool_batch.py | 8 ++++++--
.../custom_op/fpgadataflow/thresholding_batch.py | 11 ++++++++---
src/finn/custom_op/fpgadataflow/tlastmarker.py | 16 ++++++++--------
src/finn/custom_op/fpgadataflow/upsampler.py | 8 ++++++--
.../fpgadataflow/vector_vector_activate_batch.py | 8 ++++++--
20 files changed, 125 insertions(+), 49 deletions(-)
diff --git a/src/finn/custom_op/fpgadataflow/addstreams_batch.py b/src/finn/custom_op/fpgadataflow/addstreams_batch.py
index ec355a8ee..7ba67247a 100644
--- a/src/finn/custom_op/fpgadataflow/addstreams_batch.py
+++ b/src/finn/custom_op/fpgadataflow/addstreams_batch.py
@@ -340,9 +340,15 @@ class AddStreams_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=in1")
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=in1 name=in1_" + self.hls_sname()
+ )
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py b/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py
index b40389808..54de38057 100644
--- a/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py
+++ b/src/finn/custom_op/fpgadataflow/channelwise_op_batch.py
@@ -571,8 +571,12 @@ class ChannelwiseOp_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/concat.py b/src/finn/custom_op/fpgadataflow/concat.py
index dd18e0623..ee8a2c323 100644
--- a/src/finn/custom_op/fpgadataflow/concat.py
+++ b/src/finn/custom_op/fpgadataflow/concat.py
@@ -348,9 +348,14 @@ class StreamingConcat(HLSCustomOp):
n_inputs = self.get_n_inputs()
pragmas = []
for i in range(n_inputs):
- pragmas.append("#pragma HLS INTERFACE axis port=in%d" % i)
+ pragmas.append(
+ "#pragma HLS INTERFACE axis port=in%d name=in%d_%s"
+ % (i, i, self.hls_sname())
+ )
self.code_gen_dict["$PRAGMAS$"] = pragmas
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py
index a40188368..e27b46b11 100644
--- a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py
+++ b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator.py
@@ -489,8 +489,12 @@ class ConvolutionInputGenerator(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py
index 6347c9e9e..03630916a 100644
--- a/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py
+++ b/src/finn/custom_op/fpgadataflow/convolutioninputgenerator1d.py
@@ -659,8 +659,12 @@ class ConvolutionInputGenerator1D(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/downsampler.py b/src/finn/custom_op/fpgadataflow/downsampler.py
index 124b3e464..789d6ece9 100644
--- a/src/finn/custom_op/fpgadataflow/downsampler.py
+++ b/src/finn/custom_op/fpgadataflow/downsampler.py
@@ -248,8 +248,12 @@ class DownSampler(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py b/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py
index f06fdf095..d6f9f3bd3 100644
--- a/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py
+++ b/src/finn/custom_op/fpgadataflow/duplicatestreams_batch.py
@@ -384,10 +384,13 @@ class DuplicateStreams_Batch(HLSCustomOp):
def pragmas(self):
n_outputs = self.get_num_output_streams()
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
for i in range(n_outputs):
self.code_gen_dict["$PRAGMAS$"].append(
- "#pragma HLS INTERFACE axis port=out%d" % i
+ "#pragma HLS INTERFACE axis port=out%d name=out%d_%s"
+ % (i, i, self.hls_sname())
)
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
diff --git a/src/finn/custom_op/fpgadataflow/fmpadding_batch.py b/src/finn/custom_op/fpgadataflow/fmpadding_batch.py
index 8ac30524e..a2d42f63a 100644
--- a/src/finn/custom_op/fpgadataflow/fmpadding_batch.py
+++ b/src/finn/custom_op/fpgadataflow/fmpadding_batch.py
@@ -312,8 +312,12 @@ class FMPadding_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py b/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py
index 6d4a55ee5..7812b9531 100644
--- a/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py
+++ b/src/finn/custom_op/fpgadataflow/globalaccpool_batch.py
@@ -331,8 +331,12 @@ class GlobalAccPool_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/iodma.py b/src/finn/custom_op/fpgadataflow/iodma.py
index cb28c47be..a331caee0 100644
--- a/src/finn/custom_op/fpgadataflow/iodma.py
+++ b/src/finn/custom_op/fpgadataflow/iodma.py
@@ -349,11 +349,11 @@ class IODMA(HLSCustomOp):
"#pragma HLS INTERFACE s_axilite port=in0 bundle=control"
)
self.code_gen_dict["$PRAGMAS$"].append(
- "#pragma HLS INTERFACE axis port=out"
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
)
elif direction == "out":
self.code_gen_dict["$PRAGMAS$"].append(
- "#pragma HLS INTERFACE axis port=in0"
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
)
if intfname == "":
self.code_gen_dict["$PRAGMAS$"].append(
diff --git a/src/finn/custom_op/fpgadataflow/labelselect_batch.py b/src/finn/custom_op/fpgadataflow/labelselect_batch.py
index 1eb5962fd..da994fb13 100644
--- a/src/finn/custom_op/fpgadataflow/labelselect_batch.py
+++ b/src/finn/custom_op/fpgadataflow/labelselect_batch.py
@@ -342,8 +342,12 @@ class LabelSelect_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/lookup.py b/src/finn/custom_op/fpgadataflow/lookup.py
index 27be06bdf..2c78685a4 100644
--- a/src/finn/custom_op/fpgadataflow/lookup.py
+++ b/src/finn/custom_op/fpgadataflow/lookup.py
@@ -226,8 +226,12 @@ class Lookup(HLSCustomOp):
]
def pragmas(self):
- my_pragmas = ["#pragma HLS INTERFACE axis port=in0"]
- my_pragmas.append("#pragma HLS INTERFACE axis port=out")
+ my_pragmas = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ my_pragmas.append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
my_pragmas.append("#pragma HLS INTERFACE ap_ctrl_none port=return")
self.code_gen_dict["$PRAGMAS$"] = my_pragmas
diff --git a/src/finn/custom_op/fpgadataflow/pool_batch.py b/src/finn/custom_op/fpgadataflow/pool_batch.py
index 708a3a149..946611094 100644
--- a/src/finn/custom_op/fpgadataflow/pool_batch.py
+++ b/src/finn/custom_op/fpgadataflow/pool_batch.py
@@ -326,8 +326,12 @@ class Pool_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/streamingdatawidthconverter_batch.py b/src/finn/custom_op/fpgadataflow/streamingdatawidthconverter_batch.py
index c890bc4c1..5fabef57b 100644
--- a/src/finn/custom_op/fpgadataflow/streamingdatawidthconverter_batch.py
+++ b/src/finn/custom_op/fpgadataflow/streamingdatawidthconverter_batch.py
@@ -278,8 +278,12 @@ class StreamingDataWidthConverter_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py b/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
index 6b31aac0e..fd2ec35fd 100644
--- a/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
+++ b/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
@@ -1210,8 +1210,12 @@ class StreamingFCLayer_Batch(HLSCustomOp):
def pragmas(self):
mem_mode = self.get_nodeattr("mem_mode")
ram_style_thresholds = self.get_nodeattr("ram_style_thresholds")
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
in_fifo_depth = self.get_nodeattr("inFIFODepth")
out_fifo_depth = self.get_nodeattr("outFIFODepth")
# insert depth pragmas only if specified
@@ -1239,7 +1243,8 @@ class StreamingFCLayer_Batch(HLSCustomOp):
)
elif mem_mode == "decoupled" or mem_mode == "external":
self.code_gen_dict["$PRAGMAS$"].append(
- "#pragma HLS INTERFACE axis port=weights"
+ "#pragma HLS INTERFACE axis port=weights name=weights_"
+ + self.hls_sname()
)
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS stream depth=8 variable=weights"
diff --git a/src/finn/custom_op/fpgadataflow/streamingmaxpool_batch.py b/src/finn/custom_op/fpgadataflow/streamingmaxpool_batch.py
index 5b00f3a3c..bc771cc79 100644
--- a/src/finn/custom_op/fpgadataflow/streamingmaxpool_batch.py
+++ b/src/finn/custom_op/fpgadataflow/streamingmaxpool_batch.py
@@ -278,8 +278,12 @@ class StreamingMaxPool_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/thresholding_batch.py b/src/finn/custom_op/fpgadataflow/thresholding_batch.py
index cffc8b68b..e9d99183f 100644
--- a/src/finn/custom_op/fpgadataflow/thresholding_batch.py
+++ b/src/finn/custom_op/fpgadataflow/thresholding_batch.py
@@ -744,8 +744,12 @@ class Thresholding_Batch(HLSCustomOp):
raise Exception("Unrecognized mem_mode")
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
@@ -796,7 +800,8 @@ class Thresholding_Batch(HLSCustomOp):
)
elif self.get_nodeattr("mem_mode") == "decoupled":
self.code_gen_dict["$PRAGMAS$"].append(
- "#pragma HLS INTERFACE axis port=weights"
+ "#pragma HLS INTERFACE axis port=weights name=weights_"
+ + self.hls_sname()
)
def code_generation_ipi(self):
diff --git a/src/finn/custom_op/fpgadataflow/tlastmarker.py b/src/finn/custom_op/fpgadataflow/tlastmarker.py
index 930cca72f..7386aa7e6 100644
--- a/src/finn/custom_op/fpgadataflow/tlastmarker.py
+++ b/src/finn/custom_op/fpgadataflow/tlastmarker.py
@@ -198,8 +198,12 @@ class TLastMarker(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
dyn_iters = self.get_nodeattr("DynIters")
if dyn_iters == 1:
@@ -245,12 +249,8 @@ class TLastMarker(HLSCustomOp):
intf_names = super().get_verilog_top_module_intf_names()
stream_width = self.get_nodeattr("StreamWidth")
sname = self.hls_sname()
- if self.get_nodeattr("Direction") == "in":
- intf_names["s_axis"] = [("in0", stream_width)]
- intf_names["m_axis"] = [("out_" + sname, stream_width)]
- else:
- intf_names["s_axis"] = [("in0_" + sname, stream_width)]
- intf_names["m_axis"] = [("out_r", stream_width)]
+ intf_names["s_axis"] = [("in0_" + sname, stream_width)]
+ intf_names["m_axis"] = [("out_" + sname, stream_width)]
if self.get_nodeattr("DynIters") == 1:
intf_names["axilite"] = ["s_axi_control"]
return intf_names
diff --git a/src/finn/custom_op/fpgadataflow/upsampler.py b/src/finn/custom_op/fpgadataflow/upsampler.py
index 7114cd83e..221725d49 100644
--- a/src/finn/custom_op/fpgadataflow/upsampler.py
+++ b/src/finn/custom_op/fpgadataflow/upsampler.py
@@ -231,8 +231,12 @@ class UpsampleNearestNeighbour_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
self.code_gen_dict["$PRAGMAS$"].append(
"#pragma HLS INTERFACE ap_ctrl_none port=return"
)
diff --git a/src/finn/custom_op/fpgadataflow/vector_vector_activate_batch.py b/src/finn/custom_op/fpgadataflow/vector_vector_activate_batch.py
index e0f789a88..a007b7fab 100644
--- a/src/finn/custom_op/fpgadataflow/vector_vector_activate_batch.py
+++ b/src/finn/custom_op/fpgadataflow/vector_vector_activate_batch.py
@@ -579,8 +579,12 @@ class Vector_Vector_Activate_Batch(HLSCustomOp):
]
def pragmas(self):
- self.code_gen_dict["$PRAGMAS$"] = ["#pragma HLS INTERFACE axis port=in0"]
- self.code_gen_dict["$PRAGMAS$"].append("#pragma HLS INTERFACE axis port=out")
+ self.code_gen_dict["$PRAGMAS$"] = [
+ "#pragma HLS INTERFACE axis port=in0 name=in0_" + self.hls_sname()
+ ]
+ self.code_gen_dict["$PRAGMAS$"].append(
+ "#pragma HLS INTERFACE axis port=out name=out_" + self.hls_sname()
+ )
in_fifo_depth = self.get_nodeattr("inFIFODepth")
out_fifo_depth = self.get_nodeattr("outFIFODepth")
# insert depth pragmas only if specified
--
GitLab