From 5ade63a9e31220b92aa2bc84632f412043f2278c Mon Sep 17 00:00:00 2001
From: auphelia <jakobapk@web.de>
Date: Tue, 9 Aug 2022 12:51:17 +0100
Subject: [PATCH] [LookUp layer] Change hls implementation of LU external
---
src/finn/custom_op/fpgadataflow/lookup.py | 25 +++++++++++------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/finn/custom_op/fpgadataflow/lookup.py b/src/finn/custom_op/fpgadataflow/lookup.py
index d90fa0f05..d9788dce6 100644
--- a/src/finn/custom_op/fpgadataflow/lookup.py
+++ b/src/finn/custom_op/fpgadataflow/lookup.py
@@ -159,8 +159,8 @@ class Lookup(HLSCustomOp):
def global_includes(self):
mem_mode = self.get_nodeattr("mem_mode")
global_incls = []
+ global_incls.append('#include "lookup.hpp"')
if mem_mode == "const":
- global_incls.append('#include "lookup.hpp"')
global_incls.append('#include "embeddings.hpp"')
self.code_gen_dict["$GLOBALS$"] = global_incls
@@ -258,17 +258,10 @@ class Lookup(HLSCustomOp):
InputType, EmbeddingType >(in0, out, embeddings);"""
]
elif mem_mode == "external":
- hls_impl = """
- if(!in0.empty()) {
- ap_uint<T_SRC::width+EmbeddingAlign> const base =
- (in0.read(), ap_uint<EmbeddingAlign>(0));
- for(unsigned j = 0; j < EmbeddingSize; j++) {
-#pragma HLS PIPELINE II=1
- out.write(mem[base+j]);
- }
- }
- """
- self.code_gen_dict["$DOCOMPUTE$"] = [hls_impl]
+ self.code_gen_dict["$DOCOMPUTE$"] = [
+ """StreamingLookup_ext<EmbeddingSize>
+ (in0, out, mem, size, oob_count);"""
+ ]
def blackboxfunction(self):
mem_mode = self.get_nodeattr("mem_mode")
@@ -286,7 +279,7 @@ class Lookup(HLSCustomOp):
"void "
+ self.onnx_node.name
+ "(hls::stream<T_SRC> &in0, hls::stream<T_DST> &out, "
- + "T_DST const *const mem)"
+ + "T_DST const *const mem, unsigned const size, unsigned &oob_count)"
]
def pragmas(self):
@@ -305,6 +298,12 @@ class Lookup(HLSCustomOp):
elif mem_mode == "external":
my_pragmas.append("#pragma HLS INTERFACE m_axi offset=slave port=mem")
my_pragmas.append("#pragma HLS INTERFACE s_axilite port=mem bundle=control")
+ my_pragmas.append(
+ "#pragma HLS_INTERFACE s_axilite port=size bundle=control"
+ )
+ my_pragmas.append(
+ "#pragma HLS_INTERFACE s_axilite port=oob_count bundle=control"
+ )
else:
raise Exception("Unrecognized mem_mode: " + mem_mode)
self.code_gen_dict["$PRAGMAS$"] = my_pragmas
--
GitLab