From bce67e959b3ace89840ff7b722902a042d98fcd0 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Fri, 2 Dec 2022 12:40:52 +0100
Subject: [PATCH] [Build] move FIFO splitting past final json folding config
file gen
---
src/finn/builder/build_dataflow_steps.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/finn/builder/build_dataflow_steps.py b/src/finn/builder/build_dataflow_steps.py
index 72f3fb225..359a137df 100644
--- a/src/finn/builder/build_dataflow_steps.py
+++ b/src/finn/builder/build_dataflow_steps.py
@@ -552,10 +552,6 @@ def step_set_fifo_depths(model: ModelWrapper, cfg: DataflowBuildConfig):
model = model.transform(GiveReadableTensorNames())
if cfg.folding_config_file is not None:
model = model.transform(ApplyConfig(cfg.folding_config_file))
- if cfg.split_large_fifos:
- model = model.transform(SplitLargeFifos())
- # remove any shallow FIFOs
- model = model.transform(RemoveShallowFIFOs())
# extract the final configuration and save it as json
hw_attrs = [
@@ -572,6 +568,13 @@ def step_set_fifo_depths(model: ModelWrapper, cfg: DataflowBuildConfig):
model, cfg.output_dir + "/final_hw_config.json", hw_attrs
)
+ # perform FIFO splitting and shallow FIFO removal only after the final config
+ # json file has been written. otherwise, since these transforms may add/remove
+ # FIFOs, we get name mismatch problems when trying to reuse the final config.
+ if cfg.split_large_fifos:
+ model = model.transform(SplitLargeFifos())
+ model = model.transform(RemoveShallowFIFOs())
+
# after FIFOs are ready to go, call PrepareIP and HLSSynthIP again
# this will only run for the new nodes (e.g. FIFOs and DWCs)
model = model.transform(
--
GitLab