Skip to content

Commit d5dc37d

Browse files
author
Nathan Shreve
committed
Cleaned a few function calls
1 parent 2cc04ca commit d5dc37d

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

vpr/src/route/route_common.h

+18-9
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,15 @@ void add_node_to_heap(
191191
float backward_path_delay,
192192
float backward_path_congestion,
193193
float R_upstream) {
194-
t_heap* hptr = prepare_to_add_node_to_heap(
195-
heap,
196-
rr_node_route_inf, inode, total_cost,
197-
prev_edge, backward_path_cost, backward_path_delay,
198-
backward_path_congestion, R_upstream);
194+
t_heap* hptr = prepare_to_add_node_to_heap(heap,
195+
rr_node_route_inf,
196+
inode,
197+
total_cost,
198+
prev_edge,
199+
backward_path_cost,
200+
backward_path_delay,
201+
backward_path_congestion,
202+
R_upstream);
199203
if (hptr) {
200204
heap->add_to_heap(hptr);
201205
}
@@ -215,10 +219,15 @@ void push_back_node(
215219
float backward_path_delay,
216220
float backward_path_congestion,
217221
float R_upstream) {
218-
t_heap* hptr = prepare_to_add_node_to_heap(
219-
heap,
220-
rr_node_route_inf, inode, total_cost, prev_edge,
221-
backward_path_cost, backward_path_delay, backward_path_congestion, R_upstream);
222+
t_heap* hptr = prepare_to_add_node_to_heap(heap,
223+
rr_node_route_inf,
224+
inode,
225+
total_cost,
226+
prev_edge,
227+
backward_path_cost,
228+
backward_path_delay,
229+
backward_path_congestion,
230+
R_upstream);
222231
if (hptr) {
223232
heap->push_back(hptr);
224233
}

vpr/src/route/route_tree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ class RouteTree {
366366
const t_conn_cost_params cost_params,
367367
const Netlist<>& net_list,
368368
const ParentNetId& net_id,
369-
const int itry);
369+
const int itry = -1);
370370

371371
/** Reload timing values (R_upstream, C_downstream, Tdel).
372372
* Can take a RouteTreeNode& to do an incremental update.

vpr/src/route/router_delay_profiling.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool RouterDelayProfiler::calculate_delay(RRNodeId source_node,
128128
router_.get_router_lookahead(),
129129
cost_params,
130130
net_list_,
131-
conn_params.net_id_, 0);
131+
conn_params.net_id_);
132132

133133
//find delay
134134
*net_delay = rt_node_of_sink->Tdel;
@@ -225,7 +225,7 @@ vtr::vector<RRNodeId, float> calculate_all_path_delays_from_rr_node(RRNodeId src
225225
router.get_router_lookahead(),
226226
cost_params,
227227
net_list,
228-
conn_params.net_id_, 0);
228+
conn_params.net_id_);
229229

230230
VTR_ASSERT(rt_node_of_sink->inode == RRNodeId(sink_rr_node));
231231

vpr/test/test_connection_router.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static float do_one_route(RRNodeId source_node,
9494
router.get_router_lookahead(),
9595
cost_params,
9696
net_list,
97-
conn_params.net_id_, 0);
97+
conn_params.net_id_);
9898
delay = rt_node_of_sink.value().Tdel;
9999
}
100100

vtr_flow/scripts/profiling_utils/parse_lookahead_data.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1391,8 +1391,7 @@ def main():
13911391
q = deque()
13921392
for func, params in gv.processes:
13931393
while len(q) >= args.j:
1394-
proc = q.popleft()
1395-
proc.join()
1394+
q.popleft().join()
13961395

13971396
proc = Process(target=func, args=params)
13981397
proc.start()

0 commit comments

Comments
 (0)