From e258c63f848f86b81b77f04c8fda21a492ef13b1 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Wed, 8 Apr 2020 22:52:53 +0100
Subject: [PATCH] [Test] add AnnotateResources to e2e, give hls layer names
earlier
---
tests/end2end/test_end2end_cnv_w1a1.py | 2 +-
tests/end2end/test_end2end_tfc_w1a1.py | 5 ++++-
tests/end2end/test_end2end_tfc_w1a2.py | 2 +-
tests/end2end/test_end2end_tfc_w2a2.py | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/tests/end2end/test_end2end_cnv_w1a1.py b/tests/end2end/test_end2end_cnv_w1a1.py
index 30440bdaa..8b1af7bdd 100644
--- a/tests/end2end/test_end2end_cnv_w1a1.py
+++ b/tests/end2end/test_end2end_cnv_w1a1.py
@@ -133,6 +133,7 @@ def test_end2end_cnv_w1a1_create_dataflow_partition():
def test_end2end_cnv_w1a1_fold_and_tlastmarker():
model = ModelWrapper(build_dir + "/end2end_cnv_w1a1_dataflow_model.onnx")
+ model = model.transform(GiveUniqueNodeNames())
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
fc0w = getCustomOp(fc_layers[0])
fc1w = getCustomOp(fc_layers[1])
@@ -169,7 +170,6 @@ def test_end2end_cnv_w1a1_fold_and_tlastmarker():
def test_end2end_cnv_w1a1_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_cnv_w1a1_folded.onnx")
- model = model.transform(GiveUniqueNodeNames())
model = model.transform(CodeGen_ipgen(test_fpga_part, target_clk_ns))
model = model.transform(HLSSynth_IPGen())
model.save(build_dir + "/end2end_cnv_w1a1_ipgen.onnx")
diff --git a/tests/end2end/test_end2end_tfc_w1a1.py b/tests/end2end/test_end2end_tfc_w1a1.py
index d61ea8d27..61fc9993a 100644
--- a/tests/end2end/test_end2end_tfc_w1a1.py
+++ b/tests/end2end/test_end2end_tfc_w1a1.py
@@ -70,6 +70,7 @@ from finn.transformation.streamline import Streamline
from finn.transformation.streamline.round_thresholds import RoundAndClipThresholds
from finn.util.basic import pynq_part_map
from finn.util.test import get_test_model_trained
+from finn.transformation.fpgadataflow.annotate_resources import AnnotateResources
build_dir = "/tmp/" + os.environ["FINN_INST_NAME"]
test_pynq_board = os.getenv("PYNQ_BOARD", default="Pynq-Z1")
@@ -126,6 +127,7 @@ def test_end2end_tfc_w1a1_create_dataflow_partition():
def test_end2end_tfc_w1a1_fold_and_tlastmarker():
model = ModelWrapper(build_dir + "/end2end_tfc_w1a1_dataflow_model.onnx")
+ model = model.transform(GiveUniqueNodeNames())
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
fc0w = getCustomOp(fc_layers[0])
fc1w = getCustomOp(fc_layers[1])
@@ -146,14 +148,15 @@ def test_end2end_tfc_w1a1_fold_and_tlastmarker():
fc3w.set_nodeattr("outFIFODepth", 50)
model = model.transform(InsertDWC())
model = model.transform(InsertTLastMarker())
+ model = model.transform(AnnotateResources("estimate"))
model.save(build_dir + "/end2end_tfc_w1a1_folded.onnx")
def test_end2end_tfc_w1a1_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_tfc_w1a1_folded.onnx")
- model = model.transform(GiveUniqueNodeNames())
model = model.transform(CodeGen_ipgen(test_fpga_part, target_clk_ns))
model = model.transform(HLSSynth_IPGen())
+ model = model.transform(AnnotateResources("hls"))
model.save(build_dir + "/end2end_tfc_w1a1_ipgen.onnx")
diff --git a/tests/end2end/test_end2end_tfc_w1a2.py b/tests/end2end/test_end2end_tfc_w1a2.py
index 2ac344af5..28639d0bb 100644
--- a/tests/end2end/test_end2end_tfc_w1a2.py
+++ b/tests/end2end/test_end2end_tfc_w1a2.py
@@ -118,6 +118,7 @@ def test_end2end_tfc_w1a2_create_dataflow_partition():
def test_end2end_tfc_w1a2_fold_and_tlastmarker():
model = ModelWrapper(build_dir + "/end2end_tfc_w1a2_dataflow_model.onnx")
+ model = model.transform(GiveUniqueNodeNames())
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
fc0w = getCustomOp(fc_layers[0])
fc1w = getCustomOp(fc_layers[1])
@@ -142,7 +143,6 @@ def test_end2end_tfc_w1a2_fold_and_tlastmarker():
def test_end2end_tfc_w1a2_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_tfc_w1a2_folded.onnx")
- model = model.transform(GiveUniqueNodeNames())
model = model.transform(CodeGen_ipgen(test_fpga_part, target_clk_ns))
model = model.transform(HLSSynth_IPGen())
model.save(build_dir + "/end2end_tfc_w1a2_ipgen.onnx")
diff --git a/tests/end2end/test_end2end_tfc_w2a2.py b/tests/end2end/test_end2end_tfc_w2a2.py
index acc01b568..ad0ca93a2 100644
--- a/tests/end2end/test_end2end_tfc_w2a2.py
+++ b/tests/end2end/test_end2end_tfc_w2a2.py
@@ -118,6 +118,7 @@ def test_end2end_tfc_w2a2_create_dataflow_partition():
def test_end2end_tfc_w2a2_fold_and_tlastmarker():
model = ModelWrapper(build_dir + "/end2end_tfc_w2a2_dataflow_model.onnx")
+ model = model.transform(GiveUniqueNodeNames())
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
fc0w = getCustomOp(fc_layers[0])
fc1w = getCustomOp(fc_layers[1])
@@ -142,7 +143,6 @@ def test_end2end_tfc_w2a2_fold_and_tlastmarker():
def test_end2end_tfc_w2a2_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_tfc_w2a2_folded.onnx")
- model = model.transform(GiveUniqueNodeNames())
model = model.transform(CodeGen_ipgen(test_fpga_part, target_clk_ns))
model = model.transform(HLSSynth_IPGen())
model.save(build_dir + "/end2end_tfc_w2a2_ipgen.onnx")
--
GitLab