Merge pull request #98 from Xilinx/feature/update_finn

Update all build flow to have specified specialize layers config json
Xilinx · Jun 26, 2024 · b4854da · b4854da
2 parents dcdf18b + ef9bc0f
commit b4854da
Show file tree

Hide file tree

Showing 34 changed files with 10,857 additions and 2,121 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,8 @@ build/finn
 *.link_summary
 *.onnx
 *.pyc
+*.npz
+*.npy
 output_*/
 release/
 *.egg-info
diff --git a/build/bnn-pynq/build.py b/build/bnn-pynq/build.py
@@ -89,6 +89,8 @@ def platform_to_shell(platform):
             generate_outputs=[build_cfg.DataflowOutputType.BITFILE],
             save_intermediate_models=True,
             default_swg_exception=True,
+            specialize_layers_config_file="specialize_layers_config/%s_specialize_layers.json"
+            % model_name,
         )
         model_file = "models/%s.onnx" % model_name
         # launch FINN compiler to build

diff --git a/build/bnn-pynq/specialize_layers_config/cnv-w1a1_specialize_layers.json b/build/bnn-pynq/specialize_layers_config/cnv-w1a1_specialize_layers.json
@@ -0,0 +1,60 @@
+{
+  "Defaults": {},
+  "Thresholding_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "ConvolutionInputGenerator_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_0": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_1": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_1": {
+    "preferred_impl_style": "hls"
+  },
+  "StreamingMaxPool_0": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_2": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_2": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_3": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_3": {
+    "preferred_impl_style": "hls"
+  },
+  "StreamingMaxPool_1": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_4": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_4": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_5": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_5": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_6": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_7": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_8": {
+    "preferred_impl_style": "hls"
+  },
+  "LabelSelect_0": {
+    "preferred_impl_style": "hls"
+  }
+}
diff --git a/build/bnn-pynq/specialize_layers_config/cnv-w1a2_specialize_layers.json b/build/bnn-pynq/specialize_layers_config/cnv-w1a2_specialize_layers.json
@@ -0,0 +1,60 @@
+{
+  "Defaults": {},
+  "Thresholding_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "ConvolutionInputGenerator_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_0": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_1": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_1": {
+    "preferred_impl_style": "hls"
+  },
+  "StreamingMaxPool_0": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_2": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_2": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_3": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_3": {
+    "preferred_impl_style": "hls"
+  },
+  "StreamingMaxPool_1": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_4": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_4": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_5": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_5": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_6": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_7": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_8": {
+    "preferred_impl_style": "hls"
+  },
+  "LabelSelect_0": {
+    "preferred_impl_style": "hls"
+  }
+}
diff --git a/build/bnn-pynq/specialize_layers_config/cnv-w2a2_specialize_layers.json b/build/bnn-pynq/specialize_layers_config/cnv-w2a2_specialize_layers.json
@@ -0,0 +1,60 @@
+{
+  "Defaults": {},
+  "Thresholding_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "ConvolutionInputGenerator_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_0": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_1": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_1": {
+    "preferred_impl_style": "hls"
+  },
+  "StreamingMaxPool_0": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_2": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_2": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_3": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_3": {
+    "preferred_impl_style": "hls"
+  },
+  "StreamingMaxPool_1": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_4": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_4": {
+    "preferred_impl_style": "hls"
+  },
+  "ConvolutionInputGenerator_5": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_5": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_6": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_7": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_8": {
+    "preferred_impl_style": "hls"
+  },
+  "LabelSelect_0": {
+    "preferred_impl_style": "hls"
+  }
+}
diff --git a/build/bnn-pynq/specialize_layers_config/tfc-w1a1_specialize_layers.json b/build/bnn-pynq/specialize_layers_config/tfc-w1a1_specialize_layers.json
@@ -0,0 +1,21 @@
+{
+  "Defaults": {},
+  "Thresholding_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_0": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_1": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_2": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_3": {
+    "preferred_impl_style": "hls"
+  },
+  "LabelSelect_0": {
+    "preferred_impl_style": "hls"
+  }
+}
diff --git a/build/bnn-pynq/specialize_layers_config/tfc-w1a2_specialize_layers.json b/build/bnn-pynq/specialize_layers_config/tfc-w1a2_specialize_layers.json
@@ -0,0 +1,21 @@
+{
+  "Defaults": {},
+  "Thresholding_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_0": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_1": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_2": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_3": {
+    "preferred_impl_style": "hls"
+  },
+  "LabelSelect_0": {
+    "preferred_impl_style": "hls"
+  }
+}
diff --git a/build/bnn-pynq/specialize_layers_config/tfc-w2a2_specialize_layers.json b/build/bnn-pynq/specialize_layers_config/tfc-w2a2_specialize_layers.json
@@ -0,0 +1,21 @@
+{
+  "Defaults": {},
+  "Thresholding_0": {
+    "preferred_impl_style": "rtl"
+  },
+  "MVAU_0": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_1": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_2": {
+    "preferred_impl_style": "hls"
+  },
+  "MVAU_3": {
+    "preferred_impl_style": "hls"
+  },
+  "LabelSelect_0": {
+    "preferred_impl_style": "hls"
+  }
+}
diff --git a/build/get-finn.sh b/build/get-finn.sh
@@ -31,7 +31,7 @@
 # URL for git repo to be cloned
 REPO_URL=https://github.com/Xilinx/finn
 # commit hash for repo
