From 37c6973b611224be61192614a5f9612bb73e567c Mon Sep 17 00:00:00 2001 From: AlexandreSinger Date: Thu, 16 May 2024 16:24:34 -0400 Subject: [PATCH 1/2] [CI] Made the Regression Tests Error on Warning To prevent warnings from showing up in the build in the future, made the CI error on any warnings during the regression tests. It looks like VPR originally had the ability to error on warning; however, it was specific to only VPR. This CMAKE method will now work for all executables compiled during the tests. May want to consider removing it in the future. --- .github/workflows/test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab4d0f9bf25..00072c99461 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -184,17 +184,17 @@ jobs: include: [ { name: 'Basic', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on', suite: 'vtr_reg_basic' }, { name: 'Basic_odin', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_basic_odin' }, { name: 'Basic with NO_GRAPHICS', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off', suite: 'vtr_reg_basic' }, { @@ -204,32 +204,32 @@ jobs: }, { name: 'Basic with CAPNPROTO disabled', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off', suite: 'vtr_reg_basic' }, { name: 'Basic with VTR_ENABLE_DEBUG_LOGGING', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on', suite: 'vtr_reg_basic' }, { name: 'Basic_odin with VTR_ENABLE_DEBUG_LOGGING', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', + 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', suite: 'vtr_reg_basic_odin' }, { name: 'Strong', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on', suite: 'vtr_reg_strong' }, { name: 'Strong_odin', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_strong_odin' }, { name: 'Valgrind Memory', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', + params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', suite: 'vtr_reg_valgrind_small' } ] From 6b89d28606a9eda683e3a6a51c320eca9caae2a8 Mon Sep 17 00:00:00 2001 From: AlexandreSinger Date: Fri, 24 May 2024 19:30:32 -0400 Subject: [PATCH 2/2] [Warnings] Fixed Unused Variable Warning in Connection Router --- vpr/src/route/connection_router.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vpr/src/route/connection_router.cpp b/vpr/src/route/connection_router.cpp index 8277f6b20cd..9badc59d8f4 100644 --- a/vpr/src/route/connection_router.cpp +++ b/vpr/src/route/connection_router.cpp @@ -1126,15 +1126,10 @@ static inline void update_router_stats(RouterStats* router_stats, } #ifdef VTR_ENABLE_DEBUG_LOGGING - const auto& device_ctx = g_vpr_ctx.device(); auto node_type = rr_graph->node_type(rr_node_id); VTR_ASSERT(node_type != NUM_RR_TYPES); - t_physical_tile_type_ptr physical_type = device_ctx.grid.get_physical_type({rr_graph->node_xlow(rr_node_id), - rr_graph->node_ylow(rr_node_id), - rr_graph->node_layer(rr_node_id)}); - if (is_inter_cluster_node(*rr_graph, - rr_node_id)) { + if (is_inter_cluster_node(*rr_graph, rr_node_id)) { if (is_push) { router_stats->inter_cluster_node_pushes++; router_stats->inter_cluster_node_type_cnt_pushes[node_type]++; @@ -1142,7 +1137,6 @@ static inline void update_router_stats(RouterStats* router_stats, router_stats->inter_cluster_node_pops++; router_stats->inter_cluster_node_type_cnt_pops[node_type]++; } - } else { if (is_push) { router_stats->intra_cluster_node_pushes++;