Skip to content

Commit 1c6dad6

Browse files
committed
PR update
1 parent 4de5741 commit 1c6dad6

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

vpr/src/route/rr_graph.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ static void build_rr_graph(const t_graph_type graph_type,
684684
int* wire_to_rr_ipin_switch,
685685
bool is_flat,
686686
int* Warnings,
687-
const t_router_opts& router_opts);
687+
const int route_verbosity);
688688

689689
static void build_intra_cluster_rr_graph(const t_graph_type graph_type,
690690
const DeviceGrid& grid,
@@ -788,8 +788,7 @@ void create_rr_graph(const t_graph_type graph_type,
788788
&det_routing_arch->wire_to_rr_ipin_switch,
789789
is_flat,
790790
Warnings,
791-
router_opts
792-
);
791+
router_opts.route_verbosity);
793792
}
794793
}
795794

@@ -1016,7 +1015,7 @@ static void build_rr_graph(const t_graph_type graph_type,
10161015
int* wire_to_rr_ipin_switch,
10171016
bool is_flat,
10181017
int* Warnings,
1019-
const t_router_opts& router_opts) {
1018+
const int route_verbosity) {
10201019
vtr::ScopedStartFinishTimer timer("Build routing resource graph");
10211020

10221021
/* Reset warning flag */
@@ -1416,7 +1415,7 @@ static void build_rr_graph(const t_graph_type graph_type,
14161415
is_global_graph,
14171416
clock_modeling,
14181417
is_flat,
1419-
router_opts.route_verbosity);
1418+
route_verbosity);
14201419

14211420
// Verify no incremental node allocation.
14221421
// 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
21232122
the edges are not remapped yet.*/
21242123
bool switches_remapped = false;
21252124

2126-
// Define verbosity locally using router_opts
2127-
const int verbosity = route_verbosity;
2128-
21292125
int num_edges = 0;
21302126
/* Connection SINKS and SOURCES to their pins - Initializing IPINs/OPINs. */
21312127
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
21712167
}
21722168
}
21732169

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);
21752171
num_edges = 0;
21762172
/* Build opins */
21772173
int rr_edges_before_directs = 0;
@@ -2208,8 +2204,8 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
22082204
}
22092205
}
22102206

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);
22132209

22142210
num_edges = 0;
22152211
/* Build channels */
@@ -2296,7 +2292,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
22962292
}
22972293

22982294

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);
23002296

23012297
num_edges = 0;
23022298
std::function<void(t_chan_width*)> update_chan_width = [](t_chan_width*) noexcept {};

0 commit comments

Comments
 (0)