Skip to content

Commit c1c2a5d

Browse files
committed
Updating configs for vtr_reg_system_verilog tests. They now read in multiple .sv files instead of single flattened .sv files (with the exception of the f4pga_pulse_width_led test since it uses .v files instead of .sv)
1 parent 90e180b commit c1c2a5d

File tree

6 files changed

+53
-15
lines changed

6 files changed

+53
-15
lines changed

vtr_flow/misc/yosys/synthesis.tcl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
yosys -import
2-
#puts "Files in here: [glob -nocomplain *]"
32
plugin -i parmys
43

54
read_verilog -nomem2reg +/parmys/vtr_primitives.v
@@ -38,7 +37,7 @@ parmys_arch -a QQQ
3837
# }
3938

4039
if {$env(PARSER) == "slang" } {
41-
# Create a file list containing the name(s) of file(s)
40+
# Create a file list containing the name(s) of file(s) \
4241
# to read together with read_slang
4342
set sv_files {}
4443
set v_files {}
@@ -57,10 +56,10 @@ if {$env(PARSER) == "slang" } {
5756
}
5857
}
5958
close $fh
60-
if {[llength $sv_files] > 0} {
59+
#if {[llength $sv_files] > 0} {
6160
#puts "Using Yosys read_slang command"
6261
#read_slang -C $readfile
63-
}
62+
#}
6463
puts "Using Yosys read_slang command"
6564
read_slang -C $readfile
6665
} elseif {$env(PARSER) == "default" } {

vtr_flow/tasks/regression_tests/vtr_reg_nightly_test4/koios_medium/config/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ qor_parse_file=qor_standard.txt
4646
pass_requirements_file=pass_requirements_fixed_chan_width.txt
4747

4848
#Script parameters
49-
script_params=-track_memory_usage -crit_path_router_iterations 100 --route_chan_width 300
49+
script_params=-track_memory_usage -crit_path_router_iterations 100 --route_chan_width 300

vtr_flow/tasks/regression_tests/vtr_reg_system_verilog/f4pga_button_controller/config/config.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ archs_dir=arch/timing
1212

1313

1414
# Add circuits to list to sweep
15-
#include_list_add=display_control.sv
16-
#include_list_add=timer.sv
17-
#include_list_add=debounce.sv
15+
include_list_add=display_control.sv
16+
include_list_add=timer.sv
17+
include_list_add=debounce.sv
1818

1919
# Add circuits to list to sweep
20-
#circuit_list_add=button_controller.sv
20+
#circuit_list_add=flattened_button_controller.sv
2121

22-
circuit_list_add=flattened_button_controller.sv
22+
circuit_list_add=button_controller.sv
2323

2424

2525
# Add architectures to list to sweep

vtr_flow/tasks/regression_tests/vtr_reg_system_verilog/f4pga_timer/config/config.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ archs_dir=arch/timing
1212

1313

1414
# Add circuits to list to sweep
15-
#include_list_add=timer.sv
16-
#include_list_add=display_control.sv
17-
#include_list_add=time_counter.sv
18-
#include_list_add=modify_count.sv
15+
include_list_add=modify_count.sv
16+
include_list_add=display_control.sv
17+
include_list_add=time_counter.sv
18+
include_list_add=timer.sv
1919

2020
# Add circuits to list to sweep
21-
circuit_list_add=flattened_timer.sv
21+
#circuit_list_add=flattened_timer.sv
22+
circuit_list_add=clock.sv
2223

2324

2425
# Add architectures to list to sweep
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#
2+
############################################
3+
# Configuration file for running experiments
4+
##############################################
5+
6+
# Path to directory of circuits to use
7+
circuits_dir=benchmarks/system_verilog/koios_sv
8+
includes_dir=benchmarks/system_verilog/koios_sv
9+
10+
# Path to directory of architectures to use
11+
archs_dir=arch/timing
12+
13+
14+
# Add circuits to list to sweep
15+
#include_list_add=display_control.sv
16+
#include_list_add=timer.sv
17+
#include_list_add=debounce.sv
18+
19+
# Add circuits to list to sweep
20+
circuit_list_add=deepfreeze.style1.sv
21+
22+
23+
24+
# Add architectures to list to sweep
25+
arch_list_add=k6_frac_N10_frac_chain_mem32K_40nm.xml
26+
27+
# Parse info and how to parse
28+
parse_file=vpr_standard.txt
29+
30+
# How to parse QoR info
31+
qor_parse_file=qor_standard.txt
32+
33+
# Pass requirements
34+
pass_requirements_file=pass_requirements.txt
35+
36+
#Script parameters
37+
script_params=-track_memory_usage -crit_path_router_iterations 100 -parser slang
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
regression_tests/vtr_reg_system_verilog/f4pga_button_controller/
2+
#regression_tests/vtr_reg_system_verilog/koios_sv/
23
regression_tests/vtr_reg_system_verilog/f4pga_pulse_width_led/
34
regression_tests/vtr_reg_system_verilog/f4pga_timer/

0 commit comments

Comments
 (0)