ci/test fixes
This commit is contained in:
parent
c7fd3531b0
commit
9f51cc129e
|
@ -54,10 +54,9 @@ def run_linux_poweroff_externally_provisioned():
|
|||
|
||||
start_lines = [f" base_recipe: run-farm-recipes/externally_provisioned.yaml\n"]
|
||||
start_lines += [" recipe_arg_overrides:\n"]
|
||||
start_lines += [" default_num_fpgas: 1\n"]
|
||||
start_lines += [" run_farm_hosts:\n"]
|
||||
start_lines += [" run_farm_hosts_to_use:\n"]
|
||||
for ip in instance_ips:
|
||||
start_lines += [f""" - "centos@{ip}"\n"""]
|
||||
start_lines += [f""" - "centos@{ip}: one_fpga_spec"\n"""]
|
||||
|
||||
file_line_swap(
|
||||
workload_full,
|
||||
|
|
|
@ -56,3 +56,9 @@ args:
|
|||
num_fpgas: 0
|
||||
num_metasims: 0
|
||||
use_for_switch_only: true
|
||||
|
||||
- one_fpga_spec:
|
||||
num_fpgas: 1
|
||||
num_metasims: 0
|
||||
use_for_switch_only: false
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ class RunFarm(metaclass=abc.ABCMeta):
|
|||
def __init__(self, args: Dict[str, Any], metasimulation_enabled: bool) -> None:
|
||||
self.args = args
|
||||
self.metasimulation_enabled = metasimulation_enabled
|
||||
self.default_simulation_dir = self.args.get("default_simulation_dir")
|
||||
self.default_simulation_dir = self.args.get("default_simulation_dir", "/home/centos")
|
||||
self.SIM_HOST_HANDLE_TO_MAX_FPGA_SLOTS = dict()
|
||||
self.SIM_HOST_HANDLE_TO_MAX_METASIM_SLOTS = dict()
|
||||
self.SIM_HOST_HANDLE_TO_SWITCH_ONLY_OK = dict()
|
||||
|
|
|
@ -270,7 +270,6 @@ class RuntimeBuildRecipeConfig(RuntimeHWConfig):
|
|||
self.deploytriplet = build_recipe_dict['DESIGN'] + "-" + build_recipe_dict['TARGET_CONFIG'] + "-" + build_recipe_dict['PLATFORM_CONFIG']
|
||||
|
||||
self.customruntimeconfig = build_recipe_dict['metasim_customruntimeconfig']
|
||||
self.customruntimeconfig = self.customruntimeconfig if self.customruntimeconfig != "None" else None
|
||||
# note whether we've built a copy of the simulation driver for this hwconf
|
||||
self.driver_built = False
|
||||
self.metasim_host_simulator = default_metasim_host_sim
|
||||
|
|
|
@ -273,7 +273,7 @@ class TestConfigRunAPI:
|
|||
|
||||
run_yamls.run.data['target_config'].should.contain('default_hw_config')
|
||||
run_yamls.run.data['target_config']['default_hw_config'] = 'INVALID_CONFIG'
|
||||
run_yamls.run.data['run_farm']['recipe_arg_overrides'] = {"run_farm_hosts" : [ {"f1.16xlarge" : 1} ] }
|
||||
run_yamls.run.data['run_farm']['recipe_arg_overrides'] = {"run_farm_hosts_to_use" : [ {"f1.16xlarge" : 1} ] }
|
||||
|
||||
run_yamls.hwdb.data.should_not.contain('INVALID_CONFIG')
|
||||
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: bwtest-mainrunfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 2
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 1
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: example_16config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: ccbench-cache-sweep
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 0
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 1
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: no_net_config
|
||||
no_net_num_nodes: 1
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_quadcore_no_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: gapbs-runfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 0
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 6
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: no_net_config
|
||||
no_net_num_nodes: 6
|
||||
|
@ -18,6 +24,7 @@ target_config:
|
|||
profile_interval: -1
|
||||
# Need not be single core.
|
||||
default_hw_config: firesim_quadcore_no_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -3,13 +3,19 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: linuxpoweroffallnonictargets
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 0
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 2
|
||||
- m4.16xlarge: 0
|
||||
# ci replace end
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: all_no_net_targets_config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -18,6 +24,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: linuxpoweroffnic
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 1
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: example_8config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: memcached-mainrunfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 3
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: triple_example_8config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: pinglatency-mainrunfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 1
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: example_8config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: simperftestlatency-mainrunfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 1
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: example_8config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: simperftestscale-mainrunfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 32
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 5
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: example_256config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_rocket_quadcore_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: simperftestscalesupernode-mainrunfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 32
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 0
|
||||
- m4.16xlarge: 5
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: supernode_example-1024config
|
||||
no_net_num_nodes: 2
|
||||
|
@ -16,6 +22,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_supernode_singlecore_nic_l2_lbp
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: intrate-runfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 0
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 10
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: no_net_config
|
||||
no_net_num_nodes: 10
|
||||
|
@ -17,6 +23,7 @@ target_config:
|
|||
net_bandwidth: 200
|
||||
profile_interval: -1
|
||||
default_hw_config: firesim_quadcore_no_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
|
@ -2,12 +2,18 @@ run_farm:
|
|||
base_recipe: run-farm-recipes/aws_ec2.yaml
|
||||
recipe_arg_overrides:
|
||||
run_farm_tag: intspeed-runfarm
|
||||
run_farm_hosts:
|
||||
run_farm_hosts_to_use:
|
||||
- f1.16xlarge: 0
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 11
|
||||
- m4.16xlarge: 0
|
||||
|
||||
metasimulation:
|
||||
metasimulation_enabled: false
|
||||
metasimulation_host_simulator: verilator
|
||||
metasimulation_only_plusargs: "+fesvr-step-size=128 +dramsim +max-cycles=100000000"
|
||||
metasimulation_only_vcs_plusargs: "+vcs+initreg+0 +vcs+initmem+0"
|
||||
|
||||
target_config:
|
||||
topology: no_net_config
|
||||
no_net_num_nodes: 11
|
||||
|
@ -18,6 +24,7 @@ target_config:
|
|||
profile_interval: -1
|
||||
# Need not be single core.
|
||||
default_hw_config: firesim_quadcore_no_nic_l2_llc4mb_ddr3
|
||||
plusarg_passthrough: ""
|
||||
|
||||
tracing:
|
||||
enable: no
|
||||
|
|
Loading…
Reference in New Issue