get_bb_from_scratch_() accepts use_ts as its argument

Author: soheilshahrouz

vpr/src/place/net_cost_handler.cpp

@@ -260,10 +260,7 @@ std::pair<double, double> NetCostHandler::comp_cube_bb_cost_(e_cost_methods meth
             /* Small nets don't use incremental updating on their bounding boxes, *
              * so they can use a fast bounding box calculator.                    */
             if (cluster_ctx.clb_nlist.net_sinks(net_id).size() >= SMALL_NET && method == e_cost_methods::NORMAL) {
-                get_bb_from_scratch_(net_id,
-                                     bb_coords_[net_id],
-                                     bb_num_on_edges_[net_id],
-                                     num_sink_pin_layer_[size_t(net_id)]);
+                get_bb_from_scratch_(net_id, /*use_ts=*/false);
             } else {
                 get_non_updatable_cube_bb_(net_id, /*use_ts=*/false);
             }
@@ -580,7 +577,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
     //TODO: account for multiple physical pin instances per logical pin
     const t_bb *curr_bb_edge, *curr_bb_coord;
 
-    auto& device_ctx = g_vpr_ctx.device();
+    const auto& device_ctx = g_vpr_ctx.device();
 
     const int num_layers = device_ctx.grid.get_num_layers();
 
@@ -618,7 +615,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
 
         if (pin_old_loc.x == curr_bb_coord->xmax) { /* Old position at xmax. */
             if (curr_bb_edge->xmax == 1) {
-                get_bb_from_scratch_(net_id, bb_coord_new, bb_edge_new, num_sink_pin_layer_new);
+                get_bb_from_scratch_(net_id, /*use_ts=*/true);
                 bb_update_status_[net_id] = NetUpdateState::GOT_FROM_SCRATCH;
                 return;
             } else {
@@ -650,7 +647,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
 
         if (pin_old_loc.x == curr_bb_coord->xmin) { /* Old position at xmin. */
             if (curr_bb_edge->xmin == 1) {
-                get_bb_from_scratch_(net_id, bb_coord_new, bb_edge_new, num_sink_pin_layer_new);
+                get_bb_from_scratch_(net_id, /*use_ts=*/true);
                 bb_update_status_[net_id] = NetUpdateState::GOT_FROM_SCRATCH;
                 return;
             } else {
@@ -691,7 +688,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
 
         if (pin_old_loc.y == curr_bb_coord->ymax) { /* Old position at ymax. */
             if (curr_bb_edge->ymax == 1) {
-                get_bb_from_scratch_(net_id, bb_coord_new, bb_edge_new, num_sink_pin_layer_new);
+                get_bb_from_scratch_(net_id, /*use_ts=*/true);
                 bb_update_status_[net_id] = NetUpdateState::GOT_FROM_SCRATCH;
                 return;
             } else {
@@ -723,7 +720,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
 
         if (pin_old_loc.y == curr_bb_coord->ymin) { /* Old position at ymin. */
             if (curr_bb_edge->ymin == 1) {
-                get_bb_from_scratch_(net_id, bb_coord_new, bb_edge_new, num_sink_pin_layer_new);
+                get_bb_from_scratch_(net_id, /*use_ts=*/true);
                 bb_update_status_[net_id] = NetUpdateState::GOT_FROM_SCRATCH;
                 return;
             } else {
@@ -773,7 +770,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
         if (pin_new_loc.layer_num < pin_old_loc.layer_num) {
             if (pin_old_loc.layer_num == curr_bb_coord->layer_max) {
                 if (curr_bb_edge->layer_max == 1) {
-                    get_bb_from_scratch_(net_id, bb_coord_new, bb_edge_new, num_sink_pin_layer_new);
+                    get_bb_from_scratch_(net_id, /*use_ts=*/true);
                     bb_update_status_[net_id] = NetUpdateState::GOT_FROM_SCRATCH;
                     return;
                 } else {
@@ -799,7 +796,7 @@ void NetCostHandler::update_bb_(ClusterNetId net_id,
         } else if (pin_new_loc.layer_num > pin_old_loc.layer_num) {
             if (pin_old_loc.layer_num == curr_bb_coord->layer_min) {
                 if (curr_bb_edge->layer_min == 1) {
-                    get_bb_from_scratch_(net_id, bb_coord_new, bb_edge_new, num_sink_pin_layer_new);
+                    get_bb_from_scratch_(net_id, /*use_ts=*/true);
                     bb_update_status_[net_id] = NetUpdateState::GOT_FROM_SCRATCH;
                     return;
                 } else {
@@ -1180,15 +1177,16 @@ static void add_block_to_bb(const t_physical_tile_loc& new_pin_loc,
     }
 }
 
-void NetCostHandler::get_bb_from_scratch_(ClusterNetId net_id,
-                                          t_bb& coords,
-                                          t_bb& num_on_edges,
-                                          vtr::NdMatrixProxy<int, 1> num_sink_pin_layer) {
+void NetCostHandler::get_bb_from_scratch_(ClusterNetId net_id, bool use_ts) {
     const auto& cluster_ctx = g_vpr_ctx.clustering();
     const auto& device_ctx = g_vpr_ctx.device();
     const auto& grid = device_ctx.grid;
     const auto& blk_loc_registry = placer_state_.blk_loc_registry();
 
+    t_bb& coords = use_ts ? ts_bb_coord_new_[net_id] : bb_coords_[net_id];
+    t_bb& num_on_edges = use_ts ? ts_bb_edge_new_[net_id] : bb_num_on_edges_[net_id];
+    vtr::NdMatrixProxy<int, 1> num_sink_pin_layer = use_ts ? ts_layer_sink_pin_count_[(size_t)net_id] : num_sink_pin_layer_[(size_t)net_id];
+
     // get the source pin's location
     ClusterPinId source_pin_id = cluster_ctx.clb_nlist.net_pin(net_id, 0);
     t_physical_tile_loc source_pin_loc = blk_loc_registry.get_coordinate_of_pin(source_pin_id);

vpr/src/place/net_cost_handler.h

@@ -342,14 +342,9 @@ class NetCostHandler {
      * It updates both the coordinate and number of pins on each edge information. It should only be called when the bounding box
      * information is not valid.
      * @param net_id ID of the net which the moving pin belongs to
-     * @param coords Bounding box coordinates of the net. It is calculated in this function
-     * @param num_on_edges Net's number of blocks on the edges of the bounding box. It is calculated in this function.
-     * @param num_sink_pin_layer Net's number of sinks on each layer, calculated in this function.
+     * @param use_ts Specifies whether the `ts` bounding box is updated or the actual one.
      */
-    void get_bb_from_scratch_(ClusterNetId net_id,
-                              t_bb& coords,
-                              t_bb& num_on_edges,
-                              vtr::NdMatrixProxy<int, 1> num_sink_pin_layer);
+    void get_bb_from_scratch_(ClusterNetId net_id, bool use_ts);
 
     /**
      * @brief Calculate the per-layer BB of a large net from scratch and update coord, edge, and num_sink_pin_layer data structures.