Merge branch 'master' into api_make_edges_switch_ids

Author: Muhammad Haris Zafar

vpr/src/device/rr_graph_builder.h

@@ -103,6 +103,24 @@ class RRGraphBuilder {
         node_storage_.set_node_direction(id, new_direction);
     }
 
+    /** @brief Reserve the lists of edges to be memory efficient.
+     * This function is mainly used to reserve memory space inside RRGraph,
+     * when adding a large number of edges in order to avoid memory fragements */
+    inline void reserve_edges(size_t num_edges) {
+        node_storage_.reserve_edges(num_edges);
+    }
+
+    /** @brief emplace_back_edge; It add one edge. This method is efficient if reserve_edges was called with
+     * the number of edges present in the graph. */
+    inline void emplace_back_edge(RRNodeId src, RRNodeId dest, short edge_switch) {
+        node_storage_.emplace_back_edge(src, dest, edge_switch);
+    }
+
+    /** @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) {
+        node_storage_.alloc_and_load_edges(rr_edges_to_create);
+    }
+
     /** @brief set_node_cost_index gets the index of cost data in the list of cost_indexed_data data structure
      * It contains the routing cost for different nodes in the RRGraph
      * when used in evaluate different routing paths
@@ -127,6 +145,11 @@ class RRGraphBuilder {
         node_storage_.remap_rr_node_switch_indices(switch_fanin);
     }
 
+    /** @brief Marks that edge switch values are rr switch indicies*/
+    inline void mark_edges_as_rr_switch_ids() {
+        node_storage_.mark_edges_as_rr_switch_ids();
+    }
+
     /** @brief Counts the number of rr switches needed based on fan in to support mux
      * size dependent switch delays. */
     inline size_t count_rr_switches(
@@ -136,9 +159,13 @@ class RRGraphBuilder {
         return node_storage_.count_rr_switches(num_arch_switches, arch_switch_inf, arch_switch_fanins);
     }
 
-    /** @brief Marks that edge switch values are rr switch indicies*/
-    inline void mark_edges_as_rr_switch_ids() {
-        node_storage_.mark_edges_as_rr_switch_ids();
+    /** brief Validate that edge data is partitioned correctly
+     * @note This function is used to validate the correctness of the routing resource graph in terms
+     * of graph attributes. Strongly recommend to call it when you finish the building a routing resource
+     * graph. If you need more advance checks, which are related to architecture features, you should
+     * consider to use the check_rr_graph() function or build your own check_rr_graph() function. */
+    inline bool validate() const {
+        return node_storage_.validate();
     }
 
     /** @brief Init per node fan-in data.  Should only be called after all edges have

vpr/src/route/rr_graph.cpp

@@ -236,7 +236,7 @@ static void build_rr_chan(RRGraphBuilder& rr_graph_builder,
 
 void uniquify_edges(t_rr_edge_info_set& rr_edges_to_create);
 
-void alloc_and_load_edges(t_rr_graph_storage& L_rr_node,
+void alloc_and_load_edges(RRGraphBuilder& rr_graph_builder,
                           const t_rr_edge_info_set& rr_edges_to_create);
 
 static void alloc_and_load_rr_switch_inf(const int num_arch_switches,
@@ -1178,7 +1178,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
 
             //Create the actual SOURCE->OPIN, IPIN->SINK edges
             uniquify_edges(rr_edges_to_create);
-            alloc_and_load_edges(L_rr_node, rr_edges_to_create);
+            alloc_and_load_edges(rr_graph_builder, rr_edges_to_create);
             rr_edges_to_create.clear();
         }
     }
@@ -1206,7 +1206,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
 
                 //Create the actual OPIN->CHANX/CHANY edges
                 uniquify_edges(rr_edges_to_create);
-                alloc_and_load_edges(L_rr_node, rr_edges_to_create);
+                alloc_and_load_edges(rr_graph_builder, rr_edges_to_create);
                 rr_edges_to_create.clear();
             }
         }
@@ -1228,7 +1228,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
 
                 //Create the actual CHAN->CHAN edges
                 uniquify_edges(rr_edges_to_create);
-                alloc_and_load_edges(L_rr_node, rr_edges_to_create);
+                alloc_and_load_edges(rr_graph_builder, rr_edges_to_create);
                 rr_edges_to_create.clear();
             }
             if (j > 0) {
@@ -1243,7 +1243,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
 
                 //Create the actual CHAN->CHAN edges
                 uniquify_edges(rr_edges_to_create);
-                alloc_and_load_edges(L_rr_node, rr_edges_to_create);
+                alloc_and_load_edges(rr_graph_builder, rr_edges_to_create);
                 rr_edges_to_create.clear();
             }
         }
@@ -1255,7 +1255,7 @@ static std::function<void(t_chan_width*)> alloc_and_load_rr_graph(RRGraphBuilder
         ClockRRGraphBuilder builder(chan_width, grid, &L_rr_node, &rr_graph_builder);
         builder.create_and_append_clock_rr_graph(num_seg_types, &rr_edges_to_create);
         uniquify_edges(rr_edges_to_create);
-        alloc_and_load_edges(L_rr_node, rr_edges_to_create);
+        alloc_and_load_edges(rr_graph_builder, rr_edges_to_create);
         rr_edges_to_create.clear();
         update_chan_width = [builder](t_chan_width* c) {
             builder.update_chan_width(c);
@@ -1685,9 +1685,8 @@ void uniquify_edges(t_rr_edge_info_set& rr_edges_to_create) {
     rr_edges_to_create.erase(std::unique(rr_edges_to_create.begin(), rr_edges_to_create.end()), rr_edges_to_create.end());
 }
 
-void alloc_and_load_edges(t_rr_graph_storage& L_rr_node,
-                          const t_rr_edge_info_set& rr_edges_to_create) {
-    L_rr_node.alloc_and_load_edges(&rr_edges_to_create);
+void alloc_and_load_edges(RRGraphBuilder& rr_graph_builder, const t_rr_edge_info_set& rr_edges_to_create) {
+    rr_graph_builder.alloc_and_load_edges(&rr_edges_to_create);
 }
 
 /* allocate pin to track map for each segment type individually and then combine into a single

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -872,7 +872,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
      * </xs:complexType>
      */
     inline void preallocate_rr_edges_edge(void*& /*ctx*/, size_t size) final {
-        rr_nodes_->reserve_edges(size);
+        rr_graph_builder_->reserve_edges(size);
         if (read_edge_metadata_) {
             rr_edge_metadata_->reserve(size);
         }
@@ -891,7 +891,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
             bind.set_ignore();
         }
 
-        rr_nodes_->emplace_back_edge(RRNodeId(src_node), RRNodeId(sink_node), switch_id);
+        rr_graph_builder_->emplace_back_edge(RRNodeId(src_node), RRNodeId(sink_node), switch_id);
         return bind;
     }
     inline void finish_rr_edges_edge(MetadataBind& bind) final {