Cleaned a few function calls

verilog-to-routing · Aug 15, 2024 · d5dc37d · d5dc37d
1 parent 2cc04ca
commit d5dc37d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/vpr/src/route/route_common.h b/vpr/src/route/route_common.h
@@ -191,11 +191,15 @@ void add_node_to_heap(
     float backward_path_delay,
     float backward_path_congestion,
     float R_upstream) {
-    t_heap* hptr = prepare_to_add_node_to_heap(
-        heap,
-        rr_node_route_inf, inode, total_cost,
-        prev_edge, backward_path_cost, backward_path_delay,
-        backward_path_congestion, R_upstream);
+    t_heap* hptr = prepare_to_add_node_to_heap(heap,
+                                               rr_node_route_inf,
+                                               inode,
+                                               total_cost,
+                                               prev_edge,
+                                               backward_path_cost,
+                                               backward_path_delay,
+                                               backward_path_congestion,
+                                               R_upstream);
     if (hptr) {
         heap->add_to_heap(hptr);
     }
@@ -215,10 +219,15 @@ void push_back_node(
     float backward_path_delay,
     float backward_path_congestion,
     float R_upstream) {
-    t_heap* hptr = prepare_to_add_node_to_heap(
-        heap,
-        rr_node_route_inf, inode, total_cost, prev_edge,
-        backward_path_cost, backward_path_delay, backward_path_congestion, R_upstream);
+    t_heap* hptr = prepare_to_add_node_to_heap(heap,
+                                               rr_node_route_inf,
+                                               inode,
+                                               total_cost,
+                                               prev_edge,
+                                               backward_path_cost,
+                                               backward_path_delay,
+                                               backward_path_congestion,
+                                               R_upstream);
     if (hptr) {
         heap->push_back(hptr);
     }

diff --git a/vpr/src/route/route_tree.h b/vpr/src/route/route_tree.h
@@ -366,7 +366,7 @@ class RouteTree {
                      const t_conn_cost_params cost_params,
                      const Netlist<>& net_list,
                      const ParentNetId& net_id,
-                     const int itry);
+                     const int itry = -1);
 
     /** Reload timing values (R_upstream, C_downstream, Tdel).
      * Can take a RouteTreeNode& to do an incremental update.

diff --git a/vpr/src/route/router_delay_profiling.cpp b/vpr/src/route/router_delay_profiling.cpp
@@ -128,7 +128,7 @@ bool RouterDelayProfiler::calculate_delay(RRNodeId source_node,
                                                                        router_.get_router_lookahead(),
                                                                        cost_params,
                                                                        net_list_,
-                                                                       conn_params.net_id_, 0);
+                                                                       conn_params.net_id_);
 
         //find delay
         *net_delay = rt_node_of_sink->Tdel;
@@ -225,7 +225,7 @@ vtr::vector<RRNodeId, float> calculate_all_path_delays_from_rr_node(RRNodeId src
                                                                            router.get_router_lookahead(),
                                                                            cost_params,
                                                                            net_list,
-                                                                           conn_params.net_id_, 0);
+                                                                           conn_params.net_id_);
 
             VTR_ASSERT(rt_node_of_sink->inode == RRNodeId(sink_rr_node));
 

diff --git a/vpr/test/test_connection_router.cpp b/vpr/test/test_connection_router.cpp
@@ -94,7 +94,7 @@ static float do_one_route(RRNodeId source_node,
                                                                        router.get_router_lookahead(),
                                                                        cost_params,
                                                                        net_list,
-                                                                       conn_params.net_id_, 0);
+                                                                       conn_params.net_id_);
         delay = rt_node_of_sink.value().Tdel;
     }
 

diff --git a/vtr_flow/scripts/profiling_utils/parse_lookahead_data.py b/vtr_flow/scripts/profiling_utils/parse_lookahead_data.py
@@ -1391,8 +1391,7 @@ def main():
     q = deque()
     for func, params in gv.processes:
         while len(q) >= args.j:
-            proc = q.popleft()
-            proc.join()
+            q.popleft().join()
 
         proc = Process(target=func, args=params)
         proc.start()