changed hit nodes to set

Author: SamuelHo10

vpr/src/draw/draw.cpp

@@ -190,9 +190,9 @@ static void draw_main_canvas(ezgl::renderer* g) {
 
     if (draw_state->pic_on_screen == PLACEMENT) {
         if (draw_state->draw_nets == DRAW_FLYLINES && draw_state->show_nets) {
-            drawnets(g);
+            draw_flylines_placement(g);
         }
-    } else { /* ROUTING on screen */
+    } else { // ROUTING on screen
 
         if (draw_state->show_nets && draw_state->draw_nets == DRAW_ROUTED_NETS) {
             draw_route(ALL_NETS, g);
@@ -564,7 +564,6 @@ void init_draw_coords(float clb_width, const BlkLocRegistry& blk_loc_registry) {
         for (RRNodeId inode : rr_graph.nodes()) {
             draw_state->draw_rr_node[inode].color = DEFAULT_RR_NODE_COLOR;
             draw_state->draw_rr_node[inode].node_highlighted = false;
-            draw_state->draw_rr_node[inode].node_hit = false;
         }
     }
     draw_coords->set_tile_width(clb_width);

vpr/src/draw/draw_basic.cpp

@@ -196,7 +196,7 @@ void drawplace(ezgl::renderer* g) {
 /* This routine draws the nets on the placement.  The nets have not *
  * yet been routed, so we just draw a chain showing a possible path *
  * for each net.  This gives some idea of future congestion.        */
-void drawnets(ezgl::renderer* g) {
+void draw_flylines_placement(ezgl::renderer* g) {
     t_draw_state* draw_state = get_draw_state_vars();
     t_draw_coords* draw_coords = get_draw_coords_vars();
     const ClusteringContext& cluster_ctx = g_vpr_ctx.clustering();
@@ -616,14 +616,16 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
 
         bool inter_cluster_node = is_inter_cluster_node(rr_graph, inode);
 
-        // skip drawing INTER-cluster nets if the user has disabled them
-        if (inter_cluster_node && !draw_state->draw_inter_cluster_nets) {
-            continue;
-        }
+        if(!(draw_state->draw_rr_node[inode].node_highlighted && draw_state->highlight_fan_in_fan_out)){
+            // skip drawing INTER-cluster nets if the user has disabled them
+            if (inter_cluster_node && !draw_state->draw_inter_cluster_nets) {
+                continue;
+            }
 
-        // skip drawing INTRA-cluster nets if the user has disabled them
-        if (!inter_cluster_node && !draw_state->draw_intra_cluster_nets) {
-            continue;
+            // skip drawing INTRA-cluster nets if the user has disabled them
+            if (!inter_cluster_node && !draw_state->draw_intra_cluster_nets) {
+                continue;
+            }
         }
 
         draw_rr_node(inode, color, g);
@@ -636,14 +638,16 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
         bool inter_cluster_node = is_inter_cluster_node(rr_graph, inode);
         bool prev_inter_cluster_node = is_inter_cluster_node(rr_graph, prev_node);
 
-        // If this is an edge between two inter-cluster nodes, draw only if the user has enabled inter-cluster nets
-        if ((inter_cluster_node && prev_inter_cluster_node) && !draw_state->draw_inter_cluster_nets) {
-            continue;
-        }
+        if(!(draw_state->draw_rr_node[inode].node_highlighted && draw_state->highlight_fan_in_fan_out)){
+            // If this is an edge between two inter-cluster nodes, draw only if the user has enabled inter-cluster nets
+            if ((inter_cluster_node && prev_inter_cluster_node) && !draw_state->draw_inter_cluster_nets) {
+                continue;
+            }
 
-        // If this is an edge containing an intra-cluster node, draw only if the user has enabled intra-cluster nets
-        if ((!inter_cluster_node || !prev_inter_cluster_node) && !draw_state->draw_intra_cluster_nets) {
-            continue;
+            // If this is an edge containing an intra-cluster node, draw only if the user has enabled intra-cluster nets
+            if ((!inter_cluster_node || !prev_inter_cluster_node) && !draw_state->draw_intra_cluster_nets) {
+                continue;
+            }
         }
 
         // avoid highlighting edge unless both nodes are highlighted

vpr/src/draw/draw_basic.h

@@ -32,7 +32,7 @@ void drawplace(ezgl::renderer* g);
 /* This routine draws the nets on the placement.  The nets have not *
  * yet been routed, so we just draw a chain showing a possible path *
  * for each net.  This gives some idea of future congestion.        */
-void drawnets(ezgl::renderer* g);
+void draw_flylines_placement(ezgl::renderer* g);
 
 /* Draws all the overused routing resources (i.e. congestion) in various contrasting colors showing congestion ratio.  */
 void draw_congestion(ezgl::renderer* g);

vpr/src/draw/draw_rr.cpp

@@ -332,12 +332,13 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
             color = ezgl::MAGENTA;
         }
 
-        // If the node is highlighted, color the edges as blue for fanin and red for fanout
+        // If the node is clicked on, color the edges as blue for fanin and red for fanout
+        // Need to check both highlighting and hit nodes since when the user clicks off a node, the node is de-highlighted but still in the hit nodes.
         if (draw_state->highlight_rr_edges) {
-            if (draw_state->draw_rr_node[inode].node_hit) {
+            if (draw_state->draw_rr_node[inode].node_highlighted && draw_state->hit_nodes.find(inode) != draw_state->hit_nodes.end()) {
                 color = draw_state->draw_rr_node[to_node].color;
                 draw_edge = true;
-            } else if (draw_state->draw_rr_node[to_node].node_hit) {
+            } else if (draw_state->draw_rr_node[to_node].node_highlighted && draw_state->hit_nodes.find(to_node) != draw_state->hit_nodes.end()) {
                 color = draw_state->draw_rr_node[inode].color;
                 draw_edge = true;
             }

vpr/src/draw/draw_searchbar.cpp

@@ -73,15 +73,22 @@ void draw_highlight_blocks_color(t_logical_block_type_ptr type,
                                  ClusterBlockId blk_id) {
     t_draw_state* draw_state = get_draw_state_vars();
     const ClusteringContext& cluster_ctx = g_vpr_ctx.clustering();
+    const AtomLookup& atom_lookup = g_vpr_ctx.atom().lookup();
     const auto& block_locs = draw_state->get_graphics_blk_loc_registry_ref().block_locs();
 
     for (int k = 0; k < type->pb_type->num_pins; k++) { /* Each pin on a CLB */
-        ClusterNetId net_id = cluster_ctx.clb_nlist.block_net(blk_id, k);
+        ClusterNetId cluster_net_id = cluster_ctx.clb_nlist.block_net(blk_id, k);
 
-        if (net_id == ClusterNetId::INVALID()) {
+        if (cluster_net_id == ClusterNetId::INVALID()) {
             continue;
         }
 
+        // Convert to atom net id if flat routing is enabled
+        ParentNetId net_id = cluster_net_id;
+        if (draw_state->is_flat){
+            net_id = atom_lookup.atom_net(cluster_net_id);
+        }
+
         t_pl_loc block_loc = block_locs[blk_id].loc;
         auto physical_tile = physical_tile_type(block_loc);
         int physical_pin = get_physical_pin(physical_tile, type, k);
@@ -92,14 +99,14 @@ void draw_highlight_blocks_color(t_logical_block_type_ptr type,
             if (draw_state->block_color(blk_id) == SELECTED_COLOR) {
                 /* If block already highlighted, de-highlight the fanout. (the deselect case)*/
                 draw_state->net_color[net_id] = ezgl::BLACK;
-                for (auto pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
+                for (auto pin_id : cluster_ctx.clb_nlist.net_sinks(cluster_net_id)) {
                     ClusterBlockId fanblk = cluster_ctx.clb_nlist.pin_block(pin_id);
                     draw_reset_blk_color(fanblk);
                 }
             } else {
                 /* Highlight the fanout */
                 draw_state->net_color[net_id] = DRIVES_IT_COLOR;
-                for (auto pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
+                for (auto pin_id : cluster_ctx.clb_nlist.net_sinks(cluster_net_id)) {
                     ClusterBlockId fanblk = cluster_ctx.clb_nlist.pin_block(pin_id);
                     draw_state->set_block_color(fanblk, DRIVES_IT_COLOR);
                 }
@@ -108,12 +115,12 @@ void draw_highlight_blocks_color(t_logical_block_type_ptr type,
             if (draw_state->block_color(blk_id) == SELECTED_COLOR) {
                 /* If block already highlighted, de-highlight the fanin. (the deselect case)*/
                 draw_state->net_color[net_id] = ezgl::BLACK;
-                ClusterBlockId fanblk = cluster_ctx.clb_nlist.net_driver_block(net_id); /* DRIVER to net */
+                ClusterBlockId fanblk = cluster_ctx.clb_nlist.net_driver_block(cluster_net_id); /* DRIVER to net */
                 draw_reset_blk_color(fanblk);
             } else {
                 /* Highlight the fanin */
                 draw_state->net_color[net_id] = DRIVEN_BY_IT_COLOR;
-                ClusterBlockId fanblk = cluster_ctx.clb_nlist.net_driver_block(net_id); /* DRIVER to net */
+                ClusterBlockId fanblk = cluster_ctx.clb_nlist.net_driver_block(cluster_net_id); /* DRIVER to net */
                 draw_state->set_block_color(fanblk, DRIVEN_BY_IT_COLOR);
             }
         }
@@ -271,7 +278,6 @@ void deselect_all() {
     for (RRNodeId inode : device_ctx.rr_graph.nodes()) {
         draw_state->draw_rr_node[inode].color = DEFAULT_RR_NODE_COLOR;
         draw_state->draw_rr_node[inode].node_highlighted = false;
-        draw_state->draw_rr_node[inode].node_hit = false;
     }
     get_selected_sub_block_info().clear();
 }

vpr/src/draw/draw_types.h

@@ -140,23 +140,16 @@ typedef struct {
     bool* toggle_state;
 } t_checkbox_data;
 
-/* Structure which stores state information of a rr_node. Used
- * for controling the drawing each rr_node when ROUTING is on screen.
- * color: Color of the rr_node
- * node_highlighted: Whether the node is highlighted. Useful for
- *					 highlighting routing resources on rr_graph
- */
+
 /**
  * @brief Structure used to store the state information of an rr_node. 
  * Used to control drawing each rr_node when ROUTING is on screen.
  * color: Color of the rr_node
  * node_highlighted: Whether the node is highlighted. Useful for highlighting routing resources on rr_graph.
- * node_hit: Whether the node is hit by a mouse click. Required since multiple RR nodes can be clicked on at the same time.
  */
 typedef struct {
     ezgl::color color;
     bool node_highlighted;
-    bool node_hit;
 } t_draw_rr_node;
 
 /**
@@ -276,6 +269,9 @@ struct t_draw_state {
     ///@brief color in which each net should be drawn. [0..cluster_ctx.clb_nlist.nets().size()-1]
     vtr::vector<ParentNetId, ezgl::color> net_color;
 
+    ///@brief RR Nodes which the user has clicked on.
+    std::set<RRNodeId> hit_nodes;
+
     /**
      * @brief stores the state information of each routing resource.
      * 

vpr/src/draw/search_bar.cpp

@@ -224,19 +224,18 @@ bool highlight_rr_nodes(RRNodeId hit_node) {
             // If the node hasn't been clicked on before, highlight it in magenta.
             draw_state->draw_rr_node[node].color = ezgl::MAGENTA;
             draw_state->draw_rr_node[node].node_highlighted = true;
-            draw_state->draw_rr_node[node].node_hit = true;
-
         } else {
             //Using white color to represent de-highlighting (or de-selecting) of node.
             draw_state->draw_rr_node[node].color = ezgl::WHITE;
             draw_state->draw_rr_node[node].node_highlighted = false;
-            draw_state->draw_rr_node[node].node_hit = false;
         }
 
         //Print info about all nodes to terminal including neighboring non-configurable nodes
         VTR_LOG("%s\n", describe_rr_node(device_ctx.rr_graph, device_ctx.grid, device_ctx.rr_indexed_data, node, draw_state->is_flat).c_str());
     }
 
+    draw_state->hit_nodes = nodes;
+
     //Show info about *only* hit node to graphics
     std::string info = describe_rr_node(device_ctx.rr_graph, device_ctx.grid, device_ctx.rr_indexed_data, hit_node, draw_state->is_flat);
     sprintf(message, "Selected %s", info.c_str());