Skip to content

Commit 9dd5ff6

Browse files
authored
Merge pull request #2555 from AlexandreSinger/feature-ci-error-on-warning
[CI] Made the Regression Tests Error on Warning
2 parents 630be48 + 6b89d28 commit 9dd5ff6

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,17 @@ jobs:
184184
include: [
185185
{
186186
name: 'Basic',
187-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
187+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
188188
suite: 'vtr_reg_basic'
189189
},
190190
{
191191
name: 'Basic_odin',
192-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
192+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
193193
suite: 'vtr_reg_basic_odin'
194194
},
195195
{
196196
name: 'Basic with NO_GRAPHICS',
197-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off',
197+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off',
198198
suite: 'vtr_reg_basic'
199199
},
200200
{
@@ -204,32 +204,32 @@ jobs:
204204
},
205205
{
206206
name: 'Basic with CAPNPROTO disabled',
207-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off',
207+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off',
208208
suite: 'vtr_reg_basic'
209209
},
210210
{
211211
name: 'Basic with VTR_ENABLE_DEBUG_LOGGING',
212-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on',
212+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on',
213213
suite: 'vtr_reg_basic'
214214
},
215215
{
216216
name: 'Basic_odin with VTR_ENABLE_DEBUG_LOGGING',
217-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
217+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
218218
suite: 'vtr_reg_basic_odin'
219219
},
220220
{
221221
name: 'Strong',
222-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
222+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
223223
suite: 'vtr_reg_strong'
224224
},
225225
{
226226
name: 'Strong_odin',
227-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
227+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
228228
suite: 'vtr_reg_strong_odin'
229229
},
230230
{
231231
name: 'Valgrind Memory',
232-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on',
232+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on',
233233
suite: 'vtr_reg_valgrind_small'
234234
}
235235
]

vpr/src/route/connection_router.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,23 +1126,17 @@ static inline void update_router_stats(RouterStats* router_stats,
11261126
}
11271127

11281128
#ifdef VTR_ENABLE_DEBUG_LOGGING
1129-
const auto& device_ctx = g_vpr_ctx.device();
11301129
auto node_type = rr_graph->node_type(rr_node_id);
11311130
VTR_ASSERT(node_type != NUM_RR_TYPES);
1132-
t_physical_tile_type_ptr physical_type = device_ctx.grid.get_physical_type({rr_graph->node_xlow(rr_node_id),
1133-
rr_graph->node_ylow(rr_node_id),
1134-
rr_graph->node_layer(rr_node_id)});
11351131

1136-
if (is_inter_cluster_node(*rr_graph,
1137-
rr_node_id)) {
1132+
if (is_inter_cluster_node(*rr_graph, rr_node_id)) {
11381133
if (is_push) {
11391134
router_stats->inter_cluster_node_pushes++;
11401135
router_stats->inter_cluster_node_type_cnt_pushes[node_type]++;
11411136
} else {
11421137
router_stats->inter_cluster_node_pops++;
11431138
router_stats->inter_cluster_node_type_cnt_pops[node_type]++;
11441139
}
1145-
11461140
} else {
11471141
if (is_push) {
11481142
router_stats->intra_cluster_node_pushes++;

0 commit comments

Comments
 (0)