Merge Analytical FIFO sizing PR from upstream

ci/cfg/default_fifosizing_sweep.yml

@@ -0,0 +1,176 @@
+[
+    # KWS (MLP)
+    {
+        "dut": ["kws"],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # Cybersecurity (MLP)
+    {
+        "dut": ["cybsec"],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    ### BNN-PYNQ ###
+    # tfc-w1a1
+    {
+        "dut": ["bnn-pynq"],
+        "model_path": [models/bnn-pynq/tfc-w1a1_qonnx.onnx],
+        "folding_config_file": [models/bnn-pynq/tfc-w1a1_folding_config.json],
+        "specialize_layers_config_file": [models/bnn-pynq/tfc-w1a1_specialize_layers.json],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # tfc-w2a2
+    {
+        "dut": ["bnn-pynq"],
+        "model_path": [models/bnn-pynq/tfc-w2a2_qonnx.onnx],
+        "folding_config_file": [models/bnn-pynq/tfc-w2a2_folding_config.json],
+        "specialize_layers_config_file": [models/bnn-pynq/tfc-w2a2_specialize_layers.json],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # cnv-w1a1
+    {
+        "dut": ["bnn-pynq"],
+        "model_path": [models/bnn-pynq/cnv-w1a1_qonnx.onnx],
+        "folding_config_file": [models/bnn-pynq/cnv-w1a1_folding_config.json],
+        "specialize_layers_config_file": [models/bnn-pynq/cnv-w1a1_specialize_layers.json],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # cnv-w2a2
+    {
+        "dut": ["bnn-pynq"],
+        "model_path": [models/bnn-pynq/cnv-w2a2_qonnx.onnx],
+        "folding_config_file": [models/bnn-pynq/cnv-w2a2_folding_config.json],
+        "specialize_layers_config_file": [models/bnn-pynq/cnv-w2a2_specialize_layers.json],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # GTSRB (cnv-w1a1)
+    {
+        "dut": ["gtsrb"],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # VGG-10 (1D CNN) (RadioML)
+    {
+        "dut": ["vgg10"],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # MobileNetV1 (ImageNet)
+    {
+        "dut": ["mobilenetv1"],
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "synth_clk_period_ns": [10],
+    },
+
+    # # ResNet-50 (ImageNet)
+    # {
+    #     "dut": ["resnet50"],
+    #     "auto_fifo_depths": [True],
+    #     "auto_fifo_strategy": ["largefifo_rtlsim"],
+    #     "fifosim_n_inferences": [2, 4],
+    #     "generate_outputs": [["stitched_ip", "rtlsim_performance"]],
+    #     "synth_clk_period_ns": [10],
+    #     "board": ["U250"],
+    #     "enable_instrumentation": [False],
+    #     "rtlsim_batch_size": [3],
+    # },
+
+    ### NEW Transformer models (dvc-imported from finn-transformers repo):
+    # TODO: analytical FIFO sizing temporarily disabled because it is broken for these models
+    # radioml model
+    {
+        "dut": ["transformer"],
+        #"model_dir": ["models/transformer/finn-transformers/radioml"],
+        "model_path": ["models/transformer/finn-transformers/radioml/streamlined.onnx"],
+        "verify_input_npy": ["models/transformer/finn-transformers/radioml/inp.npy"],
+        "verify_expected_output_npy": ["models/transformer/finn-transformers/radioml/out.npy"],
+        "verify_steps": ["None"], # disable verification to not affect build time measurements
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "target_fps": [65536],
+    },
+
+    # vision model
+    {
+        "dut": ["transformer"],
+        #"model_dir": ["models/transformer/finn-transformers/vision"],
+        "model_path": ["models/transformer/finn-transformers/vision/streamlined.onnx"],
+        "verify_input_npy": ["models/transformer/finn-transformers/vision/inp.npy"],
+        "verify_expected_output_npy": ["models/transformer/finn-transformers/vision/out.npy"],
+        "verify_steps": ["None"], # disable verification to not affect build time measurements
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "target_fps": [1525],
+    },
+
+    # language model
+    {
+        "dut": ["transformer"],
+        #"model_dir": ["models/transformer/finn-transformers/language"],
+        "model_path": ["models/transformer/finn-transformers/language/streamlined.onnx"],
+        "verify_input_npy": ["models/transformer/finn-transformers/language/inp.npy"],
+        "verify_expected_output_npy": ["models/transformer/finn-transformers/language/out.npy"],
+        "verify_steps": ["None"], # disable verification to not affect build time measurements
+        "auto_fifo_depths": [True],
+        "auto_fifo_strategy": ["largefifo_rtlsim"],
+        "fifosim_input_throttle": [True, False],
+        "fifosim_n_inferences": [2, 4, 6, 8],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package", "estimate_reports"]],
+        "target_fps": [1024],
+    },
+]

ci/cfg/live_fifosizing.yml

@@ -1,35 +1,21 @@
 [
-    ### BNN-PYNQ ###
-    # cnv-w1a1
-    {
-        "dut": ["bnn-pynq"],
-        "model_path": [models/bnn-pynq/cnv-w1a1_qonnx.onnx],
-        "folding_config_file": [models/bnn-pynq/cnv-w1a1_folding_config.json],
-        "specialize_layers_config_file": [models/bnn-pynq/cnv-w1a1_specialize_layers.json],
-        "live_fifo_sizing": [True],
-        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "synth_clk_period_ns": [10],
-    },
-    # cnv-w1a2
+    # KWS (MLP)
     {
-        "dut": ["bnn-pynq"],
-        "model_path": [models/bnn-pynq/cnv-w1a2_qonnx.onnx],
-        "folding_config_file": [models/bnn-pynq/cnv-w1a2_folding_config.json],
-        "specialize_layers_config_file": [models/bnn-pynq/cnv-w1a2_specialize_layers.json],
+        "dut": ["kws"],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
-    # cnv-w2a2
+
+    # Cybersecurity (MLP)
     {
-        "dut": ["bnn-pynq"],
-        "model_path": [models/bnn-pynq/cnv-w2a2_qonnx.onnx],
-        "folding_config_file": [models/bnn-pynq/cnv-w2a2_folding_config.json],
-        "specialize_layers_config_file": [models/bnn-pynq/cnv-w2a2_specialize_layers.json],
+        "dut": ["cybsec"],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
+
+    ### BNN-PYNQ ###
     # tfc-w1a1
     {
         "dut": ["bnn-pynq"],
@@ -40,16 +26,6 @@
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
-    # tfc-w1a2
-    {
-        "dut": ["bnn-pynq"],
-        "model_path": [models/bnn-pynq/tfc-w1a2_qonnx.onnx],
-        "folding_config_file": [models/bnn-pynq/tfc-w1a2_folding_config.json],
-        "specialize_layers_config_file": [models/bnn-pynq/tfc-w1a2_specialize_layers.json],
-        "live_fifo_sizing": [True],
-        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "synth_clk_period_ns": [10],
-    },
     # tfc-w2a2
     {
         "dut": ["bnn-pynq"],
@@ -60,42 +36,46 @@
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
-
-    # GTSRB (cnv-w1a1)
+    # cnv-w1a1
     {
-        "dut": ["gtsrb"],
+        "dut": ["bnn-pynq"],
+        "model_path": [models/bnn-pynq/cnv-w1a1_qonnx.onnx],
+        "folding_config_file": [models/bnn-pynq/cnv-w1a1_folding_config.json],
+        "specialize_layers_config_file": [models/bnn-pynq/cnv-w1a1_specialize_layers.json],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
-
-    # KWS (MLP)
+    # cnv-w2a2
     {
-        "dut": ["kws"],
+        "dut": ["bnn-pynq"],
+        "model_path": [models/bnn-pynq/cnv-w2a2_qonnx.onnx],
+        "folding_config_file": [models/bnn-pynq/cnv-w2a2_folding_config.json],
+        "specialize_layers_config_file": [models/bnn-pynq/cnv-w2a2_specialize_layers.json],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
 
-    # Cybersecurity (MLP)
+    # GTSRB (cnv-w1a1)
     {
-        "dut": ["cybsec"],
+        "dut": ["gtsrb"],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
 
-    # MobileNetV1 (ImageNet)
+    # VGG-10 (1D CNN) (RadioML)
     {
-        "dut": ["mobilenetv1"],
+        "dut": ["vgg10"],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
     },
 
-    # VGG-10 (1D CNN) (RadioML)
+    # MobileNetV1 (ImageNet)
     {
-        "dut": ["vgg10"],
+        "dut": ["mobilenetv1"],
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
         "synth_clk_period_ns": [10],
@@ -110,51 +90,28 @@
     },
 
     # ResNet-18 (CIFAR100)
-    {
-        "dut": ["resnet18"],
-        "model_path": [models/resnet18/resnet18_w3a3_cifar100.onnx],
-        "folding_config_file": [models/resnet18/resnet18_folding_config.json],
-        "specialize_layers_config_file": [models/resnet18/resnet18_specialize_layers.json],
-        "live_fifo_sizing": [True],
-        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "synth_clk_period_ns": [10],
-    },
+    # {
+    #     "dut": ["resnet18"],
+    #     "model_path": [models/resnet18/resnet18_w3a3_cifar100.onnx],
+    #     "folding_config_file": [models/resnet18/resnet18_folding_config.json],
+    #     "specialize_layers_config_file": [models/resnet18/resnet18_specialize_layers.json],
+    #     "live_fifo_sizing": [True],
+    #     "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
+    #     "synth_clk_period_ns": [10],
+    # },
 
     ### NEW Transformer models (dvc-imported from finn-transformers repo):
-    # benchmark model ("dummy")
-    {
-        "dut": ["transformer"],
-        #"model_dir": ["models/transformer/finn-transformers/benchmark"],
-        "model_path": ["models/transformer/finn-transformers/benchmark/streamlined.onnx"],
-        "verify_input_npy": ["models/transformer/finn-transformers/benchmark/inp.npy"],
-        "verify_expected_output_npy": ["models/transformer/finn-transformers/benchmark/out.npy"],
-        "live_fifo_sizing": [True],
-        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "target_fps": [1000],
-    },
-
-    # language model
-    {
-        "dut": ["transformer"],
-        #"model_dir": ["models/transformer/finn-transformers/language"],
-        "model_path": ["models/transformer/finn-transformers/language/streamlined.onnx"],
-        "verify_input_npy": ["models/transformer/finn-transformers/language/inp.npy"],
-        "verify_expected_output_npy": ["models/transformer/finn-transformers/language/out.npy"],
-        "live_fifo_sizing": [True],
-        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "target_fps": [1000],
-    },
-
     # radioml model
     {
         "dut": ["transformer"],
         #"model_dir": ["models/transformer/finn-transformers/radioml"],
         "model_path": ["models/transformer/finn-transformers/radioml/streamlined.onnx"],
         "verify_input_npy": ["models/transformer/finn-transformers/radioml/inp.npy"],
         "verify_expected_output_npy": ["models/transformer/finn-transformers/radioml/out.npy"],
+        "verify_steps": ["None"], # disable verification to not affect build time measurements
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "target_fps": [1000],
+        "target_fps": [65536],
     },
 
     # vision model
@@ -164,9 +121,23 @@
         "model_path": ["models/transformer/finn-transformers/vision/streamlined.onnx"],
         "verify_input_npy": ["models/transformer/finn-transformers/vision/inp.npy"],
         "verify_expected_output_npy": ["models/transformer/finn-transformers/vision/out.npy"],
+        "verify_steps": ["None"], # disable verification to not affect build time measurements
+        "live_fifo_sizing": [True],
+        "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
+        "target_fps": [1525],
+    },
+
+    # language model
+    {
+        "dut": ["transformer"],
+        #"model_dir": ["models/transformer/finn-transformers/language"],
+        "model_path": ["models/transformer/finn-transformers/language/streamlined.onnx"],
+        "verify_input_npy": ["models/transformer/finn-transformers/language/inp.npy"],
+        "verify_expected_output_npy": ["models/transformer/finn-transformers/language/out.npy"],
+        "verify_steps": ["None"], # disable verification to not affect build time measurements
         "live_fifo_sizing": [True],
         "generate_outputs": [["bitfile", "pynq_driver", "deployment_package"]],
-        "target_fps": [1000],
+        "target_fps": [1024],
     },
 
     # Synthetic non-linear models