move is_net_fully_absorbed to route_utils.h

Author: w0lek

vpr/src/draw/search_bar.cpp

@@ -21,6 +21,7 @@
 #include "vtr_log.h"
 
 #include "vpr_utils.h"
+#include "route_utils.h"
 
 #include "globals.h"
 #include "draw.h"
@@ -42,29 +43,6 @@
 
 extern std::string rr_highlight_message;
 
-bool is_net_fully_absorbed(AtomNetId atomic_net_id) {
-    const RRGraphView& rr_graph = g_vpr_ctx.device().rr_graph;
-    RoutingContext& route_ctx = g_vpr_ctx.mutable_routing();
-
-    bool is_absorbed = true;
-
-    t_trace* head = TracebackCompat::traceback_from_route_tree(route_ctx.route_trees[atomic_net_id].value());
-    t_trace* tptr = head;
-    while (tptr != nullptr) {
-        RRNodeId inode = RRNodeId(tptr->index);
-        e_rr_type rr_type = rr_graph.node_type(inode);
-
-        if (rr_type == e_rr_type::CHANX || rr_type == e_rr_type::CHANY) {
-            is_absorbed = false;
-            break;
-        }
-        tptr = tptr->next;
-    }
-    free_traceback(head);
-
-    return is_absorbed;
-}
-
 void search_and_highlight(GtkWidget* /*widget*/, ezgl::application* app) {
     auto& device_ctx = g_vpr_ctx.device();
     auto& cluster_ctx = g_vpr_ctx.clustering();
@@ -191,7 +169,7 @@ void search_and_highlight(GtkWidget* /*widget*/, ezgl::application* app) {
                 app->refresh_drawing();
                 return;
             }
-            if (!route_ctx.net_status.is_routed(atomic_net_id)) {
+            if (!route_ctx.net_status.is_routed(atom_net_id)) {
                 warning_dialog_box("Net is unrouted");
                 app->refresh_drawing();
                 return;

vpr/src/draw/search_bar.h

@@ -16,8 +16,6 @@
 
 #include "ezgl/application.hpp"
 
-bool is_net_fully_absorbed(AtomNetId atomic_net_id);
-
 void search_and_highlight(GtkWidget* /*widget*/, ezgl::application* app);
 bool highlight_rr_nodes(RRNodeId hit_node);
 void auto_zoom_rr_node(RRNodeId rr_node_id);

vpr/src/route/route_utils.cpp

@@ -673,3 +673,22 @@ void update_router_info_and_check_bp(bp_router_type type, int net_id) {
     }
 }
 #endif
+
+bool is_net_fully_absorbed(ParentNetId net_id) {
+    const RRGraphView& rr_graph = g_vpr_ctx.device().rr_graph;
+    const RoutingContext& route_ctx = g_vpr_ctx.routing();
+
+    bool is_absorbed = true;
+
+    for (auto& rt_node : route_ctx.route_trees[net_id].value().all_nodes()) {
+        RRNodeId inode = rt_node.inode;
+
+        e_rr_type rr_type = rr_graph.node_type(inode);
+
+        if (rr_type == e_rr_type::CHANX || rr_type == e_rr_type::CHANY) {
+            is_absorbed = false;
+            break;
+        }
+    }
+    return is_absorbed;
+}

vpr/src/route/route_utils.h

@@ -157,3 +157,6 @@ void update_draw_pres_fac(const float new_pres_fac);
  * Stops after the specified router iteration or net id is encountered */
 void update_router_info_and_check_bp(bp_router_type type, int net_id);
 #endif
+
+
+bool is_net_fully_absorbed(ParentNetId net_id);