@@ -684,7 +684,7 @@ static void build_rr_graph(const t_graph_type graph_type,
684
684
int * wire_to_rr_ipin_switch,
685
685
bool is_flat,
686
686
int * Warnings,
687
- const t_router_opts& router_opts );
687
+ const int route_verbosity );
688
688
689
689
static void build_intra_cluster_rr_graph (const t_graph_type graph_type,
690
690
const DeviceGrid& grid,
@@ -788,8 +788,7 @@ void create_rr_graph(const t_graph_type graph_type,
788
788
&det_routing_arch->wire_to_rr_ipin_switch ,
789
789
is_flat,
790
790
Warnings,
791
- router_opts
792
- );
791
+ router_opts.route_verbosity );
793
792
}
794
793
}
795
794
@@ -1016,7 +1015,7 @@ static void build_rr_graph(const t_graph_type graph_type,
1016
1015
int * wire_to_rr_ipin_switch,
1017
1016
bool is_flat,
1018
1017
int * Warnings,
1019
- const t_router_opts& router_opts ) {
1018
+ const int route_verbosity ) {
1020
1019
vtr::ScopedStartFinishTimer timer (" Build routing resource graph" );
1021
1020
1022
1021
/* Reset warning flag */
@@ -1416,7 +1415,7 @@ static void build_rr_graph(const t_graph_type graph_type,
1416
1415
is_global_graph,
1417
1416
clock_modeling,
1418
1417
is_flat,
1419
- router_opts. route_verbosity );
1418
+ route_verbosity);
1420
1419
1421
1420
// Verify no incremental node allocation.
1422
1421
// AA: Note that in the case of dedicated networks, we are currently underestimating the additional node count due to the clock networks.
@@ -2123,9 +2122,6 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2123
2122
the edges are not remapped yet.*/
2124
2123
bool switches_remapped = false ;
2125
2124
2126
- // Define verbosity locally using router_opts
2127
- const int verbosity = route_verbosity;
2128
-
2129
2125
int num_edges = 0 ;
2130
2126
/* Connection SINKS and SOURCES to their pins - Initializing IPINs/OPINs. */
2131
2127
for (int layer = 0 ; layer < grid.get_num_layers (); ++layer) {
@@ -2171,7 +2167,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2171
2167
}
2172
2168
}
2173
2169
2174
- VTR_LOGV (verbosity > 1 ," SOURCE->OPIN and IPIN->SINK edge count:%d\n " , num_edges);
2170
+ VTR_LOGV (route_verbosity > 1 ," SOURCE->OPIN and IPIN->SINK edge count:%d\n " , num_edges);
2175
2171
num_edges = 0 ;
2176
2172
/* Build opins */
2177
2173
int rr_edges_before_directs = 0 ;
@@ -2208,8 +2204,8 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2208
2204
}
2209
2205
}
2210
2206
2211
- VTR_LOGV (verbosity > 1 ," OPIN->CHANX/CHANY edge count before creating direct connections: %d\n " , rr_edges_before_directs);
2212
- VTR_LOGV (verbosity > 1 ," OPIN->CHANX/CHANY edge count after creating direct connections: %d\n " , num_edges);
2207
+ VTR_LOGV (route_verbosity > 1 ," OPIN->CHANX/CHANY edge count before creating direct connections: %d\n " , rr_edges_before_directs);
2208
+ VTR_LOGV (route_verbosity > 1 ," OPIN->CHANX/CHANY edge count after creating direct connections: %d\n " , num_edges);
2213
2209
2214
2210
num_edges = 0 ;
2215
2211
/* Build channels */
@@ -2296,7 +2292,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
2296
2292
}
2297
2293
2298
2294
2299
- VTR_LOGV (verbosity > 1 ," CHAN->CHAN type edge count:%d\n " , num_edges);
2295
+ VTR_LOGV (route_verbosity > 1 ," CHAN->CHAN type edge count:%d\n " , num_edges);
2300
2296
2301
2297
num_edges = 0 ;
2302
2298
std::function<void (t_chan_width*)> update_chan_width = [](t_chan_width*) noexcept {};
0 commit comments