implemented intra-cluster routing

Author: SamuelHo10

vpr/src/draw/draw.cpp

@@ -658,7 +658,7 @@ int get_track_num(int inode, const vtr::OffsetMatrix<int>& chanx_track, const vt
  * could be caused by the user clicking on a routing resource, toggled, or
  * fan-in/fan-out of a highlighted node.
  */
-bool draw_if_net_highlighted(ClusterNetId inet) {
+bool draw_if_net_highlighted(ParentNetId inet) {
     t_draw_state* draw_state = get_draw_state_vars();
 
     if (draw_state->net_color[inet] != DEFAULT_RR_NODE_COLOR) {

vpr/src/draw/draw.h

@@ -94,7 +94,7 @@ ezgl::color to_ezgl_color(vtr::Color<float> color);
 /* This helper function determines whether a net has been highlighted. The highlighting
  * could be caused by the user clicking on a routing resource, toggled, or
  * fan-in/fan-out of a highlighted node. */
-bool draw_if_net_highlighted(ClusterNetId inet);
+bool draw_if_net_highlighted(ParentNetId inet);
 std::vector<RRNodeId> trace_routed_connection_rr_nodes(
     ClusterNetId net_id,
     int driver_pin,

vpr/src/draw/draw_basic.cpp

@@ -569,24 +569,20 @@ void drawroute(enum e_draw_net_type draw_net_type, ezgl::renderer* g) {
 
 void draw_routed_net(ParentNetId net_id, ezgl::renderer* g) {
     auto& route_ctx = g_vpr_ctx.routing();
-    auto& cluster_ctx = g_vpr_ctx.clustering();
 
     t_draw_state* draw_state = get_draw_state_vars();
 
-    if (cluster_ctx.clb_nlist.net_is_ignored(convert_to_cluster_net_id(net_id))) /* Don't draw. */
-        return;
-
     if (!route_ctx.route_trees[net_id]) // No routing -> Skip. (Allows me to draw partially complete routes)
         return;
 
     std::vector<RRNodeId> rr_nodes_to_draw;
     for (auto& rt_node : route_ctx.route_trees[net_id].value().all_nodes()) {
         RRNodeId inode = rt_node.inode;
 
-        if (draw_if_net_highlighted(convert_to_cluster_net_id(net_id))) {
+        if (draw_if_net_highlighted(net_id)) {
             /* If a net has been highlighted, highlight the whole net in *
              * the same color.											 */
-            draw_state->draw_rr_node[inode].color = draw_state->net_color[convert_to_cluster_net_id(net_id)];
+            draw_state->draw_rr_node[inode].color = draw_state->net_color[net_id];
             draw_state->draw_rr_node[inode].node_highlighted = true;
         } else {
             /* If not highlighted, draw the node in default color. */
@@ -676,12 +672,35 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
 
             g->set_color(color, edge_visibility.alpha);
             g->draw_line(p1, p2);
+            g->draw_text(p1, blk_id_pin_id1.second->parent_node->pb_type->name, 50, 0.5 * 20);
 
             continue;
         }
 
         if (!is_inode_inter_cluster || !is_prev_node_inter_cluster) {
+            bool swap = false;
+            if (!is_inode_inter_cluster && is_prev_node_inter_cluster) {
+                //Swap the nodes so that the inter-cluster node is always the current node
+                std::swap(inode, prev_node);
+                swap = true;
+            }
+
+            auto blk_id_pin_id = get_rr_node_cluster_blk_id_pb_graph_pin(prev_node);
+            float x1, y1;
+            ezgl::point2d p2 = draw_coords->get_absolute_pin_location(blk_id_pin_id.first, blk_id_pin_id.second);
+            
+
+            for (const e_side& pin_side : TOTAL_2D_SIDES) {
+                if (!rr_graph.is_node_on_specific_side(RRNodeId(inode), pin_side)) {
+                    continue;
+                }
+                draw_get_rr_pin_coords(inode, &x1, &y1, pin_side);
+                g->set_color(color, edge_visibility.alpha);
+                g->draw_line({x1, y1}, p2);
+            }
+
             continue;
+
         }
 
         auto iedge = find_edge(prev_node, inode);

vpr/src/draw/draw_searchbar.cpp

@@ -131,40 +131,60 @@ void draw_highlight_blocks_color(t_logical_block_type_ptr type,
 /* If an rr_node has been clicked on, it will be highlighted in MAGENTA.
  * If so, and toggle nets is selected, highlight the whole net in that colour.
  */
-void highlight_nets(char* message, RRNodeId hit_node, bool is_flat) {
+void highlight_net(char* message, RRNodeId hit_node) {
     auto& cluster_ctx = g_vpr_ctx.clustering();
+    auto& atom_ctx = g_vpr_ctx.atom();
     auto& route_ctx = g_vpr_ctx.routing();
 
     /* Don't crash if there's no routing */
     if (route_ctx.route_trees.empty())
         return;
 
+    if (route_ctx.is_flat){
+        for (auto net_id : atom_ctx.netlist().nets()){
+            check_node_highlight_net(message, net_id, hit_node);
+        } 
+
+    } else{
+        for (auto net_id : cluster_ctx.clb_nlist.nets()) {
+            check_node_highlight_net(message, net_id, hit_node);
+        }
+    }
+    
+    application.update_message(message);
+}
+
+void check_node_highlight_net(char* message, ParentNetId parent_id, 
+                   RRNodeId hit_node) {
+    auto& route_ctx = g_vpr_ctx.routing();
     t_draw_state* draw_state = get_draw_state_vars();
 
-    for (auto net_id : cluster_ctx.clb_nlist.nets()) {
-        ParentNetId parent_id = get_cluster_net_parent_id(g_vpr_ctx.atom().lookup(), net_id, is_flat);
-        if (!route_ctx.route_trees[parent_id])
-            continue;
+    if (!route_ctx.route_trees[parent_id])
+        return;
 
-        for (auto& rt_node : route_ctx.route_trees[parent_id].value().all_nodes()) {
-            RRNodeId inode = rt_node.inode;
-            if (draw_state->draw_rr_node[inode].color == ezgl::MAGENTA) {
-                draw_state->net_color[net_id] = draw_state->draw_rr_node[inode].color;
-                if (inode == hit_node) {
-                    std::string orig_msg(message);
-                    sprintf(message, "%s  ||  Net: %zu (%s)", orig_msg.c_str(),
-                            size_t(net_id),
-                            cluster_ctx.clb_nlist.net_name(net_id).c_str());
+    for (auto& rt_node : route_ctx.route_trees[parent_id].value().all_nodes()) {
+        RRNodeId inode = rt_node.inode;
+        if (draw_state->draw_rr_node[inode].color == ezgl::MAGENTA) {
+            draw_state->net_color[parent_id] = draw_state->draw_rr_node[inode].color;
+            if (inode == hit_node) {
+                std::string orig_msg(message);
+                std::string net_name;                 
+                if(!route_ctx.is_flat){
+                    net_name = g_vpr_ctx.clustering().clb_nlist.net_name(convert_to_cluster_net_id(parent_id));
+                } else {
+                    net_name = g_vpr_ctx.atom().netlist().net_name(convert_to_atom_net_id(parent_id));
                 }
-            } else if (draw_state->draw_rr_node[inode].color
-                       == ezgl::WHITE) {
-                // If node is de-selected.
-                draw_state->net_color[net_id] = ezgl::BLACK;
-                break;
+                sprintf(message, "%s  ||  Net: %zu (%s)", orig_msg.c_str(),
+                        size_t(parent_id),
+                        net_name.c_str());
             }
+        } else if (draw_state->draw_rr_node[inode].color
+                    == ezgl::WHITE) {
+            // If node is de-selected.
+            draw_state->net_color[parent_id] = ezgl::BLACK;
+            break;
         }
     }
-    application.update_message(message);
 }
 
 /* If an rr_node has been clicked on, it will be either highlighted in MAGENTA,

vpr/src/draw/draw_searchbar.h

@@ -28,7 +28,11 @@ void draw_highlight_blocks_color(t_logical_block_type_ptr type, ClusterBlockId b
 
 /* If an rr_node has been clicked on, it will be highlighted in MAGENTA.
  * If so, and toggle nets is selected, highlight the whole net in that colour.*/
-void highlight_nets(char* message, RRNodeId hit_node, bool is_flat);
+void highlight_net(char* message, RRNodeId hit_node);
+
+/* Checks if a node is part of a net, and highlights the net if it is. */
+void check_node_highlight_net(char* message, ParentNetId parent_id, 
+                   RRNodeId hit_node);
 
 /* If an rr_node has been clicked on, it will be either highlighted in MAGENTA,
  * or de-highlighted in WHITE. If highlighted, and toggle_rr is selected, highlight

vpr/src/draw/draw_types.cpp

@@ -164,7 +164,7 @@ ezgl::point2d t_draw_coords::get_absolute_pin_location( const ClusterBlockId clb
 
     float interval = pb_bbox.width() / (num_pins + 1);
 
-    return ezgl::point2d(interval * (num_pin + 1), 0.01 *this->tile_width) + pb_bbox.top_left();
+    return ezgl::point2d(interval * (num_pin + 1), -0.01 *this->tile_width) + pb_bbox.top_left();
 }
 
 ezgl::rectangle t_draw_coords::get_absolute_clb_bbox(const ClusterBlockId clb_index, const t_logical_block_type_ptr block_type) {

vpr/src/draw/intra_logic_block.cpp

@@ -198,7 +198,7 @@ void draw_internal_draw_subblk(ezgl::renderer* g) {
 static int draw_internal_find_max_lvl(const t_pb_type& pb_type) {
     int i, j;
     t_mode mode;
-    int max_levels = 0;
+    int max_levels = 1;
 
     /* If pb_type is a primitive, we have reached the end of pb_graph */
     if (pb_type.is_primitive())

vpr/src/draw/search_bar.cpp

@@ -247,7 +247,7 @@ bool highlight_rr_nodes(RRNodeId hit_node) {
     }
 
     if (draw_state->show_nets)
-        highlight_nets(message, hit_node, draw_state->is_flat);
+        highlight_net(message, hit_node);
     else
         application.update_message(message);