Skip to content

Commit 2d0e717

Browse files
committed
Adding comments based on review.
Also fixing a mistake in some no_complex_dsp tasks. By mistake the complex_dsp_include file was included.
1 parent 697cb6b commit 2d0e717

File tree

8 files changed

+64
-22
lines changed

8 files changed

+64
-22
lines changed

ODIN_II/regression_test/benchmark/task/koios/task.conf

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,24 @@ regression_params=--disable_simulation --disable_parallel_jobs --verbose
66
script_synthesis_params=--limit_ressource --time_limit 14400s
77
script_simulation_params=--limit_ressource --time_limit 14400s
88

9-
# setup the architecture
9+
#-------------------------------------------------------
10+
# specify the directory to look for architecture file in
11+
#-------------------------------------------------------
1012
archs_dir=../vtr_flow/arch/COFFE_22nm
13+
14+
#-------------------------------------------------------
15+
# specify the architecture file
16+
#-------------------------------------------------------
1117
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
1218

13-
# setup the benchmarks
19+
#-------------------------------------------------------
20+
# specify the directory to look for benchmarks in
21+
#-------------------------------------------------------
1422
circuits_dir=../../../../vtr_flow/benchmarks/verilog/koios
15-
includes_dir=benchmarks/verilog/koios
16-
include_list_add=complex_dsp_include.v
1723

24+
#-------------------------------------------------------
25+
# specify the benchmarks
26+
#-------------------------------------------------------
1827
circuit_list_add=tpu_like.small.v
1928
circuit_list_add=dla_like.small.v
2029
circuit_list_add=bnn.v
@@ -28,4 +37,18 @@ circuit_list_add=reduction_layer.v
2837
circuit_list_add=spmv.v
2938
circuit_list_add=softmax.v
3039

40+
#-------------------------------------------------------
41+
# specify the directory to look for include file in
42+
#-------------------------------------------------------
43+
includes_dir=../../../../vtr_flow/benchmarks/verilog/koios
44+
45+
#-------------------------------------------------------
46+
# specify the include files
47+
#-------------------------------------------------------
48+
# Some benchmarks instantiate complex dsp blocks to implement features
49+
# like native floating point math, cascade chains, etc. This functionality
50+
# is guarded under the `complex_dsp` macro. The complex_dsp_include.v file
51+
# defines this macro, thereby enabling instantiations of the complex dsp.
52+
include_list_add=complex_dsp_include.v
53+
3154
synthesis_parse_file=regression_test/parse_result/conf/synth.toml

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ circuit_list_add=softmax.v
2929
# Add architectures to list to sweep
3030
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
3131

32-
# Add include files to the list
32+
# Add include files to the list.
33+
# Some benchmarks instantiate complex dsp blocks to implement features
34+
# like native floating point math, cascade chains, etc. This functionality
35+
# is guarded under the `complex_dsp` macro. The complex_dsp_include.v file
36+
# defines this macro, thereby enabling instantiations of the complex dsp.
3337
include_list_add=complex_dsp_include.v
3438

3539
# Parse info and how to parse

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.clustered.xml
2828
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.clustered.densest.xml
2929
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.clustered.denser.xml
3030

31-
# Add include files to the list
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.
3236
include_list_add=complex_dsp_include.v
3337

3438
# Parse info and how to parse

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ circuits_dir=benchmarks/verilog/koios
99
# Path to directory of architectures to use
1010
archs_dir=arch/timing
1111

12-
# Add circuits to list to sweep
12+
# Add circuits to list to sweep.
13+
# Some of these benchmarks are designs with complex_dsp blocks
14+
# but in this task, we're running them without enabling these
15+
# blocks (that is, the macro `complex_dsp` is not defined).
16+
# Equivalent functionality is obtained through behavioral logic
17+
# that gets mapped to soft logic.
1318
circuit_list_add=tpu_like.small.v
1419
circuit_list_add=dla_like.small.v
1520
circuit_list_add=bnn.v

vtr_flow/tasks/regression_tests/vtr_reg_strong/koios/config/config.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ circuit_list_add=test.v
1818
# Add architectures to list to sweep
1919
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
2020

21-
# Add include files to the list
21+
# Add include files to the list.
22+
# Some benchmarks instantiate complex dsp blocks to implement features
23+
# like native floating point math, cascade chains, etc. This functionality
24+
# is guarded under the `complex_dsp` macro. The complex_dsp_include.v file
25+
# defines this macro, thereby enabling instantiations of the complex dsp.
2226
include_list_add=complex_dsp_include.v
2327

2428
# Parse info and how to parse

vtr_flow/tasks/regression_tests/vtr_reg_strong/koios_no_complex_dsp/config/config.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ circuits_dir=benchmarks/verilog/koios
99
# Path to directory of architectures to use
1010
archs_dir=arch/COFFE_22nm
1111

12-
# Directory containing the verilog includes file(s)
13-
includes_dir=benchmarks/verilog/koios
14-
15-
# Add circuits to list to sweep
12+
# Add circuits to list to sweep.
13+
# Some of these benchmarks are designs with complex_dsp blocks
14+
# but in this task, we're running them without enabling these
15+
# blocks (that is, the macro `complex_dsp` is not defined).
16+
# Equivalent functionality is obtained through behavioral logic
17+
# that gets mapped to soft logic.
1618
circuit_list_add=test.v
1719

1820
# Add architectures to list to sweep
1921
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
2022

21-
# Add include files to the list
22-
include_list_add=complex_dsp_include.v
23-
2423
# Parse info and how to parse
2524
parse_file=vpr_standard.txt
2625

vtr_flow/tasks/regression_tests/vtr_reg_weekly/koios/config/config.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ circuit_list_add=dla_like.medium.v
2626
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
2727

2828
# Add include files to the list
29+
# Some benchmarks instantiate complex dsp blocks to implement features
30+
# like native floating point math, cascade chains, etc. This functionality
31+
# is guarded under the `complex_dsp` macro. The complex_dsp_include.v file
32+
# defines this macro, thereby enabling instantiations of the complex dsp.
2933
include_list_add=complex_dsp_include.v
3034

3135
# Parse info and how to parse

vtr_flow/tasks/regression_tests/vtr_reg_weekly/koios_no_complex_dsp/config/config.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ circuits_dir=benchmarks/verilog/koios
99
# Path to directory of architectures to use
1010
archs_dir=arch/COFFE_22nm
1111

12-
# Directory containing the verilog includes file(s)
13-
includes_dir=benchmarks/verilog/koios
14-
15-
# Add circuits to list to sweep
12+
# Add circuits to list to sweep.
13+
# Some of these benchmarks are designs with complex_dsp blocks
14+
# but in this task, we're running them without enabling these
15+
# blocks (that is, the macro `complex_dsp` is not defined).
16+
# Equivalent functionality is obtained through behavioral logic
17+
# that gets mapped to soft logic.
1618
circuit_list_add=clstm_like.small.v
1719
circuit_list_add=clstm_like.medium.v
1820
circuit_list_add=clstm_like.large.v
@@ -26,9 +28,6 @@ circuit_list_add=dla_like.medium.v
2628
# Add architectures to list to sweep
2729
arch_list_add=k6FracN10LB_mem20K_complexDSP_customSB_22nm.xml
2830

29-
# Add include files to the list
30-
include_list_add=complex_dsp_include.v
31-
3231
# Parse info and how to parse
3332
parse_file=vpr_standard.txt
3433

0 commit comments

Comments
 (0)