Changes reverted for validate()

Author: behzadmehmood-rs

vpr/src/route/rr_node.cpp

@@ -21,13 +21,10 @@ 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 : rr_graph.edges(RRNodeId(id_))) {
-        if (edge < rr_graph.num_configurable_edges(RRNodeId(id_))) {
+    for (auto edge : edges()) {
+        if (edge < num_configurable_edges()) {
             if (!edge_is_configurable(edge)) {
                 VPR_FATAL_ERROR(VPR_ERROR_ROUTE, "RR Node non-configurable edge found in configurable edge list");
             }
@@ -39,7 +36,7 @@ bool t_rr_node::validate() const {
         ++iedge;
     }
 
-    if (iedge != rr_graph.num_edges(RRNodeId(id_))) {
+    if (iedge != num_edges()) {
         VPR_FATAL_ERROR(VPR_ERROR_ROUTE, "RR Node Edge iteration does not match edge size");
     }
 

vpr/src/route/rr_node_impl.h

@@ -71,6 +71,18 @@ inline t_rr_node t_rr_graph_storage::back() {
     return t_rr_node(this, RRNodeId(size() - 1));
 }
 
+inline t_edge_size t_rr_node::num_edges() const {
+     return storage_->num_edges(id_);
+}
+
+inline edge_idx_range t_rr_node::edges() const {
+     return storage_->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;