Vivado 2021.1 / AMI 1.11 (#837)

* Bump to AMI 1.11 / Vivado 2021.1

* pip2 removed on new AMIs; install it explicitly

* Knock BOOM AGFI frequency down

* Add a script to run linux boot on some default targets

* [docs] Tell users to use 1.11.0 AMI

Co-authored-by: Cloud User <centos@ip-192-168-3-37.ec2.internal>
This commit is contained in:
David Biancolin 2021-10-06 10:12:48 -07:00 committed by GitHub
parent 21955b05b3
commit 8b77989a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 6 deletions

View File

@ -12,7 +12,9 @@ from fabric.api import local, hide, settings
rootLogger = logging.getLogger() rootLogger = logging.getLogger()
# this needs to be updated whenever the FPGA Dev AMI changes # this needs to be updated whenever the FPGA Dev AMI changes
f1_ami_name = "FPGA Developer AMI - 1.10.0-40257ab5-6688-4c95-97d1-e251a40fd1fc" # You can find this by going to the AMI tab under EC2 and searching for public images:
# https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#Images:visibility=public-images;search=FPGA%20Developer;sort=name
f1_ami_name = "FPGA Developer AMI - 1.11.0-40257ab5-6688-4c95-97d1-e251a40fd1fc"
def aws_resource_names(): def aws_resource_names():
""" Get names for various aws resources the manager relies on. For example: """ Get names for various aws resources the manager relies on. For example:

26
deploy/regression.sh Executable file
View File

@ -0,0 +1,26 @@
#! /usr/bin/env bash
# If regenerating AGFIS, at minimum run this script to ensure the critical
# designs can boot linux successfully and power off.
# NB: The onus is still un the invoker to check the uartlogs.
echo "Diffing config_hwdb.ini against sample_config_hwdb.ini:"
diff config_hwdb.ini sample-backup-configs/sample_config_hwdb.ini
local_diff_rc=$?
echo "Diffing sample_config_hwdb.ini against origin/dev:"
git diff --exit-code origin/dev -- sample-backup-configs/sample_config_hwdb.ini
remote_diff_rc=$?
if [[ $local_diff_rc = 0 && $remote_diff_rc = 0 ]]; then
echo "Local HWDB does not differ from origin/dev."
echo "Did you update config_hwdb.ini with new AGFIs?"
exit 1
fi
# Run linux-poweroff on unnetworked targets
./workloads/run-workload.sh workloads/linux-poweroff-all-no-nic.ini --withlaunch
# Run linux-poweroff on the networked target running on a f1.16xlarge
./workloads/run-workload.sh workloads/linux-poweroff-nic.ini --withlaunch

View File

@ -41,7 +41,7 @@ deploytriplet=None
[firesim-boom-singlecore-no-nic-l2-llc4mb-ddr3] [firesim-boom-singlecore-no-nic-l2-llc4mb-ddr3]
DESIGN=FireSim DESIGN=FireSim
TARGET_CONFIG=DDR3FRFCFSLLC4MB_WithDefaultFireSimBridges_WithFireSimTestChipConfigTweaks_chipyard.LargeBoomConfig TARGET_CONFIG=DDR3FRFCFSLLC4MB_WithDefaultFireSimBridges_WithFireSimTestChipConfigTweaks_chipyard.LargeBoomConfig
PLATFORM_CONFIG=WithAutoILA_F80MHz_BaseF1Config PLATFORM_CONFIG=WithAutoILA_F75MHz_BaseF1Config
instancetype=z1d.2xlarge instancetype=z1d.2xlarge
deploytriplet=None deploytriplet=None

View File

@ -25,7 +25,7 @@ To launch a manager instance, follow these steps:
data is preserved when you stop/start the instance, and your data is data is preserved when you stop/start the instance, and your data is
not lost when pricing spikes on the spot market. not lost when pricing spikes on the spot market.
2. When prompted to select an AMI, search in the ``Community AMIs`` tab for 2. When prompted to select an AMI, search in the ``Community AMIs`` tab for
``FPGA Developer AMI - 1.10.0`` and select the AMI that appears (there ``FPGA Developer AMI - 1.11.0`` and select the AMI that appears (there
should be only one). **DO NOT USE ANY OTHER VERSION.** should be only one). **DO NOT USE ANY OTHER VERSION.**
3. When prompted to choose an instance type, select the instance type of 3. When prompted to choose an instance type, select the instance type of
your choosing. A good choice is a ``c5.4xlarge``. your choosing. A good choice is a ``c5.4xlarge``.

@ -1 +1 @@
Subproject commit 92354df2bded5447d0425db10f9a0a33a8ac45c9 Subproject commit 0a4b5b6b3a82c00f25a6df4423d90d1a0a673f6b

View File

@ -48,9 +48,11 @@ sudo yum -y install graphviz python-devel
# used for CI # used for CI
sudo yum -y install expect sudo yum -y install expect
# these need to match what's in deploy/requirements.txt # pip2 no longer installed on FPGA developer AMIs
# last working pip version before deprecation sudo yum -y install python-pip
# In the event it is (as on an older AMI), upgrade it just in case
sudo pip2 install --upgrade pip==20.3.4 sudo pip2 install --upgrade pip==20.3.4
# these need to match what's in deploy/requirements.txt
sudo pip2 install fabric==1.14.0 sudo pip2 install fabric==1.14.0
sudo pip2 install boto3==1.6.2 sudo pip2 install boto3==1.6.2
sudo pip2 install colorama==0.3.7 sudo pip2 install colorama==0.3.7