Merge pull request #1561 from firesim/more-qol-fixes

Local FPGA managerinit QoL Fixes

deploy/firesim

@@ -191,8 +191,22 @@ def managerinit(args: argparse.Namespace):
         start_lines = [f"base_recipe: {runfarm_default_file}\n"]
         start_lines += ["recipe_arg_overrides:\n"]
 
+        deploy_manager_map = {
+            'vitis': 'VitisInstanceDeployManager',
+            'xilinx_alveo_u250': 'XilinxAlveoU250InstanceDeployManager',
+            'xilinx_alveo_u280': 'XilinxAlveoU280InstanceDeployManager',
+            'xilinx_vcu118': 'XilinxVCU118InstanceDeployManager',
+            'rhsresearch_nitefury_ii': 'RHSResearchNitefuryIIInstanceDeployManager',
+        }
+        firesim_runs_dir = str(Path.home()) + "/FIRESIM_RUNS_DIR"
+
         start_arg_idx, end_arg_idx = get_indexes(rf_recipe_lines, "managerinit arg start", "managerinit arg end")
         rf_recipe_lines = ["  " + l for l in start_lines] + rf_recipe_lines[start_arg_idx:end_arg_idx]
+        for l in range(len(rf_recipe_lines)):
+            if "EC2InstanceDeployManager" in rf_recipe_lines[l]:
+                rf_recipe_lines[l] = rf_recipe_lines[l].replace("EC2InstanceDeployManager", deploy_manager_map[args.platform])
+            if "/home/centos" in rf_recipe_lines[l]:
+                rf_recipe_lines[l] = rf_recipe_lines[l].replace("/home/centos", firesim_runs_dir)
 
         file_line_swap(
             "config_runtime.yaml",

deploy/run-farm-recipes/externally_provisioned.yaml

@@ -22,7 +22,7 @@ args:
     #     # by "four_fpgas_spec" below.
     #     - "111.111.1.111": four_fpgas_spec
     run_farm_hosts_to_use:
-        - localhost: four_fpgas_spec
+        - localhost: one_fpgas_spec
     # managerinit arg end
 
     # REQUIRED: List of host "specifications", i.e. re-usable collections of
@@ -64,3 +64,83 @@ args:
             num_metasims: 0
             use_for_switch_only: false
 
+        - one_fpgas_spec:
+            num_fpgas: 1
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - two_fpgas_spec:
+            num_fpgas: 2
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - three_fpgas_spec:
+            num_fpgas: 3
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - four_fpgas_spec:
+            num_fpgas: 4
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - five_fpgas_spec:
+            num_fpgas: 5
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - six_fpgas_spec:
+            num_fpgas: 6
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - seven_fpgas_spec:
+            num_fpgas: 7
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - eight_fpgas_spec:
+            num_fpgas: 8
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - nine_fpgas_spec:
+            num_fpgas: 9
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - ten_fpgas_spec:
+            num_fpgas: 10
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - eleven_fpgas_spec:
+            num_fpgas: 11
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - twelve_fpgas_spec:
+            num_fpgas: 12
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - thirteen_fpgas_spec:
+            num_fpgas: 13
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - fourteen_fpgas_spec:
+            num_fpgas: 14
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - fifteen_fpgas_spec:
+            num_fpgas: 15
+            num_metasims: 0
+            use_for_switch_only: false
+
+        - sixteen_fpgas_spec:
+            num_fpgas: 16
+            num_metasims: 0
+            use_for_switch_only: false
+

docs/Getting-Started-Guides/On-Premises-FPGA-Tutorial/Running-Simulations/DOCS_EXAMPLE_config_runtime.yaml

@@ -6,10 +6,10 @@ run_farm:
   recipe_arg_overrides:
     # REQUIRED: default platform used for run farm hosts. this is a class specifying
     # how to run simulations on a run farm host.
-    default_platform: EC2InstanceDeployManager
+    default_platform: VitisInstanceDeployManager
 
     # REQUIRED: default directory where simulations are run out of on the run farm hosts
-    default_simulation_dir: /home/centos
+    default_simulation_dir: /vm/home/buildbot/FIRESIM_RUNS_DIR
 
     # REQUIRED: List of unique hostnames/IP addresses, each with their
     # corresponding specification that describes the properties of the host.
@@ -22,7 +22,7 @@ run_farm:
     #     # by "four_fpgas_spec" below.
     #     - "111.111.1.111": four_fpgas_spec
     run_farm_hosts_to_use:
-        - localhost: four_fpgas_spec
+        - localhost: one_fpgas_spec
 
 metasimulation:
   metasimulation_enabled: false