From af5735b51a0d9c032c696344143adb97d00bb1c9 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Wed, 6 May 2020 17:38:19 +0100
Subject: [PATCH] [Test] better config setting for HLS layers in end2end tests
---
.../test_end2end_tfc_w1a1_throughput_test.py | 50 ++++++-------------
tests/end2end/test_end2end_tfc_w1a2.py | 35 ++++++-------
tests/end2end/test_end2end_tfc_w2a2.py | 35 ++++++-------
3 files changed, 50 insertions(+), 70 deletions(-)
diff --git a/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py b/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py
index ded0bd107..ea7ce9df8 100644
--- a/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py
+++ b/tests/end2end/test_end2end_tfc_w1a1_throughput_test.py
@@ -131,46 +131,24 @@ 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")
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
- fc0w = getCustomOp(fc_layers[0])
- fc1w = getCustomOp(fc_layers[1])
- fc2w = getCustomOp(fc_layers[2])
- fc3w = getCustomOp(fc_layers[3])
- fc0w.set_nodeattr("inFIFODepth", 256)
- fc0w.set_nodeattr("SIMD", 196)
- fc0w.set_nodeattr("PE", 16)
- fc0w.set_nodeattr("outFIFODepth", 64)
- fc1w.set_nodeattr("inFIFODepth", 64)
- fc0w.set_nodeattr("ram_style", "block")
- fc1w.set_nodeattr("SIMD", 16)
- fc1w.set_nodeattr("PE", 16)
- fc1w.set_nodeattr("outFIFODepth", 64)
- fc2w.set_nodeattr("inFIFODepth", 64)
- fc2w.set_nodeattr("SIMD", 16)
- fc2w.set_nodeattr("PE", 16)
- fc2w.set_nodeattr("outFIFODepth", 64)
- fc3w.set_nodeattr("inFIFODepth", 64)
- fc3w.set_nodeattr("SIMD", 16)
- fc3w.set_nodeattr("PE", 10)
- fc3w.set_nodeattr("outFIFODepth", 10)
- fc3w.set_nodeattr("ram_style", "distributed")
+ # (PE, SIMD, in_fifo_depth, out_fifo_depth, ramstyle) for each layer
+ config = [
+ (16, 49, 16, 64, "block"),
+ (8, 8, 64, 64, "auto"),
+ (8, 8, 64, 64, "auto"),
+ (10, 8, 64, 10, "distributed"),
+ ]
+ for fcl, (pe, simd, ififo, ofifo, ramstyle) in zip(fc_layers, config):
+ fcl_inst = getCustomOp(fcl)
+ fcl_inst.set_nodeattr("PE", pe)
+ fcl_inst.set_nodeattr("SIMD", simd)
+ fcl_inst.set_nodeattr("inFIFODepth", ififo)
+ fcl_inst.set_nodeattr("outFIFODepth", ofifo)
+ fcl_inst.set_nodeattr("ram_style", ramstyle)
model = model.transform(InsertDWC())
model = model.transform(InsertFIFO())
model = model.transform(InsertTLastMarker())
model = model.transform(GiveUniqueNodeNames())
- fifos = []
- for n in model.graph.node:
- if n.op_type == "StreamingFIFO":
- fifos.append(n)
- fifo0 = getCustomOp(fifos[0])
- fifo1 = getCustomOp(fifos[1])
- fifo2 = getCustomOp(fifos[2])
- fifo3 = getCustomOp(fifos[3])
- fifo4 = getCustomOp(fifos[4])
- fifo0.set_nodeattr("depth", 256)
- fifo1.set_nodeattr("depth", 64)
- fifo2.set_nodeattr("depth", 64)
- fifo3.set_nodeattr("depth", 64)
- fifo4.set_nodeattr("depth", 10)
model = model.transform(AnnotateResources("estimate"))
model.save(build_dir + "/end2end_tfc_w1a1_folded.onnx")
diff --git a/tests/end2end/test_end2end_tfc_w1a2.py b/tests/end2end/test_end2end_tfc_w1a2.py
index 52771e6d1..6d0349057 100644
--- a/tests/end2end/test_end2end_tfc_w1a2.py
+++ b/tests/end2end/test_end2end_tfc_w1a2.py
@@ -51,6 +51,8 @@ from finn.transformation.fpgadataflow.create_dataflow_partition import (
CreateDataflowPartition,
)
from finn.transformation.fpgadataflow.hlssynth_ipgen import HLSSynth_IPGen
+from finn.transformation.fpgadataflow.insert_dwc import InsertDWC
+from finn.transformation.fpgadataflow.insert_fifo import InsertFIFO
from finn.transformation.fpgadataflow.insert_tlastmarker import InsertTLastMarker
from finn.transformation.fpgadataflow.make_deployment import DeployToPYNQ
from finn.transformation.fpgadataflow.make_pynq_driver import MakePYNQDriver
@@ -121,23 +123,22 @@ 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")
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
- fc0w = getCustomOp(fc_layers[0])
- fc1w = getCustomOp(fc_layers[1])
- fc2w = getCustomOp(fc_layers[2])
- fc3w = getCustomOp(fc_layers[3])
- fc0w.set_nodeattr("inFIFODepth", 50)
- fc0w.set_nodeattr("SIMD", 8)
- fc0w.set_nodeattr("PE", 16)
- fc0w.set_nodeattr("outFIFODepth", 4)
- fc1w.set_nodeattr("SIMD", 16)
- fc1w.set_nodeattr("PE", 16)
- fc1w.set_nodeattr("outFIFODepth", 4)
- fc2w.set_nodeattr("SIMD", 16)
- fc2w.set_nodeattr("PE", 16)
- fc2w.set_nodeattr("outFIFODepth", 4)
- fc3w.set_nodeattr("SIMD", 16)
- fc3w.set_nodeattr("PE", 10)
- fc3w.set_nodeattr("outFIFODepth", 50)
+ # (PE, SIMD, in_fifo_depth, out_fifo_depth, ramstyle) for each layer
+ config = [
+ (16, 49, 16, 64, "block"),
+ (8, 8, 64, 64, "auto"),
+ (8, 8, 64, 64, "auto"),
+ (10, 8, 64, 10, "distributed"),
+ ]
+ for fcl, (pe, simd, ififo, ofifo, ramstyle) in zip(fc_layers, config):
+ fcl_inst = getCustomOp(fcl)
+ fcl_inst.set_nodeattr("PE", pe)
+ fcl_inst.set_nodeattr("SIMD", simd)
+ fcl_inst.set_nodeattr("inFIFODepth", ififo)
+ fcl_inst.set_nodeattr("outFIFODepth", ofifo)
+ fcl_inst.set_nodeattr("ram_style", ramstyle)
+ model = model.transform(InsertDWC())
+ model = model.transform(InsertFIFO())
model = model.transform(InsertTLastMarker())
model = model.transform(GiveUniqueNodeNames())
model = model.transform(AnnotateResources("estimate"))
diff --git a/tests/end2end/test_end2end_tfc_w2a2.py b/tests/end2end/test_end2end_tfc_w2a2.py
index 67111da40..f1ded9ab0 100644
--- a/tests/end2end/test_end2end_tfc_w2a2.py
+++ b/tests/end2end/test_end2end_tfc_w2a2.py
@@ -52,6 +52,8 @@ from finn.transformation.fpgadataflow.create_dataflow_partition import (
)
from finn.transformation.fpgadataflow.hlssynth_ipgen import HLSSynth_IPGen
from finn.transformation.fpgadataflow.insert_tlastmarker import InsertTLastMarker
+from finn.transformation.fpgadataflow.insert_dwc import InsertDWC
+from finn.transformation.fpgadataflow.insert_fifo import InsertFIFO
from finn.transformation.fpgadataflow.make_deployment import DeployToPYNQ
from finn.transformation.fpgadataflow.make_pynq_driver import MakePYNQDriver
from finn.transformation.fpgadataflow.make_pynq_proj import MakePYNQProject
@@ -121,23 +123,22 @@ 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")
fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
- fc0w = getCustomOp(fc_layers[0])
- fc1w = getCustomOp(fc_layers[1])
- fc2w = getCustomOp(fc_layers[2])
- fc3w = getCustomOp(fc_layers[3])
- fc0w.set_nodeattr("inFIFODepth", 50)
- fc0w.set_nodeattr("SIMD", 8)
- fc0w.set_nodeattr("PE", 16)
- fc0w.set_nodeattr("outFIFODepth", 4)
- fc1w.set_nodeattr("SIMD", 16)
- fc1w.set_nodeattr("PE", 16)
- fc1w.set_nodeattr("outFIFODepth", 4)
- fc2w.set_nodeattr("SIMD", 16)
- fc2w.set_nodeattr("PE", 16)
- fc2w.set_nodeattr("outFIFODepth", 4)
- fc3w.set_nodeattr("SIMD", 16)
- fc3w.set_nodeattr("PE", 10)
- fc3w.set_nodeattr("outFIFODepth", 50)
+ # (PE, SIMD, in_fifo_depth, out_fifo_depth, ramstyle) for each layer
+ config = [
+ (16, 49, 16, 64, "block"),
+ (8, 8, 64, 64, "auto"),
+ (8, 8, 64, 64, "auto"),
+ (10, 8, 64, 10, "distributed"),
+ ]
+ for fcl, (pe, simd, ififo, ofifo, ramstyle) in zip(fc_layers, config):
+ fcl_inst = getCustomOp(fcl)
+ fcl_inst.set_nodeattr("PE", pe)
+ fcl_inst.set_nodeattr("SIMD", simd)
+ fcl_inst.set_nodeattr("inFIFODepth", ififo)
+ fcl_inst.set_nodeattr("outFIFODepth", ofifo)
+ fcl_inst.set_nodeattr("ram_style", ramstyle)
+ model = model.transform(InsertDWC())
+ model = model.transform(InsertFIFO())
model = model.transform(InsertTLastMarker())
model = model.transform(GiveUniqueNodeNames())
model = model.transform(AnnotateResources("estimate"))
--
GitLab