Skip to content

Commit c818529

Browse files
committed
Add support to specify multiple traffic flow file in config file
1 parent 92f4056 commit c818529

File tree

2 files changed

+19
-7
lines changed
  • vtr_flow
    • scripts/python_libs/vtr
    • tasks/regression_tests/vtr_reg_nightly_test5/vpr_noc_star_topology/config

2 files changed

+19
-7
lines changed

vtr_flow/scripts/python_libs/vtr/task.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ def __init__(
4242
script_params_list_add=None,
4343
pass_requirements_file=None,
4444
sdc_dir=None,
45+
noc_traffic_list_add=None,
46+
noc_traffics_dir=None,
4547
place_constr_dir=None,
4648
qor_parse_file=None,
4749
cmos_tech_behavior=None,
@@ -65,6 +67,8 @@ def __init__(
6567
self.script_params_list_add = script_params_list_add
6668
self.pass_requirements_file = pass_requirements_file
6769
self.sdc_dir = sdc_dir
70+
self.noc_traffics = noc_traffic_list_add
71+
self.noc_traffics_dir = noc_traffics_dir
6872
self.place_constr_dir = place_constr_dir
6973
self.qor_parse_file = qor_parse_file
7074
self.cmos_tech_behavior = cmos_tech_behavior
@@ -195,6 +199,7 @@ def load_task_config(config_file):
195199
"script_params_common",
196200
"pass_requirements_file",
197201
"sdc_dir",
202+
"noc_traffics_dir",
198203
"place_constr_dir",
199204
"qor_parse_file",
200205
"cmos_tech_behavior",
@@ -327,7 +332,9 @@ def create_jobs(args, configs, after_run=False):
327332
"""
328333
jobs = []
329334
for config in configs:
330-
for arch, circuit in itertools.product(config.archs, config.circuits):
335+
for arch, circuit, noc_file in itertools.product(config.archs, config.circuits, config.noc_traffics):
336+
print(f"{arch}, {circuit}, {noc_file}")
337+
continue
331338
golden_results = load_parse_results(
332339
str(PurePath(config.config_dir).joinpath("golden_results.txt"))
333340
)

vtr_flow/tasks/regression_tests/vtr_reg_nightly_test5/vpr_noc_star_topology/config/config.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,23 @@ circuits_dir=benchmarks/noc/Synthetic_Designs/complex_64_noc_star/
88
# Path to directory of architectures to use
99
archs_dir=arch/noc/mesh_noc_topology
1010

11+
# Path to directory of NoC Traffic Patterns to use
12+
noc_traffics_dir=benchmarks/noc/Synthetic_Designs/complex_64_noc_star/
13+
1114
# Add circuits to list to sweep
1215
circuit_list_add=complex_64_noc_star.blif
1316

1417

1518
# Add architectures to list to sweep
1619
arch_list_add=stratixiv_arch.timing_with_a_embedded_10X10_mesh_noc_topology.xml
1720

21+
# Add NoC Traffic Patterns to list to sweep
22+
noc_traffic_list_add=complex_64_noc_star_no_constraints.flows
23+
noc_traffic_list_add=complex_64_noc_star_2_bandwidths.flows
24+
noc_traffic_list_add=complex_64_noc_star_6_bandwidths.flows
25+
noc_traffic_list_add=complex_64_noc_star_24_latency_constraints.flows
26+
noc_traffic_list_add=complex_64_noc_star_63_latency_constraints.flows
27+
1828
# Parse info and how to parse
1929
parse_file=vpr_noc.txt
2030

@@ -25,9 +35,4 @@ qor_parse_file=qor_noc_spec.txt
2535
pass_requirements_file=pass_requirements.txt
2636

2737
# Script parameters
28-
script_params_common =-starting_stage vpr --noc on --noc_routing_algorithm xy_routing --device "EP4SE820"
29-
script_params_list_add = -noc_flows_file ../../../../../../../../benchmarks/noc/Synthetic_Designs/complex_64_noc_star/complex_64_noc_star_no_constraints.flows
30-
script_params_list_add = -noc_flows_file ../../../../../../../../benchmarks/noc/Synthetic_Designs/complex_64_noc_star/complex_64_noc_star_2_bandwidths.flows
31-
script_params_list_add = -noc_flows_file ../../../../../../../../benchmarks/noc/Synthetic_Designs/complex_64_noc_star/complex_64_noc_star_6_bandwidths.flows
32-
script_params_list_add = -noc_flows_file ../../../../../../../../benchmarks/noc/Synthetic_Designs/complex_64_noc_star/complex_64_noc_star_24_latency_constraints.flows
33-
script_params_list_add = -noc_flows_file ../../../../../../../../benchmarks/noc/Synthetic_Designs/complex_64_noc_star/complex_64_noc_star_63_latency_constraints.flows
38+
script_params_common =-starting_stage vpr --noc on --noc_routing_algorithm xy_routing --device "EP4SE820"

0 commit comments

Comments
 (0)