Skip to content

Commit 9157235

Browse files
ponameponame
authored
Merge branch 'master' into remove-yosys+odin
2 parents e7b21c8 + 09e65c7 commit 9157235

File tree

18 files changed

+459
-0
lines changed

18 files changed

+459
-0
lines changed

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
- {test: "vtr_reg_nightly_test3", cores: "16", options: "", cmake: "", extra_pkgs: ""}
3232
- {test: "vtr_reg_nightly_test4", cores: "16", options: "", cmake: "", extra_pkgs: ""}
3333
- {test: "vtr_reg_nightly_test5", cores: "16", options: "", cmake: "", extra_pkgs: ""}
34+
- {test: "vtr_reg_nightly_test7", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_PARMYS_PLUGIN=ON", extra_pkgs: ""}
35+
- {test: "vtr_reg_nightly_test8", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_PARMYS_PLUGIN=ON", extra_pkgs: "" }
3436
- {test: "vtr_reg_strong", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3", extra_pkgs: "libeigen3-dev"}
3537
- {test: "vtr_reg_strong", cores: "16", options: "-skip_qor", cmake: "-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=ON", extra_pkgs: "libeigen3-dev"}
3638
- {test: "vtr_reg_yosys", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_SV_UHDM_PLUGIN=ON", extra_pkgs: ""}

‎vtr_flow/tasks/regression_tests/vtr_reg_nightly_test7/koios_yosys_parmys/config/config.txt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
############################################
3+
# Configuration file for running experiments
4+
##############################################
5+
6+
# Path to directory of circuits to use
7+
circuits_dir=benchmarks/verilog/koios
8+
9+
# Path to directory of architectures to use
10+
archs_dir=arch/COFFE_22nm
11+
12+
# Directory containing the verilog includes file(s)
13+
includes_dir=benchmarks/verilog/koios
14+
15+
# Add circuits to list to sweep
16+
circuit_list_add=tpu_like.small.os.v
17+
circuit_list_add=tpu_like.small.ws.v
18+
circuit_list_add=dla_like.small.v
19+
circuit_list_add=bnn.v
20+
circuit_list_add=attention_layer.v
21+
circuit_list_add=conv_layer_hls.v
22+
circuit_list_add=conv_layer.v
23+
circuit_list_add=eltwise_layer.v
24+
circuit_list_add=robot_rl.v
25+
circuit_list_add=reduction_layer.v
26+
circuit_list_add=spmv.v
27+
circuit_list_add=softmax.v
28+
29+
# Add architectures to list to sweep
30+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
31+
32+
# Add include files to the list.
33+
# Some benchmarks instantiate hard dsp and memory blocks
34+
# This functionality is guarded under the `complex_dsp` and `hard_mem` macros.
35+
# The hard_block_include.v file
36+
# defines this macros, thereby enabling instantiations of the hard blocks
37+
include_list_add=hard_block_include.v
38+
39+
# Parse info and how to parse
40+
parse_file=vpr_standard.txt
41+
42+
# How to parse QoR info
43+
qor_parse_file=qor_standard.txt
44+
45+
# Pass requirements
46+
pass_requirements_file=pass_requirements.txt
47+
48+
#Script parameters
49+
script_params=-track_memory_usage -crit_path_router_iterations 100 --route_chan_width 300 -start yosys -mapper parmys

‎vtr_flow/tasks/regression_tests/vtr_reg_nightly_test7/koios_yosys_parmys/config/golden_results.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arch circuit script_params vtr_flow_elapsed_time vtr_max_mem_stage vtr_max_mem error odin_synth_time max_odin_mem yosys_synth_time max_yosys_mem abc_depth abc_synth_time abc_cec_time abc_sec_time max_abc_mem ace_time max_ace_mem 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
2+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml tpu_like.small.os.v common 1110.59 vpr 2.29 GiB -1 -1 19.63 193924 5 146.86 -1 -1 109788 -1 -1 492 355 32 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 2406424 355 289 25429 18444 2 12323 1433 136 136 18496 dsp_top auto 213.9 MiB 14.44 352336 2350.0 MiB 33.86 0.41 5.56791 -81804.5 -5.56791 2.1842 11.33 0.0355829 0.0296736 7.0167 5.87884 -1 384672 15 5.92627e+08 8.53857e+07 4.08527e+08 22087.3 5.71 8.53768 7.19696 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
3+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml tpu_like.small.ws.v common 1158.48 vpr 2.31 GiB -1 -1 25.68 243200 5 117.53 -1 -1 117100 -1 -1 697 357 58 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 2420124 357 289 25732 20399 2 12732 1667 136 136 18496 dsp_top auto 237.3 MiB 81.55 219859 2363.4 MiB 36.29 0.17 8.94296 -73584.4 -8.94296 2.88582 12.32 0.0201256 0.0161994 5.28974 4.16286 -1 286898 15 5.92627e+08 9.4939e+07 4.08527e+08 22087.3 4.27 6.36971 5.09181 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
4+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml dla_like.small.v common 3579.55 vpr 1.78 GiB -1 -1 92.70 736444 6 1349.76 -1 -1 389852 -1 -1 3859 206 132 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 1864068 206 13 165036 139551 1 69347 4322 88 88 7744 dsp_top auto 1066.9 MiB 1806.28 606504 1620.8 MiB 111.75 0.90 5.05712 -150965 -5.05712 5.05712 2.15 0.0366279 0.0287263 5.24481 3.9573 -1 879743 16 2.4541e+08 1.54276e+08 1.69370e+08 21871.2 10.28 7.22839 5.55706 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
5+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml bnn.v common 1151.22 vpr 2.04 GiB -1 -1 75.26 728748 3 74.57 -1 -1 412708 -1 -1 6192 260 0 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 2141884 260 122 206251 154342 1 87289 6637 87 87 7569 clb auto 1314.5 MiB 226.59 923276 1734.9 MiB 370.39 2.59 6.83078 -142705 -6.83078 6.83078 3.93 0.327259 0.305731 36.0045 30.6725 -1 1211227 18 2.37162e+08 1.8877e+08 1.65965e+08 21927.0 33.60 46.6811 39.6048 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
6+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml attention_layer.v common 1049.49 vpr 1007.30 MiB -1 -1 31.68 319060 5 16.80 -1 -1 134876 -1 -1 998 1052 194 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 1031476 1052 32 45971 36479 1 23767 2374 82 82 6724 dsp_top auto 316.0 MiB 604.19 257027 1007.3 MiB 68.40 0.50 5.72825 -88186.6 -5.72825 5.72825 3.50 0.10262 0.0674806 15.6345 12.2949 -1 397496 16 2.09174e+08 7.94267e+07 1.47429e+08 21925.8 12.26 19.34 15.3468 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
7+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml conv_layer_hls.v common 526.10 vpr 1.34 GiB -1 -1 16.38 267080 3 16.19 -1 -1 56524 -1 -1 1734 1016 21 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 1410004 1016 2244 12831 14373 1 7151 5027 104 104 10816 io auto 141.0 MiB 75.70 69573 1377.0 MiB 32.21 0.22 4.64445 -17031.1 -4.64445 4.64445 7.07 0.057679 0.0547243 7.10767 6.66414 -1 95151 13 3.44415e+08 5.43223e+07 2.37404e+08 21949.3 2.81 8.56776 8.02199 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
8+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml conv_layer.v common 297.35 vpr 545.57 MiB -1 -1 13.12 147948 4 116.75 -1 -1 82672 -1 -1 819 91 56 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 558664 91 65 33169 28056 2 12823 1073 56 56 3136 dsp_top auto 250.4 MiB 16.70 171184 545.6 MiB 20.48 0.17 4.53047 -55396.1 -4.53047 1.87418 1.27 0.0582637 0.0532144 6.28727 5.31139 -1 242052 13 9.76016e+07 4.12216e+07 6.79229e+07 21659.1 5.73 8.34868 7.09197 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
9+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml eltwise_layer.v common 140.72 vpr 475.44 MiB -1 -1 5.09 84496 4 8.49 -1 -1 57108 -1 -1 353 152 72 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 486848 152 97 14485 12275 2 7010 721 56 56 3136 dsp_top auto 142.7 MiB 10.46 130410 475.4 MiB 11.69 0.11 3.6181 -22623.8 -3.6181 1.61706 1.34 0.058637 0.0557739 4.83872 4.10451 -1 192506 16 9.76016e+07 3.16899e+07 6.79229e+07 21659.1 4.41 6.2521 5.37969 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
10+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml robot_rl.v common 173.65 vpr 473.83 MiB -1 -1 15.89 244148 5 12.11 -1 -1 76952 -1 -1 874 3 84 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 485204 3 384 24598 22966 1 12278 1363 52 52 2704 memory auto 221.4 MiB 18.52 106556 473.8 MiB 21.55 0.17 5.86275 -35817.1 -5.86275 5.86275 0.88 0.0376993 0.0159897 4.7203 3.73943 -1 173563 16 8.30642e+07 4.05203e+07 5.85728e+07 21661.5 5.12 6.87595 5.43564 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
11+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml reduction_layer.v common 120.60 vpr 320.91 MiB -1 -1 14.38 304872 6 13.37 -1 -1 73360 -1 -1 644 37 52 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 328612 37 17 16436 14191 1 8814 750 38 38 1444 memory auto 171.2 MiB 20.07 98868 306.5 MiB 15.40 0.19 5.67358 -37046.8 -5.67358 5.67358 0.44 0.037453 0.0308559 2.62088 2.04348 -1 162626 16 4.31434e+07 2.51293e+07 3.09543e+07 21436.5 4.48 4.28838 3.4871 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
12+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml spmv.v common 326.85 vpr 944.12 MiB -1 -1 7.94 190760 6 21.93 -1 -1 69896 -1 -1 648 82 232 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 966776 82 17 16299 14395 1 9060 1011 84 84 7056 memory auto 159.0 MiB 19.50 170039 944.1 MiB 9.84 0.12 4.90582 -40189.1 -4.90582 4.90582 3.31 0.0593175 0.0558204 3.35984 2.70486 -1 229056 13 2.2198e+08 5.81417e+07 1.54484e+08 21894.0 4.48 4.48777 3.62589 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
13+
k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml softmax.v common 163.15 vpr 442.01 MiB -1 -1 12.69 291904 10 14.29 -1 -1 57864 -1 -1 516 402 0 -1 success v8.0.0-6743-g5889a1dfb-dirty release IPO VTR_ASSERT_LEVEL=2 GNU 11.3.0 on Linux-5.15.0-53-generic x86_64 2022-12-06T13:04:10 casa48 /home/casa/Desktop/CAS-Atlantic/vtr_yosys_parmys_23 452616 402 150 12975 11797 1 7825 1105 54 54 2916 dsp_top auto 134.4 MiB 22.32 78842 442.0 MiB 12.47 0.13 7.87576 -13078 -7.87576 7.87576 0.88 0.0504971 0.0489573 3.59855 3.21012 -1 128692 16 8.95105e+07 2.37886e+07 6.32721e+07 21698.2 3.25 5.00922 4.47104 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1

‎vtr_flow/tasks/regression_tests/vtr_reg_nightly_test7/koios_yosys_parmys_multi_arch/config/config.txt‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
############################################
3+
# Configuration file for running experiments
4+
##############################################
5+
6+
# Path to directory of circuits to use
7+
circuits_dir=benchmarks/verilog/koios
8+
9+
# Path to directory of architectures to use
10+
archs_dir=arch/COFFE_22nm
11+
12+
# Directory containing the verilog includes file(s)
13+
includes_dir=benchmarks/verilog/koios
14+
15+
# Add circuits to list to sweep
16+
circuit_list_add=conv_layer.v
17+
18+
# Add architectures to list to sweep
19+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
20+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.mem_heavy.xml
21+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.dsp_heavy.xml
22+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.densest.xml
23+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.denser.xml
24+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.coupled.xml
25+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.coupled.densest.xml
26+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.coupled.denser.xml
27+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.clustered.xml
28+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.clustered.densest.xml
29+
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.clustered.denser.xml
30+
31+
# Add include files to the list.
32+
# Some benchmarks instantiate complex dsp blocks to implement features
33+
# like native floating point math, cascade chains, etc. This functionality
34+
# is guarded under the `complex_dsp` macro. The complex_dsp_include.v file
35+
# defines this macro, thereby enabling instantiations of the complex dsp.
36+
include_list_add=complex_dsp_include.v
37+
38+
# Parse info and how to parse
39+
parse_file=vpr_standard.txt
40+
41+
# How to parse QoR info
42+
qor_parse_file=qor_standard.txt
43+
44+
# Pass requirements
45+
pass_requirements_file=pass_requirements.txt
46+
47+
#Script parameters
48+
script_params=-track_memory_usage -crit_path_router_iterations 100 --route_chan_width 300 -start yosys -mapper parmys

0 commit comments

Comments
 (0)