Skip to content

Commit 86491fd

Browse files
committed
[vpr][pack] remove redundant parameters
1 parent 2468e8a commit 86491fd

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

vpr/src/pack/cluster_router.cpp

+5-9
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ static t_lb_trace* find_node_in_rt(t_lb_trace* rt, int rt_index);
109109
static void reset_explored_node_tb(t_lb_router_data* router_data);
110110
static void save_and_reset_lb_route(t_lb_router_data* router_data);
111111
static void load_trace_to_pb_route(t_pb_routes& pb_route,
112-
const int total_pins,
113112
const AtomNetId net_id,
114113
const int prev_pin_id,
115114
const t_lb_trace* trace,
@@ -549,17 +548,14 @@ bool try_intra_lb_route(t_lb_router_data* router_data,
549548
* Accessor Functions
550549
******************************************************************************************/
551550

552-
/* Creates an array [0..num_pb_graph_pins-1] lookup for intra-logic block routing. Given pb_graph_pin id for clb, lookup atom net that uses that pin.
553-
* If pin is not used, stores OPEN at that pin location */
554551
t_pb_routes alloc_and_load_pb_route(const std::vector<t_intra_lb_net>* intra_lb_nets,
555552
t_logical_block_type_ptr logic_block_type,
556553
const IntraLbPbPinLookup& intra_lb_pb_pin_lookup) {
557554
const std::vector<t_intra_lb_net>& lb_nets = *intra_lb_nets;
558-
int total_pins = logic_block_type->pb_graph_head->total_pb_pins;
559555
t_pb_routes pb_route;
560556

561-
for (int inet = 0; inet < (int)lb_nets.size(); inet++) {
562-
load_trace_to_pb_route(pb_route, total_pins, lb_nets[inet].atom_net_id, OPEN, lb_nets[inet].rt_tree, logic_block_type, intra_lb_pb_pin_lookup);
557+
for (const auto& lb_net : lb_nets) {
558+
load_trace_to_pb_route(pb_route, lb_net.atom_net_id, OPEN, lb_net.rt_tree, logic_block_type, intra_lb_pb_pin_lookup);
563559
}
564560

565561
return pb_route;
@@ -591,7 +587,6 @@ void free_intra_lb_nets(std::vector<t_intra_lb_net>* intra_lb_nets) {
591587

592588
/* Recurse through route tree trace to populate pb pin to atom net lookup array */
593589
static void load_trace_to_pb_route(t_pb_routes& pb_route,
594-
const int total_pins,
595590
const AtomNetId net_id,
596591
const int prev_pin_id,
597592
const t_lb_trace* trace,
@@ -600,21 +595,22 @@ static void load_trace_to_pb_route(t_pb_routes& pb_route,
600595
int ipin = trace->current_node;
601596
int driver_pb_pin_id = prev_pin_id;
602597
int cur_pin_id = OPEN;
598+
const int total_pins = logic_block_type->pb_graph_head->total_pb_pins;
603599
if (ipin < total_pins) {
604600
/* This routing node corresponds with a pin. This node is virtual (ie. sink or source node) */
605601
cur_pin_id = ipin;
606602
if (!pb_route.count(ipin)) {
607603
pb_route.insert(std::make_pair(cur_pin_id, t_pb_route()));
608604
pb_route[cur_pin_id].atom_net_id = net_id;
609605
pb_route[cur_pin_id].driver_pb_pin_id = driver_pb_pin_id;
610-
auto pb_graph_pin = intra_lb_pb_pin_lookup.pb_gpin(logic_block_type->index, cur_pin_id);
606+
const t_pb_graph_pin* pb_graph_pin = intra_lb_pb_pin_lookup.pb_gpin(logic_block_type->index, cur_pin_id);
611607
pb_route[cur_pin_id].pb_graph_pin = pb_graph_pin;
612608
} else {
613609
VTR_ASSERT(pb_route[cur_pin_id].atom_net_id == net_id);
614610
}
615611
}
616612
for (int itrace = 0; itrace < (int)trace->next_nodes.size(); itrace++) {
617-
load_trace_to_pb_route(pb_route, total_pins, net_id, cur_pin_id, &trace->next_nodes[itrace], logic_block_type, intra_lb_pb_pin_lookup);
613+
load_trace_to_pb_route(pb_route, net_id, cur_pin_id, &trace->next_nodes[itrace], logic_block_type, intra_lb_pb_pin_lookup);
618614
}
619615
}
620616

0 commit comments

Comments
 (0)