From afe5e05f7c7f62343ac1afd578c37740bea88bc6 Mon Sep 17 00:00:00 2001 From: william-lyh Date: Mon, 31 Jul 2023 16:12:39 -0700 Subject: [PATCH 1/4] Bump the garnet-submodule to be compatible with Vivado 2023.1 --- platforms/xilinx_vcu118/garnet-firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/xilinx_vcu118/garnet-firesim b/platforms/xilinx_vcu118/garnet-firesim index 8bf28f59..4e62dfa8 160000 --- a/platforms/xilinx_vcu118/garnet-firesim +++ b/platforms/xilinx_vcu118/garnet-firesim @@ -1 +1 @@ -Subproject commit 8bf28f59b0ef72fd2bc3bce5844ab766fc6c1ddb +Subproject commit 4e62dfa8016402c93f03dd2e0e54270f1c85cfeb From 1e04fde40b8d8ae003bbf50513443b45de9619e6 Mon Sep 17 00:00:00 2001 From: william-lyh Date: Mon, 31 Jul 2023 16:45:00 -0700 Subject: [PATCH 2/4] Change Doc Vivado version for VCU118 flow to 2023.1 --- .../Building-a-FireSim-Bitstream/Xilinx-VCU118.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Getting-Started-Guides/On-Premises-FPGA-Getting-Started/Building-a-FireSim-Bitstream/Xilinx-VCU118.rst b/docs/Getting-Started-Guides/On-Premises-FPGA-Getting-Started/Building-a-FireSim-Bitstream/Xilinx-VCU118.rst index 23f64376..5f30d5a1 100644 --- a/docs/Getting-Started-Guides/On-Premises-FPGA-Getting-Started/Building-a-FireSim-Bitstream/Xilinx-VCU118.rst +++ b/docs/Getting-Started-Guides/On-Premises-FPGA-Getting-Started/Building-a-FireSim-Bitstream/Xilinx-VCU118.rst @@ -3,9 +3,9 @@ .. |hwdb_entry_name_non_code| replace:: xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic .. |builder_name| replace:: Xilinx Vivado .. |bit_builder_path| replace:: ``bit-builder-recipes/xilinx_vcu118.yaml`` -.. |vivado_with_version| replace:: Vivado 2019.1 -.. |vivado_version_number_only| replace:: 2019.1 -.. |vivado_default_install_path| replace:: ``/tools/Xilinx/Vivado/2019.1`` +.. |vivado_with_version| replace:: Vivado 2023.1 +.. |vivado_version_number_only| replace:: 2023.1 +.. |vivado_default_install_path| replace:: ``/tools/Xilinx/Vivado/2023.1`` .. |board_package_install| replace:: No special board support package is required for the VCU118. Move on to the next step. Building Your Own Hardware Designs From b22354fd7049cf49f1c57351991452bd111dd023 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 25 Aug 2023 10:02:53 -0700 Subject: [PATCH 3/4] Bump 2 CI machines to 2023.1 --- .github/scripts/run-local-buildbitstreams.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/run-local-buildbitstreams.py b/.github/scripts/run-local-buildbitstreams.py index e5347524..00a4fc2d 100755 --- a/.github/scripts/run-local-buildbitstreams.py +++ b/.github/scripts/run-local-buildbitstreams.py @@ -229,8 +229,8 @@ def run_local_buildbitstreams(): ("buildbot3@a17", "vitis:2021.1", True, "/scratch/buildbot3/FIRESIM_BUILD_DIR", 0), ("buildbot4@a17", "vitis:2021.1", True, "/scratch/buildbot4/FIRESIM_BUILD_DIR", 0), ( "firesim1", "vitis:2021.1", False, "", 1), - ( "jktgz", "vivado:2019.1", False, "", 3), - ( "jktqos", "vivado:2019.1", False, "", 3), + ( "jktgz", "vivado:2023.1", False, "", 3), + ( "jktqos", "vivado:2023.1", False, "", 3), ] def do_builds(batch_hwdbs): @@ -287,7 +287,7 @@ def run_local_buildbitstreams(): ("alveo_u200_firesim_rocket_singlecore_no_nic", "xilinx_alveo_u200", "vitis:2021.1"), ("alveo_u280_firesim_rocket_singlecore_no_nic", "xilinx_alveo_u280", "vitis:2021.1"), - ("xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic", "xilinx_vcu118", "vivado:2019.1"), + ("xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic", "xilinx_vcu118", "vivado:2023.1"), ] do_builds(batch_hwdbs_in) From 7b4c5888212333175a75481facf85d504fc72428 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 25 Aug 2023 13:43:45 -0700 Subject: [PATCH 4/4] Update local bitstream(s) [ci skip] --- .../sample-backup-configs/sample_config_hwdb.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/sample-backup-configs/sample_config_hwdb.yaml b/deploy/sample-backup-configs/sample_config_hwdb.yaml index d6d7dd4d..b6093688 100644 --- a/deploy/sample-backup-configs/sample_config_hwdb.yaml +++ b/deploy/sample-backup-configs/sample_config_hwdb.yaml @@ -56,7 +56,7 @@ firesim_supernode_rocket_singlecore_nic_l2_lbp: deploy_quintuplet_override: null custom_runtime_config: null vitis_firesim_rocket_singlecore_no_nic: - bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/9697ea5f5f297e386c5c6f60ba5a71ee3020f93f/vitis/vitis_firesim_rocket_singlecore_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/f17bff0afb96d278c3cd199a72d9317b1bebbb2a/vitis/vitis_firesim_rocket_singlecore_no_nic.tar.gz deploy_quintuplet_override: null custom_runtime_config: null vitis_firesim_gemmini_rocket_singlecore_no_nic: @@ -64,26 +64,26 @@ vitis_firesim_gemmini_rocket_singlecore_no_nic: deploy_quintuplet_override: null custom_runtime_config: null alveo_u250_firesim_rocket_singlecore_no_nic: - bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/ac2cd0c123e1755a666d48709021d29abb440ab6/xilinx_alveo_u250/alveo_u250_firesim_rocket_singlecore_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/9543b082437e3ec2c3ecc863da4e06a19597e5e6/xilinx_alveo_u250/alveo_u250_firesim_rocket_singlecore_no_nic.tar.gz deploy_quintuplet_override: null custom_runtime_config: null alveo_u250_firesim_gemmini_rocket_singlecore_no_nic: - bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/ebeffff3cd54225fbbcac36a8f2ced5645f2079e/xilinx_alveo_u250/alveo_u250_firesim_gemmini_rocket_singlecore_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/933a8726645fd7241f019463df86f3d117a7d714/xilinx_alveo_u250/alveo_u250_firesim_gemmini_rocket_singlecore_no_nic.tar.gz deploy_quintuplet_override: null custom_runtime_config: null alveo_u200_firesim_rocket_singlecore_no_nic: - bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/9fa5d271407bd7057885c02f19f510842f3f3c95/xilinx_alveo_u200/alveo_u200_firesim_rocket_singlecore_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/0d91a839113ab048abfed7e79fe2b0d1097f2807/xilinx_alveo_u200/alveo_u200_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/808bce6788100b700730bd5b39b86e5c004cf43d/xilinx_alveo_u280/alveo_u280_firesim_rocket_singlecore_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/a8b9ffaeb4d243292c04eb13857a7daa8ac6d897/xilinx_alveo_u280/alveo_u280_firesim_rocket_singlecore_no_nic.tar.gz deploy_quintuplet_override: null custom_runtime_config: null xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic: - bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/c3adc1471a61cb1415a0c800271baad5bf753d02/xilinx_vcu118/xilinx_vcu118_firesim_rocket_singlecore_4GB_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/48934d5a7b6b5869b446378656cf61824961471e/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/7fa19e457374d98cc7abf7a196b93db23db2dc52/rhsresearch_nitefury_ii/nitefury_firesim_rocket_singlecore_no_nic.tar.gz + bitstream_tar: https://raw.githubusercontent.com/firesim/firesim-public-bitstreams/f228aa51f95c3a7022444516051fd2fe346cc48d/rhsresearch_nitefury_ii/nitefury_firesim_rocket_singlecore_no_nic.tar.gz deploy_quintuplet_override: null custom_runtime_config: null \ No newline at end of file