RRGraphView edges(), num_edges(), configurable_edges(), non_configurable_edges(), num_configurable_edges(), num_non_configurable_edges() Implementation

vpr/src/device/rr_graph_view.h

@@ -249,6 +249,10 @@ class RRGraphView {
         return node_storage_.node_side_string(node);
     }
 
+    inline t_edge_size num_configurable_edges(RRNodeId node) const {
+        return node_storage_.num_configurable_edges(node);
+    }
+
     /** @brief Get the cost index of a routing resource node. This function is inlined for runtime optimization. */
     RRIndexedDataId node_cost_index(RRNodeId node) const {
         return node_storage_.node_cost_index(node);

vpr/src/route/rr_node.cpp

@@ -2,6 +2,7 @@
 #include "rr_graph_storage.h"
 #include "globals.h"
 #include "vpr_error.h"
+#include "rr_graph.h"
 
 //Returns the max 'length' over the x or y direction
 short t_rr_node::length() const {
@@ -20,9 +21,13 @@ bool t_rr_node::edge_is_configurable(t_edge_size iedge) const {
 
 bool t_rr_node::validate() const {
     //Check internal assumptions about RR node are valid
+    auto& device_ctx = g_vpr_ctx.device();
+
+    const auto& rr_graph = device_ctx.rr_graph;
+
     t_edge_size iedge = 0;
     for (auto edge : edges()) {
-        if (edge < num_configurable_edges()) {
+        if (edge < rr_graph.num_configurable_edges(RRNodeId(id_))) {
             if (!edge_is_configurable(edge)) {
                 VPR_FATAL_ERROR(VPR_ERROR_ROUTE, "RR Node non-configurable edge found in configurable edge list");
             }

vpr/src/route/rr_node_impl.h

@@ -90,10 +90,6 @@ inline t_edge_size t_rr_node::num_non_configurable_edges() const {
     return storage_->num_non_configurable_edges(id_);
 }
 
-inline t_edge_size t_rr_node::num_configurable_edges() const {
-    return storage_->num_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;