Skip to content

Commit 69b514e

Browse files
authored
Merge pull request #1734 from sdamghan/ci_odin_full_reg
Ading odin_reg_full to CI
2 parents 469bccf + ed470b4 commit 69b514e

File tree

6 files changed

+128
-10
lines changed

6 files changed

+128
-10
lines changed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
4+
5+
# 12 hours
6+
timeout_mins: 720
7+
8+
action {
9+
define_artifacts {
10+
# File types
11+
regex: "**/*.out"
12+
regex: "**/vpr_stdout.log"
13+
regex: "**/parse_results.txt"
14+
regex: "**/qor_results.txt"
15+
regex: "**/pack.log"
16+
regex: "**/place.log"
17+
regex: "**/route.log"
18+
regex: "**/*_qor.csv"
19+
strip_prefix: "github/vtr-verilog-to-routing/"
20+
}
21+
}
22+
23+
env_vars {
24+
key: "KOKORO_TYPE"
25+
value: "continuous"
26+
}
27+
28+
env_vars {
29+
key: "KOKORO_DIR"
30+
value: "vtr-verilog-to-routing"
31+
}
32+
33+
env_vars {
34+
key: "VTR_DIR"
35+
value: "vtr-verilog-to-routing"
36+
}
37+
38+
#Use default build configuration
39+
env_vars {
40+
key: "VTR_CMAKE_PARAMS"
41+
value: ""
42+
}
43+
44+
env_vars {
45+
key: "VTR_TEST"
46+
value: "odin_reg_strong"
47+
}
48+
49+
#Options for run_reg_test.py
50+
# -show_failures: show tool failures in main log output
51+
env_vars {
52+
key: "VTR_TEST_OPTIONS"
53+
value: "-show_failures"
54+
}
55+
56+
env_vars {
57+
key: "NUM_CORES"
58+
value: "3"
59+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
build_file: "vtr-verilog-to-routing/.github/kokoro/run-vtr.sh"
4+
5+
# 12 hours
6+
timeout_mins: 720
7+
8+
action {
9+
define_artifacts {
10+
# File types
11+
regex: "**/*.out"
12+
regex: "**/vpr_stdout.log"
13+
regex: "**/parse_results.txt"
14+
regex: "**/qor_results.txt"
15+
regex: "**/pack.log"
16+
regex: "**/place.log"
17+
regex: "**/route.log"
18+
regex: "**/*_qor.csv"
19+
strip_prefix: "github/vtr-verilog-to-routing/"
20+
}
21+
}
22+
23+
env_vars {
24+
key: "KOKORO_TYPE"
25+
value: "presubmit"
26+
}
27+
28+
env_vars {
29+
key: "KOKORO_DIR"
30+
value: "vtr-verilog-to-routing"
31+
}
32+
33+
env_vars {
34+
key: "VTR_DIR"
35+
value: "vtr-verilog-to-routing"
36+
}
37+
38+
#Use default build configuration
39+
env_vars {
40+
key: "VTR_CMAKE_PARAMS"
41+
value: ""
42+
}
43+
44+
env_vars {
45+
key: "VTR_TEST"
46+
value: "odin_reg_strong"
47+
}
48+
49+
#Options for run_reg_test.py
50+
# -show_failures: show tool failures in main log output
51+
env_vars {
52+
key: "VTR_TEST_OPTIONS"
53+
value: "-show_failures"
54+
}
55+
56+
env_vars {
57+
key: "NUM_CORES"
58+
value: "3"
59+
}

.github/kokoro/run-vtr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ source $SCRIPT_DIR/steps/hostinfo.sh
1616
# Output git information
1717
source $SCRIPT_DIR/steps/git.sh
1818

19-
if [ $VTR_TEST == "vtr_reg_strong" ]; then
19+
if [ $VTR_TEST == "vtr_reg_strong" ] || [ $VTR_TEST == "odin_reg_strong" ]; then
2020
source $SCRIPT_DIR/steps/vtr-min-setup.sh
2121
else
2222
source $SCRIPT_DIR/steps/vtr-full-setup.sh

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199
./.github/travis/setup.sh
200200
201201
ODINII:
202-
name: 'ODIN-II Micro Tests'
202+
name: 'ODIN-II Basic Tests'
203203
runs-on: ubuntu-18.04
204204
steps:
205205

@@ -219,7 +219,7 @@ jobs:
219219
source .github/travis/common.sh
220220
./.github/travis/setup.sh
221221
./.github/travis/build.sh
222-
./run_reg_test.py odin_reg_micro -show_failures -j2
222+
./run_reg_test.py odin_reg_basic -show_failures -j2
223223
./.github/travis/setup.sh
224224
225225

README.developers.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@ $ ./run_reg_test.py vtr_reg_basic vtr_reg_strong -j4
285285

286286
Odin has its own set of tests to verify the correctness of its synthesis results:
287287

288-
* `odin_reg_micro`: ~2 minutes serial
289-
* `odin_reg_full`: ~6 minutes serial
288+
* `odin_reg_basic`: ~2 minutes serial
289+
* `odin_reg_strong`: ~6 minutes serial
290290

291291
These can be run with:
292292
```shell
293293
#From the VTR root directory
294-
$ ./run_reg_test.py odin_reg_micro
295-
$ ./run_reg_test.py odin_reg_full
294+
$ ./run_reg_test.py odin_reg_basic
295+
$ ./run_reg_test.py odin_reg_strong
296296
```
297297
and should be used when making changes to Odin.
298298

run_reg_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,12 @@ def run_odin_test(args, test_name):
269269
odin_reg_script[-1] += "task/arch_sweep"
270270
elif test_name == "odin_reg_operators":
271271
odin_reg_script[-1] += "task/operators"
272-
elif test_name == "odin_reg_large":
273-
odin_reg_script[-1] += "task/large"
274272
elif test_name == "odin_reg":
275273
odin_reg_script[-1] += "task/full"
276-
elif test_name == "odin_reg_micro":
274+
elif test_name == "odin_reg_basic":
277275
odin_reg_script[-1] += "suite/light_suite"
276+
elif test_name == "odin_reg_strong":
277+
odin_reg_script[-1] += "suite/heavy_suite"
278278
else:
279279
raise IOError("Test does not exist: {}".format(test_name))
280280

0 commit comments

Comments
 (0)