removed rr_nodes from device

Author: umariqbal-rs

vpr/src/base/vpr_context.h

@@ -147,7 +147,7 @@ struct DeviceContext : public Context {
     /*
      * Structures to define the routing architecture of the FPGA.
      */
-    t_rr_graph_storage rr_nodes; // autogenerated in build_rr_graph
+    //t_rr_graph_storage rr_nodes; // autogenerated in build_rr_graph
 
     vtr::vector<RRIndexedDataId, t_rr_indexed_data> rr_indexed_data; // [0 .. num_rr_indexed_data-1]
 
@@ -168,7 +168,7 @@ struct DeviceContext : public Context {
     /* A read-only view of routing resource graph to be the ONLY database 
      * for client functions: GUI, placer, router, timing analyzer etc.
      */
-    RRGraphView rr_graph{rr_nodes, rr_graph_builder.node_lookup(), rr_indexed_data, rr_graph_builder.rr_segments(), rr_graph_builder.rr_switch()};
+    RRGraphView rr_graph{rr_graph_builder.rr_nodes(), rr_graph_builder.node_lookup(), rr_indexed_data, rr_graph_builder.rr_segments(), rr_graph_builder.rr_switch()};
     int num_arch_switches;
     t_arch_switch_inf* arch_switch_inf; // [0..(num_arch_switches-1)]
 

vpr/src/device/rr_graph_builder.cpp

@@ -58,6 +58,7 @@ void RRGraphBuilder::add_node_to_all_locs(RRNodeId node) {
 
 void RRGraphBuilder::clear() {
     node_lookup_.clear();
+    node_storage_.clear();
     rr_segments_.clear();
     rr_switch_inf_.clear();
 }

vpr/src/device/rr_graph_builder.h

@@ -182,6 +182,11 @@ class RRGraphBuilder {
     inline void emplace_back_edge(RRNodeId src, RRNodeId dest, short edge_switch) {
         node_storage_.emplace_back_edge(src, dest, edge_switch);
     }
+    inline void emplace_back() {
+        // No edges can be assigned if mutating the rr node array.
+
+        node_storage_.emplace_back();
+    }
 
     /** @brief alloc_and_load_edges; It adds a batch of edges.  */
     inline void alloc_and_load_edges(const t_rr_edge_info_set* rr_edges_to_create) {

vpr/src/route/clock_connection_builders.cpp

@@ -91,11 +91,11 @@ void RoutingToClockConnection::create_switches(const ClockRRGraphBuilder& clock_
 
 RRNodeId RoutingToClockConnection::create_virtual_clock_network_sink_node(int x, int y) {
     auto& device_ctx = g_vpr_ctx.mutable_device();
-    auto& rr_graph = device_ctx.rr_nodes;
+    //auto& rr_graph = device_ctx.rr_nodes;
     //auto& temp_rr_graph = device_ctx.rr_graph; //  replace this with rr_graph once device_ctx.rr_nodes is unused
     auto& rr_graph_builder = device_ctx.rr_graph_builder;
     auto& node_lookup = device_ctx.rr_graph_builder.node_lookup();
-    rr_graph.emplace_back();
+    rr_graph_builder.emplace_back();
     RRNodeId node_index = RRNodeId(device_ctx.rr_graph.num_nodes() - 1);
 
     //Determine the a valid PTC
@@ -119,8 +119,8 @@ RRNodeId RoutingToClockConnection::create_virtual_clock_network_sink_node(int x,
 
     // Use a generic way when adding nodes to lookup.
     // However, since the SINK node has the same xhigh/xlow as well as yhigh/ylow, we can probably use a shortcut
-    for (int ix = rr_graph.node_xlow(node_index); ix <= rr_graph.node_xhigh(node_index); ++ix) {
-        for (int iy = rr_graph.node_ylow(node_index); iy <= rr_graph.node_yhigh(node_index); ++iy) {
+    for (int ix = device_ctx.rr_graph.node_xlow(node_index); ix <= device_ctx.rr_graph.node_xhigh(node_index); ++ix) {
+        for (int iy = device_ctx.rr_graph.node_ylow(node_index); iy <= device_ctx.rr_graph.node_yhigh(node_index); ++iy) {
             node_lookup.add_node(node_index, ix, iy, device_ctx.rr_graph.node_type(node_index), device_ctx.rr_graph.node_class_num(node_index));
         }
     }

vpr/src/route/rr_graph.cpp

@@ -1405,7 +1405,7 @@ void free_rr_graph() {
 
     device_ctx.read_rr_graph_filename.clear();
 
-    device_ctx.rr_nodes.clear();
+    //device_ctx.rr_nodes.clear();
 
     device_ctx.rr_graph_builder.clear();