Merge pull request #2293 from verilog-to-routing/add_directory_noc_flow

Fix VTR Parser - NoC Flow File

Author: vaughnbetz

vtr_flow/scripts/python_libs/vtr/parse_vtr_flow.py

@@ -66,6 +66,8 @@ def parse_vtr_flow(arg_list):
 
     for param in extra_params:
         key, value = param.split("=", 1)
+        if value == "None":
+            continue
         extra_params_parsed[key] = value
         print(key, end="\t")
 

vtr_flow/scripts/python_libs/vtr/task.py

@@ -325,6 +325,126 @@ def find_longest_task_description(configs):
     return longest
 
 
+def get_work_dir_addr(arch, circuit, noc_traffic):
+    """ Get the work directory address under under run_dir """
+    work_dir = None
+    if noc_traffic:
+        work_dir = str(PurePath(arch).joinpath(circuit).joinpath(noc_traffic))
+    else:
+        work_dir = str(PurePath(arch).joinpath(circuit))
+
+    return work_dir
+
+
+def create_second_parse_cmd(config):
+    """ Create the parse command to run the second time """
+    second_parse_cmd = None
+    if config.second_parse_file:
+        second_parse_cmd = [
+            resolve_vtr_source_file(
+                config,
+                config.second_parse_file,
+                str(PurePath("parse").joinpath("parse_config")),
+            )
+        ]
+
+    return second_parse_cmd
+
+
+def create_cmd(abs_circuit_filepath, abs_arch_filepath, config, args, circuit, noc_traffic):
+    """ Create the command to run the task """
+    # Collect any extra script params from the config file
+    cmd = [abs_circuit_filepath, abs_arch_filepath]
+
+    # Resolve and collect all include paths in the config file
+    # as -include ["include1", "include2", ..]
+    includes = []
+    if config.includes:
+        cmd += ["-include"]
+        for include in config.includes:
+            abs_include_filepath = resolve_vtr_source_file(config, include, config.include_dir)
+            includes.append(abs_include_filepath)
+
+        cmd += includes
+
+    # 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 []
+    cmd += config.script_params_common if config.script_params_common else []
+    cmd += (
+        args.shared_script_params
+        if hasattr(args, "shared_script_params") and args.shared_script_params
+        else []
+    )
+
+    # Apply any special config based parameters
+    if config.cmos_tech_behavior:
+        cmd += [
+            "-cmos_tech",
+            resolve_vtr_source_file(config, config.cmos_tech_behavior, "tech"),
+        ]
+
+    cmd += (
+        ["--fix_pins", resolve_vtr_source_file(config, config.pad_file)] if config.pad_file else []
+    )
+
+    if config.sdc_dir:
+        sdc_name = "{}.sdc".format(Path(circuit).stem)
+        sdc_file = resolve_vtr_source_file(config, sdc_name, config.sdc_dir)
+
+        cmd += ["-sdc_file", "{}".format(sdc_file)]
+
+    if config.place_constr_dir:
+        place_constr_name = "{}.place".format(Path(circuit).stem)
+        place_constr_file = resolve_vtr_source_file(
+            config, place_constr_name, config.place_constr_dir
+        )
+
+        cmd += ["--fix_clusters", "{}".format(place_constr_file)]
+
+    parse_cmd = None
+    qor_parse_command = None
+    if config.parse_file:
+        parse_cmd = [
+            resolve_vtr_source_file(
+                config,
+                config.parse_file,
+                str(PurePath("parse").joinpath("parse_config")),
+            )
+        ]
+
+    second_parse_cmd = create_second_parse_cmd(config)
+
+    if config.qor_parse_file:
+        qor_parse_command = [
+            resolve_vtr_source_file(
+                config,
+                config.qor_parse_file,
+                str(PurePath("parse").joinpath("qor_config")),
+            )
+        ]
+    # We specify less verbosity to the sub-script
+    # This keeps the amount of output reasonable
+    if hasattr(args, "verbosity") and max(0, args.verbosity - 1):
+        cmd += ["-verbose"]
+
+    if noc_traffic:
+        cmd += [
+            "--noc_flows_file",
+            resolve_vtr_source_file(config, noc_traffic, config.noc_traffic_dir),
+        ]
+
+    return includes, parse_cmd, second_parse_cmd, qor_parse_command, cmd
+
+
 # pylint: disable=too-many-branches
 def create_jobs(args, configs, after_run=False):
     """
@@ -344,7 +464,7 @@ def create_jobs(args, configs, after_run=False):
                 )
                 abs_arch_filepath = resolve_vtr_source_file(config, arch, config.arch_dir)
                 abs_circuit_filepath = resolve_vtr_source_file(config, circuit, config.circuit_dir)
-                work_dir = str(PurePath(arch).joinpath(circuit))
+                work_dir = get_work_dir_addr(arch, circuit, noc_traffic)
 
                 run_dir = (
                     str(
@@ -357,107 +477,10 @@ def create_jobs(args, configs, after_run=False):
                     )
                 )
 
-                # Collect any extra script params from the config file
-                cmd = [abs_circuit_filepath, abs_arch_filepath]
-
-                # Resolve and collect all include paths in the config file
-                # as -include ["include1", "include2", ..]
-                includes = []
-                if config.includes:
-                    cmd += ["-include"]
-                    for include in config.includes:
-                        abs_include_filepath = resolve_vtr_source_file(
-                            config, include, config.include_dir
-                        )
-                        includes.append(abs_include_filepath)
-
-                    cmd += includes
-
-                # 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 []
-                cmd += config.script_params_common if config.script_params_common else []
-                cmd += (
-                    args.shared_script_params
-                    if hasattr(args, "shared_script_params") and args.shared_script_params
-                    else []
-                )
-
-                # Apply any special config based parameters
-                if config.cmos_tech_behavior:
-                    cmd += [
-                        "-cmos_tech",
-                        resolve_vtr_source_file(config, config.cmos_tech_behavior, "tech"),
-                    ]
-
-                cmd += (
-                    ["--fix_pins", resolve_vtr_source_file(config, config.pad_file)]
-                    if config.pad_file
-                    else []
+                includes, parse_cmd, second_parse_cmd, qor_parse_command, cmd = create_cmd(
+                    abs_circuit_filepath, abs_arch_filepath, config, args, circuit, noc_traffic
                 )
 
-                if config.sdc_dir:
-                    sdc_name = "{}.sdc".format(Path(circuit).stem)
-                    sdc_file = resolve_vtr_source_file(config, sdc_name, config.sdc_dir)
-
-                    cmd += ["-sdc_file", "{}".format(sdc_file)]
-
-                if config.place_constr_dir:
-                    place_constr_name = "{}.place".format(Path(circuit).stem)
-                    place_constr_file = resolve_vtr_source_file(
-                        config, place_constr_name, config.place_constr_dir
-                    )
-
-                    cmd += ["--fix_clusters", "{}".format(place_constr_file)]
-
-                parse_cmd = None
-                second_parse_cmd = None
-                qor_parse_command = None
-                if config.parse_file:
-                    parse_cmd = [
-                        resolve_vtr_source_file(
-                            config,
-                            config.parse_file,
-                            str(PurePath("parse").joinpath("parse_config")),
-                        )
-                    ]
-
-                if config.second_parse_file:
-                    second_parse_cmd = [
-                        resolve_vtr_source_file(
-                            config,
-                            config.second_parse_file,
-                            str(PurePath("parse").joinpath("parse_config")),
-                        )
-                    ]
-
-                if config.qor_parse_file:
-                    qor_parse_command = [
-                        resolve_vtr_source_file(
-                            config,
-                            config.qor_parse_file,
-                            str(PurePath("parse").joinpath("qor_config")),
-                        )
-                    ]
-                # We specify less verbosity to the sub-script
-                # This keeps the amount of output reasonable
-                if hasattr(args, "verbosity") and max(0, args.verbosity - 1):
-                    cmd += ["-verbose"]
-
-                if noc_traffic:
-                    cmd += [
-                        "--noc_flows_file",
-                        resolve_vtr_source_file(config, noc_traffic, config.noc_traffic_dir),
-                    ]
-
                 if config.script_params_list_add:
                     for value in config.script_params_list_add:
                         jobs.append(
@@ -467,6 +490,7 @@ def create_jobs(args, configs, after_run=False):
                                 circuit,
                                 includes,
                                 arch,
+                                noc_traffic,
                                 value,
                                 cmd,
                                 parse_cmd,
@@ -485,6 +509,7 @@ def create_jobs(args, configs, after_run=False):
                             circuit,
                             includes,
                             arch,
+                            noc_traffic,
                             None,
                             cmd,
                             parse_cmd,
@@ -505,6 +530,7 @@ def create_job(
     circuit,
     include,
     arch,
+    noc_flow,
     param,
     cmd,
     parse_cmd,
@@ -554,6 +580,7 @@ def create_job(
         current_parse_cmd += [
             "arch={}".format(arch),
             "circuit={}".format(circuit),
+            "noc_flow={}".format(noc_flow),
             "script_params={}".format(load_script_param(param)),
         ]
         current_parse_cmd.insert(0, run_dir + "/{}".format(load_script_param(param)))
@@ -563,6 +590,7 @@ def create_job(
         current_second_parse_cmd += [
             "arch={}".format(arch),
             "circuit={}".format(circuit),
+            "noc_flow={}".format(noc_flow),
             "script_params={}".format(load_script_param(param)),
         ]
         current_second_parse_cmd.insert(0, run_dir + "/{}".format(load_script_param(param)))
@@ -572,6 +600,7 @@ def create_job(
         current_qor_parse_command += [
             "arch={}".format(arch),
             "circuit={}".format(circuit),
+            "noc_flow={}".format(noc_flow),
             "script_params={}".format("common"),
         ]
         current_qor_parse_command.insert(0, run_dir + "/{}".format(load_script_param(param)))

vtr_flow/tasks/regression_tests/vtr_reg_nightly_test5/vpr_noc_clique_topology/config/golden_results.txt

@@ -1,2 +1,2 @@
-arch	circuit	script_params	vtr_flow_elapsed_time	vtr_max_mem_stage	vtr_max_mem	error	num_clb	num_io	num_memories	num_mult	vpr_status	vpr_revision	vpr_build_info	vpr_compiler	vpr_compiled	hostname	rundir	max_vpr_mem	num_primary_inputs	num_primary_outputs	num_pre_packed_nets	num_pre_packed_blocks	num_netlist_clocks	num_post_packed_nets	num_post_packed_blocks	device_width	device_height	device_grid_tiles	device_limiting_resources	device_name	pack_mem	pack_time	placed_wirelength_est	place_mem	place_time	place_quench_time	placed_CPD_est	placed_setup_TNS_est	placed_setup_WNS_est	placed_geomean_nonvirtual_intradomain_critical_path_delay_est	place_delay_matrix_lookup_time	place_quench_timing_analysis_time	place_quench_sta_time	place_total_timing_analysis_time	place_total_sta_time	min_chan_width	routed_wirelength	min_chan_width_route_success_iteration	logic_block_area_total	logic_block_area_used	min_chan_width_routing_area_total	min_chan_width_routing_area_per_tile	min_chan_width_route_time	min_chan_width_total_timing_analysis_time	min_chan_width_total_sta_time	crit_path_routed_wirelength	crit_path_route_success_iteration	crit_path_total_nets_routed	crit_path_total_connections_routed	crit_path_total_heap_pushes	crit_path_total_heap_pops	critical_path_delay	geomean_nonvirtual_intradomain_critical_path_delay	setup_TNS	setup_WNS	hold_TNS	hold_WNS	crit_path_routing_area_total	crit_path_routing_area_per_tile	router_lookahead_computation_time	crit_path_route_time	crit_path_total_timing_analysis_time	crit_path_total_sta_time	NoC_agg_bandwidth	NoC_latency	
-stratixiv_arch.timing_with_a_embedded_10X10_mesh_noc_topology.xml	complex_64_noc_clique.blif	common	8722.02	vpr	7.77 GiB		-1	2	-1	-1	success	v8.0.0-6827-g874e0cb8d-dirty	release IPO VTR_ASSERT_LEVEL=2	GNU 7.5.0 on Linux-4.15.0-167-generic x86_64	2023-01-19T13:42:08	betzgrp-wintermute.eecg.utoronto.ca	/home/mahmo494/Desktop/add_noc_testcases/vtr-verilog-to-routing/vtr_flow/tasks	8148772	2	64	249332	210540	1	129121	8146	220	162	35640	-1	EP4SE820	2824.5 MiB	402.18	1227222	7957.8 MiB	792.01	4.20	6.60816	-853447	-6.60816	6.60816	2267.92	0.667678	0.54378	90.027	73.7401	154	1426225	49	0	0	3.59543e+08	10088.2	4276.17	411.681	346.038	1425419	20	357462	849967	447693681	43661832	7.19548	7.19548	-1.04483e+06	-7.19548	0	0	4.57197e+08	12828.2	417.73	79.91	33.4499	29.4545	8.4624e+09	8.0592e-05	
+arch	circuit	noc_flow	script_params	vtr_flow_elapsed_time	vtr_max_mem_stage	vtr_max_mem	error	num_clb	num_io	num_memories	num_mult	vpr_status	vpr_revision	vpr_build_info	vpr_compiler	vpr_compiled	hostname	rundir	max_vpr_mem	num_primary_inputs	num_primary_outputs	num_pre_packed_nets	num_pre_packed_blocks	num_netlist_clocks	num_post_packed_nets	num_post_packed_blocks	device_width	device_height	device_grid_tiles	device_limiting_resources	device_name	pack_mem	pack_time	placed_wirelength_est	place_mem	place_time	place_quench_time	placed_CPD_est	placed_setup_TNS_est	placed_setup_WNS_est	placed_geomean_nonvirtual_intradomain_critical_path_delay_est	place_delay_matrix_lookup_time	place_quench_timing_analysis_time	place_quench_sta_time	place_total_timing_analysis_time	place_total_sta_time	min_chan_width	routed_wirelength	min_chan_width_route_success_iteration	logic_block_area_total	logic_block_area_used	min_chan_width_routing_area_total	min_chan_width_routing_area_per_tile	min_chan_width_route_time	min_chan_width_total_timing_analysis_time	min_chan_width_total_sta_time	crit_path_routed_wirelength	crit_path_route_success_iteration	crit_path_total_nets_routed	crit_path_total_connections_routed	crit_path_total_heap_pushes	crit_path_total_heap_pops	critical_path_delay	geomean_nonvirtual_intradomain_critical_path_delay	setup_TNS	setup_WNS	hold_TNS	hold_WNS	crit_path_routing_area_total	crit_path_routing_area_per_tile	router_lookahead_computation_time	crit_path_route_time	crit_path_total_timing_analysis_time	crit_path_total_sta_time	NoC_agg_bandwidth	NoC_latency
+stratixiv_arch.timing_with_a_embedded_10X10_mesh_noc_topology.xml	complex_64_noc_clique.blif	complex_64_noc_clique.flows	common	8722.02	vpr	7.77 GiB		-1	2	-1	-1	success	v8.0.0-6827-g874e0cb8d-dirty	release IPO VTR_ASSERT_LEVEL=2	GNU 7.5.0 on Linux-4.15.0-167-generic x86_64	2023-01-19T13:42:08	betzgrp-wintermute.eecg.utoronto.ca	/home/mahmo494/Desktop/add_noc_testcases/vtr-verilog-to-routing/vtr_flow/tasks	8148772	2	64	249332	210540	1	129121	8146	220	162	35640	-1	EP4SE820	2824.5 MiB	402.18	1227222	7957.8 MiB	792.01	4.2	6.60816	-853447	-6.60816	6.60816	2267.92	0.667678	0.54378	90.027	73.7401	154	1426225	49	0	0	359543000	10088.2	4276.17	411.681	346.038	1425419	20	357462	849967	447693681	43661832	7.19548	7.19548	-1044830	-7.19548	0	0	457197000	12828.2	417.73	79.91	33.4499	29.4545	8462400000	8.0592E-05