Added non_configurable_edges() API

Author: behzadmehmood-rs

vpr/src/device/rr_graph_view.h

@@ -259,11 +259,16 @@ class RRGraphView {
         return node_storage_.num_non_configurable_edges(node);
     }
 
-    /** @brief Get ID range for edges. This function is inlined for runtime optimization. */
+    /** @brief Get ID range for configurable edges. This function is inlined for runtime optimization. */
     inline edge_idx_range configurable_edges(RRNodeId node) const {
         return node_storage_.configurable_edges(node);
     }
 
+    /** @brief Get ID range for non-configurable edges. This function is inlined for runtime optimization. */
+    inline edge_idx_range non_configurable_edges(RRNodeId node) const {
+        return node_storage_.non_configurable_edges(node);
+    }
+
     /** @brief Get ID range for edges. This function is inlined for runtime optimization. */
     inline edge_idx_range edges(RRNodeId node) const {
         return node_storage_.edges(node);

vpr/src/route/check_rr_graph.cpp

@@ -191,7 +191,7 @@ void check_rr_graph(const t_graph_type graph_type,
             }
         }
 
-        for (auto edge : device_ctx.rr_nodes[inode].non_configurable_edges()) {
+        for (auto edge : rr_graph.non_configurable_edges(RRNodeId(inode))) {
             if (device_ctx.rr_nodes[inode].edge_is_configurable(edge)) {
                 VPR_FATAL_ERROR(VPR_ERROR_ROUTE, "in check_rr_graph: node %d edge %d is configurable, but in non-configurable edges",
                                 inode, edge);

vpr/src/route/route_common.cpp

@@ -627,7 +627,8 @@ static std::pair<t_trace*, t_trace*> add_trace_non_configurable_recurr(int node,
     //Record the non-configurable out-going edges
     std::vector<t_edge_size> unvisited_non_configurable_edges;
     auto& device_ctx = g_vpr_ctx.device();
-    for (auto iedge : device_ctx.rr_nodes[node].non_configurable_edges()) {
+    const auto& rr_graph = device_ctx.rr_graph;
+    for (auto iedge : rr_graph.non_configurable_edges(RRNodeId(node))) {
         VTR_ASSERT_SAFE(!device_ctx.rr_nodes[node].edge_is_configurable(iedge));
 
         int to_node = device_ctx.rr_nodes[node].edge_sink_node(iedge);

vpr/src/route/route_tree_timing.cpp

@@ -418,7 +418,7 @@ static t_rt_node* add_non_configurable_to_route_tree(const int rr_node, const bo
                 VTR_ASSERT(rt_node->inode == rr_node);
             }
         }
-        for (int iedge : device_ctx.rr_nodes[rr_node].non_configurable_edges()) {
+        for (int iedge : rr_graph.non_configurable_edges(RRNodeId(rr_node))) {
             //Recursive case: expand children
             VTR_ASSERT(!device_ctx.rr_nodes[rr_node].edge_is_configurable(iedge));
 

vpr/src/route/rr_node_impl.h

@@ -71,10 +71,6 @@ inline t_rr_node t_rr_graph_storage::back() {
     return t_rr_node(this, RRNodeId(size() - 1));
 }
 
-inline edge_idx_range t_rr_node::non_configurable_edges() const {
-    return storage_->non_configurable_edges(id_);
-}
-
 inline int t_rr_node::edge_sink_node(t_edge_size iedge) const {
     size_t inode = (size_t)storage_->edge_sink_node(id_, iedge);
     return inode;