Fix workloads/ dir + Fix CI

This commit is contained in:
Abraham Gonzalez 2022-05-07 00:15:35 +00:00
parent 319d05a9e3
commit 7ad48750d9
27 changed files with 212 additions and 121 deletions

View File

@ -42,13 +42,13 @@ def run_linux_poweroff():
if rc != 0:
# need to confirm that instance is off
print(f"Workload {workload} failed. Terminating runfarm.")
run(f"firesim terminaterunfarm -q -c {workload}")
run(f"firesim terminaterunfarm -q -c {workload}-runtime.yaml -n {workload}-runfarm.yaml")
sys.exit(rc)
else:
print(f"Workload {workload} successful.")
run_w_timeout(f"{manager_fsim_dir}/deploy/workloads/linux-poweroff-all-no-nic.yaml", "30m")
run_w_timeout(f"{manager_fsim_dir}/deploy/workloads/linux-poweroff-nic.yaml", "30m")
run_w_timeout(f"{manager_fsim_dir}/deploy/workloads/linux-poweroff-all-no-nic", "30m")
run_w_timeout(f"{manager_fsim_dir}/deploy/workloads/linux-poweroff-nic", "30m")
if __name__ == "__main__":
set_fabric_firesim_pem()

View File

@ -20,7 +20,7 @@ if [[ $local_diff_rc = 0 && $remote_diff_rc = 0 ]]; then
fi
# Run linux-poweroff on unnetworked targets
./workloads/run-workload.sh workloads/linux-poweroff-all-no-nic.yaml --withlaunch
./workloads/run-workload.sh workloads/linux-poweroff-all-no-nic --withlaunch
# Run linux-poweroff on the networked target running on a f1.16xlarge
./workloads/run-workload.sh workloads/linux-poweroff-nic.yaml --withlaunch
./workloads/run-workload.sh workloads/linux-poweroff-nic --withlaunch

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: bwtest-mainrunfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 2
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 1

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: bwtest-mainrunfarm
f1_16xlarges: 2
m4_16xlarges: 1
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: example_16config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: ccbench-cache-sweep
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 0
- f1.4xlarge: 0
- f1.2xlarge: 1
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: ccbench-cache-sweep
f1_16xlarges: 0
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 1
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: no_net_config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: gapbs-runfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 0
- f1.4xlarge: 0
- f1.2xlarge: 6
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: gapbs-runfarm
f1_16xlarges: 0
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 6
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: no_net_config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: linuxpoweroffallnonictargets
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 0
- f1.4xlarge: 0
- f1.2xlarge: 2
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: linuxpoweroffallnonictargets
f1_16xlarges: 0
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 2
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: all_no_net_targets_config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: linuxpoweroffnic
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 1
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: linuxpoweroffnic
f1_16xlarges: 1
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: example_8config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: memcached-mainrunfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 3
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: memcached-mainrunfarm
f1_16xlarges: 3
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: triple_example_8config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: pinglatency-mainrunfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 1
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: pinglatency-mainrunfarm
f1_16xlarges: 1
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: example_8config

View File

@ -11,9 +11,11 @@ terminate=1
function usage
{
echo "usage: run-workload.sh <workload.yaml> [-H | -h | --help] [--noterminate] [--withlaunch]"
echo " workload.yaml: the firesim-relative path to the workload you'd like to run"
echo " e.g. workloads/gapbs.yaml"
echo "usage: run-workload.sh <workload> [-H | -h | --help] [--noterminate] [--withlaunch]"
echo " workload: the firesim-relative path to the basename of yaml files you'd like to run."
echo " in this case, the path will be appended with -runtime.yaml for the runtime.yaml and -runfarm.yaml for the runfarm.yaml files"
echo " e.x. workloads/gapbs gives"
echo " workloads/gapbs-runtime.yaml and workloads/gapbs-runfarm.yaml"
echo " --withlaunch: (Optional) will spin up a runfarm based on the yaml"
echo " --noterminate: (Optional) will not forcibly terminate runfarm instances after runworkload"
}
@ -23,7 +25,7 @@ if [ $# -eq 0 -o "$1" == "--help" -o "$1" == "-h" -o "$1" == "-H" ]; then
exit 3
fi
yaml=$1
yamlbasename=$1
shift
while test $# -gt 0
@ -51,17 +53,22 @@ do
shift
done
runtimeyaml=${yamlbasename}-runtime.yaml
runfarmyaml=${yamlbasename}-runfarm.yaml
trap "exit" INT
set -e
set -o pipefail
managerargs="-c $runtimeyaml -n $runfarmyaml"
if [ "$withlaunch" -ne "0" ]; then
firesim -c $yaml launchrunfarm
firesim $managerargs launchrunfarm
fi
firesim -c $yaml infrasetup
firesim -c $yaml runworkload
firesim $managerargs infrasetup
firesim $managerargs runworkload
if [ "$terminate" -eq "1" ]; then
firesim -c $yaml terminaterunfarm --forceterminate
firesim $managerargs terminaterunfarm --forceterminate
fi

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: simperftestlatency-mainrunfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 1
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: simperftestlatency-mainrunfarm
f1_16xlarges: 1
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: example_8config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: simperftestscale-mainrunfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 32
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 5

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: simperftestscale-mainrunfarm
f1_16xlarges: 32
m4_16xlarges: 5
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: example_256config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: simperftestscalesupernode-mainrunfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 32
- f1.4xlarge: 0
- f1.2xlarge: 0
- m4.16xlarge: 5

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: simperftestscalesupernode-mainrunfarm
f1_16xlarges: 32
m4_16xlarges: 5
f1_4xlarges: 0
f1_2xlarges: 0
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: supernode_example-1024config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: intrate-runfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 0
- f1.4xlarge: 0
- f1.2xlarge: 10
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: intrate-runfarm
f1_16xlarges: 0
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 10
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: no_net_config

View File

@ -0,0 +1,15 @@
aws_ec2_f1_run_farm:
run_farm_type: AWSEC2F1
args:
run_farm_tag: intspeed-runfarm
always_expand_runfarm: true
launch_instances_timeout_minutes: 60
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
default_simulation_dir: /home/centos
run_farm_hosts:
- f1.16xlarge: 0
- f1.4xlarge: 0
- f1.2xlarge: 11
- m4.16xlarge: 0

View File

@ -1,12 +1,4 @@
run_farm:
run_farm_tag: intspeed-runfarm
f1_16xlarges: 0
m4_16xlarges: 0
f1_4xlarges: 0
f1_2xlarges: 11
run_instance_market: ondemand
spot_interruption_behavior: terminate
spot_max_price: ondemand
run_farm: aws_ec2_f1_run_farm
target_config:
topology: no_net_config