@@ -180,6 +180,7 @@ static int get_opin_direct_connections(RRGraphBuilder& rr_graph_builder,
180
180
static std::function<void (t_chan_width*)> alloc_and_load_rr_graph (RRGraphBuilder& rr_graph_builder,
181
181
t_rr_graph_storage& L_rr_node,
182
182
const RRGraphView& rr_graph,
183
+ const t_router_opts& router_opts,
183
184
const int num_seg_types,
184
185
const int num_seg_types_x,
185
186
const t_unified_to_parallel_seg_index& seg_index_map,
@@ -642,6 +643,7 @@ static void build_rr_graph(const t_graph_type graph_type,
642
643
const std::vector<t_physical_tile_type>& types,
643
644
const DeviceGrid& grid,
644
645
t_chan_width nodes_per_chan,
646
+ t_router_opts router_opts,
645
647
const enum e_switch_block_type sb_type,
646
648
const int Fs,
647
649
const std::vector<t_switchblock_inf>& switchblocks,
@@ -745,6 +747,7 @@ void create_rr_graph(const t_graph_type graph_type,
745
747
block_types,
746
748
grid,
747
749
nodes_per_chan,
750
+ router_opts,
748
751
det_routing_arch->switch_block_type ,
749
752
det_routing_arch->Fs ,
750
753
det_routing_arch->switchblocks ,
@@ -969,6 +972,7 @@ static void build_rr_graph(const t_graph_type graph_type,
969
972
const std::vector<t_physical_tile_type>& types,
970
973
const DeviceGrid& grid,
971
974
t_chan_width nodes_per_chan,
975
+ t_router_opts router_opts,
972
976
const enum e_switch_block_type sb_type,
973
977
const int Fs,
974
978
const std::vector<t_switchblock_inf>& switchblocks,
@@ -1351,7 +1355,7 @@ static void build_rr_graph(const t_graph_type graph_type,
1351
1355
auto update_chan_width = alloc_and_load_rr_graph (
1352
1356
device_ctx.rr_graph_builder ,
1353
1357
1354
- device_ctx.rr_graph_builder .rr_nodes (), device_ctx.rr_graph , segment_inf.size (),
1358
+ device_ctx.rr_graph_builder .rr_nodes (), device_ctx.rr_graph , router_opts, segment_inf.size (),
1355
1359
segment_inf_x.size (),
1356
1360
segment_index_map,
1357
1361
chan_details_x, chan_details_y,
@@ -2021,6 +2025,7 @@ static std::vector<vtr::Matrix<int>> alloc_and_load_actual_fc(const std::vector<
2021
2025
static std::function<void (t_chan_width*)> alloc_and_load_rr_graph (RRGraphBuilder& rr_graph_builder,
2022
2026
t_rr_graph_storage& L_rr_node,
2023
2027
const RRGraphView& rr_graph,
2028
+ const t_router_opts& router_opts,
2024
2029
const int num_seg_types,
2025
2030
const int num_seg_types_x,
2026
2031
const t_unified_to_parallel_seg_index& seg_index_map,
@@ -2071,6 +2076,9 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2071
2076
the edges are not remapped yet.*/
2072
2077
bool switches_remapped = false ;
2073
2078
2079
+ // Define verbosity locally using router_opts
2080
+ const int verbosity = router_opts.route_verbosity ;
2081
+
2074
2082
int num_edges = 0 ;
2075
2083
/* Connection SINKS and SOURCES to their pins - Initializing IPINs/OPINs. */
2076
2084
for (int layer = 0 ; layer < grid.get_num_layers (); ++layer) {
@@ -2116,7 +2124,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2116
2124
}
2117
2125
}
2118
2126
2119
- VTR_LOG ( " SOURCE->OPIN and IPIN->SINK edge count:%d\n " , num_edges);
2127
+ VTR_LOGV (verbosity > 1 , " SOURCE->OPIN and IPIN->SINK edge count:%d\n " , num_edges);
2120
2128
num_edges = 0 ;
2121
2129
/* Build opins */
2122
2130
int rr_edges_before_directs = 0 ;
@@ -2153,8 +2161,8 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2153
2161
}
2154
2162
}
2155
2163
2156
- VTR_LOG ( " OPIN->CHANX/CHANY edge count before creating direct connections: %d\n " , rr_edges_before_directs);
2157
- VTR_LOG ( " OPIN->CHANX/CHANY edge count after creating direct connections: %d\n " , num_edges);
2164
+ VTR_LOGV (verbosity > 1 , " OPIN->CHANX/CHANY edge count before creating direct connections: %d\n " , rr_edges_before_directs);
2165
+ VTR_LOGV (verbosity > 1 , " OPIN->CHANX/CHANY edge count after creating direct connections: %d\n " , num_edges);
2158
2166
2159
2167
num_edges = 0 ;
2160
2168
/* Build channels */
0 commit comments