[Test] call PrepareRTLSim in end2end tests

tests/end2end/test_end2end_cnv_w1a1.py

@@ -71,7 +71,7 @@ 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
-
+from finn.transformation.fpgadataflow.prepare_rtlsim import PrepareRTLSim
 
 build_dir = "/tmp/" + os.environ["FINN_INST_NAME"]
 test_pynq_board = os.getenv("PYNQ_BOARD", default="Pynq-Z1")
@@ -199,6 +199,7 @@ def test_end2end_cnv_w1a1_verify_dataflow_part():
     res_npysim = ret_npysim[out_name]
     # node-by-node rtlsim
     model = model.transform(SetExecMode("rtlsim"))
+    model = model.transform(PrepareRTLSim())
     fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
     for fcl in fc_layers:
         getCustomOp(fcl).set_nodeattr("rtlsim_trace", "default")

tests/end2end/test_end2end_tfc_w1a1.py

@@ -71,6 +71,7 @@ from finn.transformation.streamline.round_thresholds import RoundAndClipThreshol
 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
+from finn.transformation.fpgadataflow.prepare_rtlsim import PrepareRTLSim
 
 build_dir = "/tmp/" + os.environ["FINN_INST_NAME"]
 test_pynq_board = os.getenv("PYNQ_BOARD", default="Pynq-Z1")
@@ -182,6 +183,7 @@ def test_end2end_tfc_w1a1_verify_dataflow_part():
     res_npysim = ret_npysim[out_name]
     # node-by-node rtlsim
     model = model.transform(SetExecMode("rtlsim"))
+    model = model.transform(PrepareRTLSim())
     fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
     for fcl in fc_layers:
         getCustomOp(fcl).set_nodeattr("rtlsim_trace", "default")

tests/end2end/test_end2end_tfc_w1a2.py

@@ -67,6 +67,7 @@ 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
+from finn.transformation.fpgadataflow.prepare_rtlsim import PrepareRTLSim
 
 build_dir = "/tmp/" + os.environ["FINN_INST_NAME"]
 test_pynq_board = os.getenv("PYNQ_BOARD", default="Pynq-Z1")
@@ -173,6 +174,7 @@ def test_end2end_tfc_w1a2_verify_dataflow_part():
     res_npysim = ret_npysim[out_name]
     # node-by-node rtlsim
     model = model.transform(SetExecMode("rtlsim"))
+    model = model.transform(PrepareRTLSim())
     fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
     for fcl in fc_layers:
         getCustomOp(fcl).set_nodeattr("rtlsim_trace", "default")

tests/end2end/test_end2end_tfc_w2a2.py

@@ -67,6 +67,7 @@ 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
+from finn.transformation.fpgadataflow.prepare_rtlsim import PrepareRTLSim
 
 build_dir = "/tmp/" + os.environ["FINN_INST_NAME"]
 test_pynq_board = os.getenv("PYNQ_BOARD", default="Pynq-Z1")
@@ -173,6 +174,7 @@ def test_end2end_tfc_w2a2_verify_dataflow_part():
     res_npysim = ret_npysim[out_name]
     # node-by-node rtlsim
     model = model.transform(SetExecMode("rtlsim"))
+    model = model.transform(PrepareRTLSim())
     fc_layers = model.get_nodes_by_op_type("StreamingFCLayer_Batch")
     for fcl in fc_layers:
         getCustomOp(fcl).set_nodeattr("rtlsim_trace", "default")