Skip to content

Commit 452611a

Browse files
w0lekw0lek
authored
Merge branch 'master' into hotfix-winbuild
2 parents da502c7 + 8255ada commit 452611a

File tree

255 files changed

+4964
-12095
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+4964
-12095
lines changed

‎.github/workflows/nightly_test_manual.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,5 @@ jobs:
112112
name: nightly_test_results
113113
path: |
114114
vtr_flow/**/*.log
115+
vtr_flow/**/vpr.out
115116
vtr_flow/**/parse_results*.txt

‎.github/workflows/test.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,25 @@ jobs:
9999
run: ./dev/${{ matrix.script }}
100100

101101

102+
VerifyTestSuites:
103+
runs-on: ubuntu-24.04
104+
name: 'Verify Test Suites'
105+
steps:
106+
107+
- uses: actions/setup-python@v5
108+
with:
109+
python-version: 3.12.3
110+
111+
- uses: actions/checkout@v4
112+
# NOTE: We do not need sub-modules. This only verifies the tests, does not run them.
113+
114+
- name: 'Run test suite verification'
115+
run: |
116+
./dev/vtr_test_suite_verifier/verify_test_suites.py \
117+
-vtr_regression_tests_dir vtr_flow/tasks/regression_tests \
118+
-test_suite_info dev/vtr_test_suite_verifier/test_suites_info.json
119+
120+
102121
UnitTests:
103122
name: 'U: C++ Unit Tests'
104123
runs-on: ubuntu-24.04
@@ -540,6 +559,7 @@ jobs:
540559
needs:
541560
- Build
542561
- Format
562+
- VerifyTestSuites
543563
- UnitTests
544564
- BuildVariations
545565
- Regression

‎.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@
66
[submodule "libs/EXTERNAL/sockpp"]
77
path = libs/EXTERNAL/sockpp
88
url = https://github.com/w0lek/sockpp.git
9+
10+
[submodule "libs/EXTERNAL/libezgl"]
11+
path = libs/EXTERNAL/libezgl
12+
url = https://github.com/verilog-to-routing/ezgl.git

‎.readthedocs.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ build:
1919
tools:
2020
python: "3.11"
2121

22+
submodules:
23+
include: all
24+
2225
python:
2326
install:
2427
- requirements: doc/requirements.txt

‎Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#This is a simple wrapper which hides cmake (for convenience, and from non-expert end users).
1+
# This is a simple wrapper which hides cmake (for convenience, and from non-expert end users).
22
#
33
# It supports the targets:
44
# 'make' - builds everything (all libaries/executables)
@@ -15,12 +15,14 @@
1515
#
1616
# 'make BUILD_TYPE=debug VERBOSE=1'
1717

18-
#Default build type
19-
# Possible values:
20-
# release_pgo #Perform a 2-stage build with profile-guided compiler optimization
21-
# release #Build with compiler optimization
22-
# debug #Build with debug info and no compiler optimization
23-
# strict #Build VPR with warnings treated as errors
18+
# Build type
19+
# Possible values (not case sensitive):
20+
# release #Build with compiler optimization (Default)
21+
# RelWithDebInfo #Build with debug info and compiler optimizations
22+
# debug #Build with debug info and no compiler optimization
23+
# Possible suffixes:
24+
# _pgo #Perform a 2-stage build with profile-guided compiler optimization
25+
# _strict #Build VPR with warnings treated as errors
2426
BUILD_TYPE ?= release
2527

2628
#Debugging verbosity enable

‎dev/subtree_config.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
internal_path="libs/EXTERNAL/libtatum"
2525
external_url="https://github.com/verilog-to-routing/tatum.git"
2626
default_external_ref="master"/>
27-
<subtree
28-
name="libezgl"
29-
internal_path="libs/EXTERNAL/libezgl"
30-
external_url="https://github.com/mariobadr/ezgl.git"
31-
default_external_ref="master"/>
3227
<subtree
3328
name="capnproto"
3429
internal_path="libs/EXTERNAL/capnproto"

‎dev/vtr_test_suite_verifier/test_suites_info.json

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{"test_suites": [
2+
{
3+
"name": "vtr_reg_basic",
4+
"ignored_tasks": []
5+
},
6+
{
7+
"name": "vtr_reg_basic_odin",
8+
"ignored_tasks": []
9+
},
10+
{
11+
"name": "parmys_reg_basic",
12+
"ignored_tasks": []
13+
},
14+
{
15+
"name": "vtr_reg_valgrind_small",
16+
"ignored_tasks": []
17+
},
18+
{
19+
"name": "vtr_reg_strong",
20+
"ignored_tasks": [
21+
"strong_router_heap",
22+
"strong_verify_rr_graph_3d",
23+
"strong_xilinx_support"
24+
]
25+
},
26+
{
27+
"name": "vtr_reg_strong_odin",
28+
"ignored_tasks": [
29+
"strong_xilinx_support",
30+
"strong_router_heap",
31+
"strong_cluster_seed_type"
32+
]
33+
},
34+
{
35+
"name": "vtr_reg_nightly_test1",
36+
"ignored_tasks": [
37+
"arithmetic_tasks/FIR_filters",
38+
"arithmetic_tasks/FIR_filters_frac",
39+
"arithmetic_tasks/adder_trees",
40+
"symbiflow"
41+
]
42+
},
43+
{
44+
"name": "vtr_reg_nightly_test2",
45+
"ignored_tasks": [
46+
"complex_switch",
47+
"vpr_verify_custom_sb_diff_chan_width",
48+
"vtr_xilinx_qor"
49+
]
50+
},
51+
{
52+
"name": "vtr_reg_nightly_test3",
53+
"ignored_tasks": [
54+
"vtr_reg_qor_chain_large"
55+
]
56+
},
57+
{
58+
"name": "vtr_reg_nightly_test4",
59+
"ignored_tasks": []
60+
},
61+
{
62+
"name": "vtr_reg_nightly_test5",
63+
"ignored_tasks": [
64+
"vpr_noc_mlp_odin_ii",
65+
"vpr_3d_noc_star_topology",
66+
"vpr_3d_noc_nearest_neighbor_topology",
67+
"vpr_3d_noc_clique_topology"
68+
]
69+
},
70+
{
71+
"name": "vtr_reg_nightly_test6",
72+
"ignored_tasks": []
73+
},
74+
{
75+
"name": "vtr_reg_nightly_test7",
76+
"ignored_tasks": [
77+
"vtr_reg_qor_large_depop_run_flat",
78+
"vtr_reg_qor_large_run_flat",
79+
"verify_router_lookahead_run_flat"
80+
]
81+
}
82+
]}

0 commit comments

Comments
 (0)