Replaced calls to node.capacity() with

rr_graph.node_capacity(RRNodeId(inode))

Signed-off-by: Ethan Rogers <[email protected]>

Author: ethanroj23

vpr/src/route/route_tree_timing.cpp

@@ -1276,13 +1276,14 @@ static void print_node_inf(const t_rt_node* rt_node) {
 
 static void print_node_congestion(const t_rt_node* rt_node) {
     auto& device_ctx = g_vpr_ctx.device();
+    const auto& rr_graph = device_ctx.rr_graph;
     auto& route_ctx = g_vpr_ctx.routing();
 
     int inode = rt_node->inode;
     const auto& node_inf = route_ctx.rr_node_route_inf[inode];
-    const auto& node = device_ctx.rr_nodes[inode];
+    const short& node_capacity = rr_graph.node_capacity(RRNodeId(inode));
     VTR_LOG("%2d %2d|%-6d-> ", node_inf.acc_cost, rt_node->Tdel,
-            node_inf.occ(), node.capacity(), inode);
+            node_inf.occ(), node_capacity, inode);
 }
 
 void print_route_tree_inf(const t_rt_node* rt_root) {

vpr/src/route/route_util.cpp

@@ -61,22 +61,23 @@ vtr::Matrix<float> calculate_routing_avail(t_rr_type rr_type) {
     vtr::Matrix<float> avail({{device_ctx.grid.width(), device_ctx.grid.height()}}, 0.);
     for (size_t inode = 0; inode < device_ctx.rr_nodes.size(); ++inode) {
         auto& rr_node = device_ctx.rr_nodes[inode];
+        const short& rr_node_capacity = rr_graph.node_capacity(RRNodeId(inode));
 
         if (rr_graph.node_type(RRNodeId(inode)) == CHANX && rr_type == CHANX) {
             VTR_ASSERT(rr_graph.node_type(RRNodeId(inode)) == CHANX);
             VTR_ASSERT(rr_node.ylow() == rr_node.yhigh());
 
             int y = rr_node.ylow();
             for (int x = rr_node.xlow(); x <= rr_node.xhigh(); ++x) {
-                avail[x][y] += rr_node.capacity();
+                avail[x][y] += rr_node_capacity;
             }
         } else if (rr_graph.node_type(RRNodeId(inode)) == CHANY && rr_type == CHANY) {
             VTR_ASSERT(rr_graph.node_type(RRNodeId(inode)) == CHANY);
             VTR_ASSERT(rr_node.xlow() == rr_node.xhigh());
 
             int x = rr_node.xlow();
             for (int y = rr_node.ylow(); y <= rr_node.yhigh(); ++y) {
-                avail[x][y] += rr_node.capacity();
+                avail[x][y] += rr_node_capacity;
             }
         }
     }

vpr/src/route/router_lookahead_sampling.cpp

@@ -134,7 +134,7 @@ static std::tuple<int, int, int> get_node_info(const t_rr_node& node, int num_se
         return std::tuple<int, int, int>(OPEN, OPEN, OPEN);
     }
 
-    if (node.capacity() == 0 || node.num_edges() == 0) {
+    if (rr_graph.node_capacity(node.id()) == 0 || node.num_edges() == 0) {
         return std::tuple<int, int, int>(OPEN, OPEN, OPEN);
     }
 
@@ -205,7 +205,7 @@ std::vector<SampleRegion> find_sample_regions(int num_segments) {
     std::vector<vtr::Rect<int>> bounding_box_for_segment(num_segments, vtr::Rect<int>());
     for (auto& node : rr_nodes) {
         if (rr_graph.node_type(node.id()) != CHANX && rr_graph.node_type(node.id()) != CHANY) continue;
-        if (node.capacity() == 0 || node.num_edges() == 0) continue;
+        if (rr_graph.node_capacity(node.id()) == 0 || node.num_edges() == 0) continue;
         int seg_index = device_ctx.rr_indexed_data[node.cost_index()].seg_index;
 
         VTR_ASSERT(seg_index != OPEN);

vpr/src/route/rr_graph.cpp

@@ -2483,7 +2483,7 @@ std::string describe_rr_node(int inode) {
         msg += vtr::string_fmt(" class: %d", rr_node.class_num());
     }
 
-    msg += vtr::string_fmt(" capacity: %d", rr_node.capacity());
+    msg += vtr::string_fmt(" capacity: %d", rr_graph.node_capacity(RRNodeId(inode)));
     msg += vtr::string_fmt(" fan-in: %d", rr_node.fan_in());
     msg += vtr::string_fmt(" fan-out: %d", rr_node.num_edges());
 

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -801,7 +801,8 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     }
 
     inline unsigned int get_node_capacity(const t_rr_node& node) final {
-        return node.capacity();
+        const auto& rr_graph = (*rr_graph_);
+        return rr_graph.node_capacity(node.id());
     }
     inline unsigned int get_node_id(const t_rr_node& node) final {
         return size_t(node.id());

vpr/src/route/rr_node.h

@@ -100,7 +100,7 @@ class t_rr_node {
     short yhigh() const;
     signed short length() const;
 
-    short capacity() const;
+    //short capacity() const; // ESR API This function has been replaced by RRGraphView::node_capacity()
 
     short ptc_num() const;
     short pin_num() const;   //Same as ptc_num() but checks that type() is consistent

vpr/src/route/rr_node_impl.h

@@ -123,9 +123,9 @@ inline short t_rr_node::yhigh() const {
     return storage_->node_yhigh(id_);
 }
 
-inline short t_rr_node::capacity() const {
+/*inline short t_rr_node::capacity() const { // no longer used
     return storage_->node_capacity(id_);
-}
+}*/
 
 inline short t_rr_node::ptc_num() const {
     return storage_->node_ptc_num(id_);