From e4d83b5fc51ab2597f0a2942295f5dbe7080f7d4 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Thu, 9 Apr 2020 01:52:09 +0100
Subject: [PATCH] [Test] call AnnotateResources in all end2end tests
---
tests/end2end/test_end2end_cnv_w1a1.py | 7 +++++--
tests/end2end/test_end2end_tfc_w1a2.py | 6 +++++-
tests/end2end/test_end2end_tfc_w2a2.py | 6 +++++-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/tests/end2end/test_end2end_cnv_w1a1.py b/tests/end2end/test_end2end_cnv_w1a1.py
index 8b1af7bdd..1a59191a0 100644
--- a/tests/end2end/test_end2end_cnv_w1a1.py
+++ b/tests/end2end/test_end2end_cnv_w1a1.py
@@ -68,9 +68,9 @@ from finn.transformation.fpgadataflow.make_pynq_driver import MakePYNQDriver
from finn.transformation.fpgadataflow.make_pynq_proj import MakePYNQProject
from finn.transformation.fpgadataflow.synth_pynq_proj import SynthPYNQProject
from finn.transformation.fpgadataflow.make_deployment import DeployToPYNQ
-
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"]
@@ -133,7 +133,6 @@ 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])
@@ -165,6 +164,8 @@ def test_end2end_cnv_w1a1_fold_and_tlastmarker():
model = model.transform(InsertDWC())
model = model.transform(InsertTLastMarker())
+ model = model.transform(GiveUniqueNodeNames())
+ model = model.transform(AnnotateResources("estimate"))
model.save(build_dir + "/end2end_cnv_w1a1_folded.onnx")
@@ -172,6 +173,7 @@ def test_end2end_cnv_w1a1_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_cnv_w1a1_folded.onnx")
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_cnv_w1a1_ipgen.onnx")
@@ -267,6 +269,7 @@ def test_end2end_cnv_w1a1_make_pynq_proj():
def test_end2end_cnv_w1a1_synth_pynq_project():
model = ModelWrapper(build_dir + "/end2end_cnv_w1a1_pynq_project.onnx")
model = model.transform(SynthPYNQProject())
+ model = model.transform(AnnotateResources("synth"))
model.save(build_dir + "/end2end_cnv_w1a1_synth.onnx")
diff --git a/tests/end2end/test_end2end_tfc_w1a2.py b/tests/end2end/test_end2end_tfc_w1a2.py
index 28639d0bb..7fef331b9 100644
--- a/tests/end2end/test_end2end_tfc_w1a2.py
+++ b/tests/end2end/test_end2end_tfc_w1a2.py
@@ -66,6 +66,7 @@ from finn.transformation.infer_shapes import InferShapes
from finn.transformation.streamline import Streamline
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")
@@ -118,7 +119,6 @@ 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])
@@ -138,6 +138,8 @@ def test_end2end_tfc_w1a2_fold_and_tlastmarker():
fc3w.set_nodeattr("PE", 10)
fc3w.set_nodeattr("outFIFODepth", 50)
model = model.transform(InsertTLastMarker())
+ model = model.transform(GiveUniqueNodeNames())
+ model = model.transform(AnnotateResources("estimate"))
model.save(build_dir + "/end2end_tfc_w1a2_folded.onnx")
@@ -145,6 +147,7 @@ def test_end2end_tfc_w1a2_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_tfc_w1a2_folded.onnx")
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_w1a2_ipgen.onnx")
@@ -234,6 +237,7 @@ def test_end2end_tfc_w1a2_make_pynq_proj():
def test_end2end_tfc_w1a2_synth_pynq_project():
model = ModelWrapper(build_dir + "/end2end_tfc_w1a2_pynq_project.onnx")
model = model.transform(SynthPYNQProject())
+ model = model.transform(AnnotateResources("synth"))
model.save(build_dir + "/end2end_tfc_w1a2_synth.onnx")
diff --git a/tests/end2end/test_end2end_tfc_w2a2.py b/tests/end2end/test_end2end_tfc_w2a2.py
index ad0ca93a2..c78be7b66 100644
--- a/tests/end2end/test_end2end_tfc_w2a2.py
+++ b/tests/end2end/test_end2end_tfc_w2a2.py
@@ -66,6 +66,7 @@ from finn.transformation.infer_shapes import InferShapes
from finn.transformation.streamline import Streamline
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")
@@ -118,7 +119,6 @@ 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])
@@ -138,6 +138,8 @@ def test_end2end_tfc_w2a2_fold_and_tlastmarker():
fc3w.set_nodeattr("PE", 10)
fc3w.set_nodeattr("outFIFODepth", 50)
model = model.transform(InsertTLastMarker())
+ model = model.transform(GiveUniqueNodeNames())
+ model = model.transform(AnnotateResources("estimate"))
model.save(build_dir + "/end2end_tfc_w2a2_folded.onnx")
@@ -145,6 +147,7 @@ def test_end2end_tfc_w2a2_gen_hls_ip():
model = ModelWrapper(build_dir + "/end2end_tfc_w2a2_folded.onnx")
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_w2a2_ipgen.onnx")
@@ -234,6 +237,7 @@ def test_end2end_tfc_w2a2_make_pynq_proj():
def test_end2end_tfc_w2a2_synth_pynq_project():
model = ModelWrapper(build_dir + "/end2end_tfc_w2a2_pynq_project.onnx")
model = model.transform(SynthPYNQProject())
+ model = model.transform(AnnotateResources("synth"))
model.save(build_dir + "/end2end_tfc_w2a2_synth.onnx")
--
GitLab