Merge remote-tracking branch 'origin/main' into nitefury_ii_more

.github/scripts/run-local-buildbitstreams.py

@@ -198,7 +198,7 @@ def run_local_buildbitstreams():
             # could potentially use knight/ferry in the future (currently unused since they are currently overloaded)
             hosts = {
                 ("localhost", "vitis:2022.1"),
-                ("jktgz", "vitis:2022.1"),
+                ("jktgz", "vivado:2021.1"),
                 ("jktqos", "vivado:2021.1"),
                 ("firesim1", "vivado:2019.1"),
             }
@@ -239,17 +239,10 @@ def run_local_buildbitstreams():
             # same order as in config_build.yaml
             # hwdb_entry_name, platform_name, buildtool:version
             batch_hwdbs_in = [
-                ("vitis_firesim_rocket_singlecore_no_nic", "vitis", "vitis:2022.1"),
-                ("vitis_firesim_gemmini_rocket_singlecore_no_nic", "vitis", "vitis:2022.1"),
-                ("alveo_u250_firesim_rocket_singlecore_no_nic", "xilinx_alveo_u250", "vivado:2021.1"),
-                ("xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic", "xilinx_vcu118", "vivado:2019.1"),
-            ]
-
-            do_builds(batch_hwdbs_in)
-
-            batch_hwdbs_in = [
-                ("alveo_u280_firesim_rocket_singlecore_no_nic", "xilinx_alveo_u280", "vivado:2021.1"),
                 ("nitefury_firesim_rocket_singlecore_no_nic", "rhsresearch_nitefury_ii", "vitis:2022.1"),
+                ("alveo_u250_firesim_rocket_singlecore_no_nic", "xilinx_alveo_u250", "vivado:2021.1"),
+                ("alveo_u280_firesim_rocket_singlecore_no_nic", "xilinx_alveo_u280", "vivado:2021.1"),
+                ("xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic", "xilinx_vcu118", "vivado:2019.1"),
             ]
 
             do_builds(batch_hwdbs_in)

deploy/buildtools/buildconfigfile.py

@@ -85,7 +85,7 @@ class BuildConfigFile:
 
         self.hwdb = RuntimeHWDB(args.hwdbconfigfile)
 
-        self.builds_list = list(build_recipes.values())
+        self.builds_list = list(map(lambda x: build_recipes[x], builds_to_run_list))
         self.build_ip_set = set()
 
         # retrieve the build host section

deploy/sample-backup-configs/sample_config_build.yaml

@@ -43,6 +43,9 @@ builds_to_run:
     # - vitis_firesim_rocket_singlecore_no_nic
     # - vitis_firesim_gemmini_rocket_singlecore_no_nic
 
+    # Config for RHSResearch Nitefury II
+    # - nitefury_firesim_rocket_singlecore_no_nic
+
     # Configs for Xilinx Alveo U250/U280
     # - alveo_u250_firesim_rocket_singlecore_no_nic
     # - alveo_u280_firesim_rocket_singlecore_no_nic
@@ -50,9 +53,6 @@ builds_to_run:
     # Config for Xilinx VCU118
     # - xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic
 
-    # Config for RHSResearch Nitefury II
-    # - nitefury_firesim_rocket_singlecore_no_nic
-
 agfis_to_share:
     - firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
     - firesim_rocket_quadcore_no_nic_l2_llc4mb_ddr3

deploy/sample-backup-configs/sample_config_build_recipes.yaml

@@ -326,7 +326,7 @@ xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic:
     PLATFORM_CONFIG: BaseXilinxVCU118Config
     deploy_quintuplet: null
     platform_config_args:
-        fpga_frequency: 140
+        fpga_frequency: 90
         build_strategy: TIMING
     post_build_hook: null
     metasim_customruntimeconfig: null

deploy/sample-backup-configs/sample_config_hwdb.yaml

@@ -65,20 +65,24 @@ vitis_firesim_gemmini_rocket_singlecore_no_nic:
     custom_runtime_config: null
 # DOCREF START: Xilinx Alveo HWDB Entries
 alveo_u250_firesim_rocket_singlecore_no_nic:
-    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/0ffab3f67d0dcfc23abe20d080d12d722dab2dbd/xilinx_alveo_u250/alveo_u250_firesim_rocket_singlecore_no_nic.tar.gz
+    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/d7eacf838e04fd3ec320ccc126491092f1c0e09c/xilinx_alveo_u250/alveo_u250_firesim_rocket_singlecore_no_nic.tar.gz
     deploy_quintuplet_override: null
     custom_runtime_config: null
 alveo_u280_firesim_rocket_singlecore_no_nic:
-    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/186993f5867a47d1f239054a400cc41f88d8a157/xilinx_alveo_u280/alveo_u280_firesim_rocket_singlecore_no_nic.tar.gz
+    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/038e1223eff0c9681a602bccb661bcecc7ca3640/xilinx_alveo_u280/alveo_u280_firesim_rocket_singlecore_no_nic.tar.gz
     deploy_quintuplet_override: null
     custom_runtime_config: null
 # DOCREF END: Xilinx Alveo HWDB Entries
 xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic:
-    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/37873353037bdfe7498aee850a48c5f9703ff788/xilinx_vcu118/xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic.tar.gz
+    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/2143daca842608f730f67a9562a8452c0fd22c54/xilinx_vcu118/xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic.tar.gz
     deploy_quintuplet_override: null
     custom_runtime_config: null
 nitefury_firesim_rocket_singlecore_no_nic:
-    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/8b47bfd18564ab7802422c64e2ca4d9f51bccd05/rhsresearch_nitefury_ii/nitefury_firesim_rocket_singlecore_no_nic.tar.gz
+    bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/90454641f381cf30969fd0bc1f32d3a89b2f3802/rhsresearch_nitefury_ii/nitefury_firesim_rocket_singlecore_no_nic.tar.gz
     deploy_quintuplet_override: null
     custom_runtime_config: null
 
+
+
+
+