From 9c5f53fae075239e4c4129a48281d07158bc2600 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Thu, 16 Apr 2020 13:00:40 +0100
Subject: [PATCH] [StreamingFC] change const mem_mode param generation
use const instead of static, local instead of global
---
src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py b/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
index 567a6cc98..40a8637a9 100644
--- a/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
+++ b/src/finn/custom_op/fpgadataflow/streamingfclayer_batch.py
@@ -463,7 +463,7 @@ class StreamingFCLayer_Batch(HLSCustomOp):
if export_wdt.bitwidth() != 1:
f_weights.write(
- "static FixedPointWeights<{},{},{},{}> weights = ".format(
+ "const FixedPointWeights<{},{},{},{}> weights = ".format(
self.get_nodeattr("SIMD"),
export_wdt.get_hls_datatype_str(),
self.get_nodeattr("PE"),
@@ -472,7 +472,7 @@ class StreamingFCLayer_Batch(HLSCustomOp):
)
else:
f_weights.write(
- "static BinaryWeights<{},{},{}> weights = ".format(
+ "const BinaryWeights<{},{},{}> weights = ".format(
self.get_nodeattr("SIMD"),
self.get_nodeattr("PE"),
self.calc_wmem(),
@@ -709,7 +709,8 @@ class StreamingFCLayer_Batch(HLSCustomOp):
mem_mode = self.get_nodeattr("mem_mode")
if mem_mode == "const":
- self.code_gen_dict["$GLOBALS$"] += ['#include "params.h"']
+ # self.code_gen_dict["$GLOBALS$"] += ['#include "params.h"']
+ pass
elif mem_mode == "decoupled":
self.code_gen_dict["$GLOBALS$"] += ['#include "mvau.hpp"']
else:
@@ -928,6 +929,7 @@ class StreamingFCLayer_Batch(HLSCustomOp):
)
if mem_mode == "const":
+ self.code_gen_dict["$PRAGMAS$"].append('#include "params.h"')
# the weight tensor is ap_uint<simd*prec> [PE][WMEM]
# partition for parallel access along the PE dimension (dim 1)
self.code_gen_dict["$PRAGMAS$"].append(
--
GitLab