-REPO_COMMIT=39fb8859fec0e47276ffadcafe43092d1b10af7e
+REPO_COMMIT=9cd8bab4d5ebd6895716fad41753256542cc314f
 # directory (under the same folder as this script) to clone to
 REPO_DIR=finn
 

diff --git a/build/gtsrb/build.py b/build/gtsrb/build.py
@@ -96,7 +96,7 @@ def platform_to_shell(platform):
             synth_clk_period_ns=10.0,
             board=platform_name,
             steps=custom_build_steps,
-            folding_config_file="folding_config/cnv_gtsrb_folding_config.json",
+            folding_config_file="folding_config/gtsrb_folding_config.json",
             shell_flow_type=shell_flow_type,
             vitis_platform=vitis_platform,
             generate_outputs=[
@@ -107,7 +107,7 @@ def platform_to_shell(platform):
                 build_cfg.DataflowOutputType.DEPLOYMENT_PACKAGE,
                 build_cfg.DataflowOutputType.PYNQ_DRIVER,
             ],
-            save_intermediate_models=True,
+            specialize_layers_config_file="specialize_layers_config/gtsrb_specialize_layers.json",
         )
         model_file = "models/%s.onnx" % model_name
         # launch FINN compiler to build

diff --git a/...ding_config/cnv_gtsrb_folding_config.json → .../folding_config/gtsrb_folding_config.json b/...ding_config/cnv_gtsrb_folding_config.json → .../folding_config/gtsrb_folding_config.json
@@ -10,7 +10,8 @@
     "MVAU_hls_0": {
       "PE": 16,
       "SIMD": 3,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "ConvolutionInputGenerator_rtl_1": {
       "SIMD": 32,
@@ -19,7 +20,8 @@
     "MVAU_hls_1": {
       "PE": 32,
       "SIMD": 32,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "ConvolutionInputGenerator_rtl_2": {
       "SIMD": 32,
@@ -28,7 +30,8 @@
     "MVAU_hls_2": {
       "PE": 16,
       "SIMD": 32,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "ConvolutionInputGenerator_rtl_3": {
       "SIMD": 32,
@@ -37,7 +40,8 @@
     "MVAU_hls_3": {
       "PE": 16,
       "SIMD": 32,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "ConvolutionInputGenerator_rtl_4": {
       "SIMD": 32,
@@ -46,7 +50,8 @@
     "MVAU_hls_4": {
       "PE": 4,
       "SIMD": 32,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "ConvolutionInputGenerator_rtl_5": {
       "SIMD": 32,
@@ -55,22 +60,26 @@
     "MVAU_hls_5": {
       "PE": 1,
       "SIMD": 32,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "MVAU_hls_6": {
       "PE": 1,
       "SIMD": 4,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "MVAU_hls_7": {
       "PE": 1,
       "SIMD": 8,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "MVAU_hls_8": {
       "PE": 4,
       "SIMD": 1,
-      "ram_style": "auto"
+      "ram_style": "auto",
+      "resType": "lut"
     },
     "LabelSelect_hls_0": {
       "PE": 1

diff --git a/build/gtsrb/models/download-model.sh b/build/gtsrb/models/download-model.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-wget https://github.com/fastmachinelearning/qonnx_model_zoo/raw/feature/gtsrb_cnv/models/GTSRB/Brevitas_CNV1W1A/cnv_1w1a_gtsrb.onnx
+wget https://github.com/fastmachinelearning/qonnx_model_zoo/raw/main/models/GTSRB/Brevitas_CNV1W1A/cnv_1w1a_gtsrb.onnx