vtr_flow: add possibility to have add additional arch data files

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

vtr_flow/scripts/python_libs/vtr/task.py

@@ -43,6 +43,8 @@ def __init__(
         qor_parse_file=None,
         cmos_tech_behavior=None,
         pad_file=None,
+        additional_files=None,
+        additional_files_list_add=None
     ):
         self.task_name = task_name
         self.config_dir = config_dir
@@ -61,6 +63,8 @@ def __init__(
         self.qor_parse_file = qor_parse_file
         self.cmos_tech_behavior = cmos_tech_behavior
         self.pad_file = pad_file
+        self.additional_files = additional_files
+        self.additional_files_list_add = additional_files_list_add
 
 
 # pylint: enable=too-few-public-methods
@@ -169,6 +173,7 @@ def load_task_config(config_file):
         [
             "circuits_dir",
             "archs_dir",
+            "additional_files",
             "parse_file",
             "script_path",
             "script_params",
@@ -211,7 +216,7 @@ def load_task_config(config_file):
         elif repeated_key_pattern in key:
             if key not in key_values:
                 key_values[key] = []
-            if key == "script_params_list_add":
+            if key == "script_params_list_add" or key == "additional_files_list_add":
                 key_values[key] += [value]
             else:
                 key_values[key].append(value)
@@ -229,7 +234,7 @@ def load_task_config(config_file):
     if "script_params_common" in key_values:
         key_values["script_params_common"] = split(key_values["script_params_common"])
 
-    check_required_feilds(config_file, required_keys, key_values)
+    check_required_fields(config_file, required_keys, key_values)
 
     # Useful meta-data about the config
     config_dir = str(Path(config_file).parent)
@@ -240,7 +245,7 @@ def load_task_config(config_file):
     return TaskConfig(**key_values)
 
 
-def check_required_feilds(config_file, required_keys, key_values):
+def check_required_fields(config_file, required_keys, key_values):
     """
     Check that all required fields were specified
     """
@@ -307,6 +312,14 @@ def create_jobs(args, configs, longest_name=0, longest_arch_circuit=0, after_run
             # Collect any extra script params from the config file
             cmd = [abs_circuit_filepath, abs_arch_filepath]
 
+            # Check if additional architectural data files are present
+            if config.additional_files_list_add:
+                for additional_file in  config.additional_files_list_add:
+                    flag, file_name = additional_file.split(',')
+
+                    cmd += [flag]
+                    cmd += [resolve_vtr_source_file(config, file_name, config.arch_dir)]
+
             if hasattr(args, "show_failures") and args.show_failures:
                 cmd += ["-show_failures"]
             cmd += config.script_params if config.script_params else []

vtr_flow/tasks/regression_tests/vtr_reg_nightly/symbiflow/config/config.txt

@@ -14,6 +14,11 @@ circuit_list_add=symbiflow_counter.eblif
 # Add architectures to list to sweep
 arch_list_add=arch.timing.xml
 
+# Add additional required architectural data files
+additional_files_list_add=--read_rr_graph,rr_graph_xc7a50t_test.rr_graph.real.bin
+additional_files_list_add=--read_router_lookahead,rr_graph_xc7a50t_test.lookahead.bin
+additional_files_list_add=--read_placement_delay_lookup,rr_graph_xc7a50t_test.place_delay.bin
+
 # Parse info and how to parse
 parse_file=vpr_standard.txt
 
@@ -23,4 +28,4 @@ qor_parse_file=qor_standard.txt
 # Pass requirements
 pass_requirements_file=pass_requirements.txt
 
-script_params=-starting_stage vpr --max_router_iterations 500 --routing_failure_predictor off --router_high_fanout_threshold 1000 --constant_net_method route --route_chan_width 500 --router_heap bucket --clock_modeling route --place_delta_delay_matrix_calculation_method dijkstra --place_delay_model delta_override --router_lookahead extended_map --check_route quick --strict_checks off --allow_dangling_combinational_nodes on --disable_errors check_unbuffered_edges:check_route --congested_routing_iteration_threshold 0.8 --incremental_reroute_delay_ripup off --base_cost_type delay_normalized_length_bounded --bb_factor 10 --initial_pres_fac 4.0 --check_rr_graph off --read_rr_graph ../../../../rr_graph_xc7a50t_test.rr_graph.real.bin --read_router_lookahead ../../../../rr_graph_xc7a50t_test.lookahead.bin --read_placement_delay_lookup ../../../../rr_graph_xc7a50t_test.place_delay.bin
+script_params=-starting_stage vpr --max_router_iterations 500 --routing_failure_predictor off --router_high_fanout_threshold 1000 --constant_net_method route --route_chan_width 500 --router_heap bucket --clock_modeling route --place_delta_delay_matrix_calculation_method dijkstra --place_delay_model delta_override --router_lookahead extended_map --check_route quick --strict_checks off --allow_dangling_combinational_nodes on --disable_errors check_unbuffered_edges:check_route --congested_routing_iteration_threshold 0.8 --incremental_reroute_delay_ripup off --base_cost_type delay_normalized_length_bounded --bb_factor 10 --initial_pres_fac 4.0 --check_rr_graph off