[vpr][place] ts_nets_to_update now uses size() instead of num_nets

Author: Yulang Luo

vpr/src/place/net_cost_handler.cpp

@@ -140,11 +140,10 @@ static void update_td_delta_costs(const PlaceDelayModel* delay_model,
                                   bool is_src_moving);
 
 /**
- * @brief if "net" is not already stored as an affected net, mark it in ts_nets_to_update and increment num_affected_nets
+ * @brief if "net" is not already stored as an affected net, mark it in ts_nets_to_update and increment the size ofts_nets_to_update.
  * @param net ID of a net affected by a move
- * @param num_affected_nets Incremented if this is a new net affected, and returned via reference.
  */
-static void record_affected_net(const ClusterNetId net, int& num_affected_nets);
+static void record_affected_net(const ClusterNetId net);
 
 /**
  * @brief Call suitable function based on the bounding box type to update the bounding box of the net connected to pin_id. Also,
@@ -157,7 +156,6 @@ static void record_affected_net(const ClusterNetId net, int& num_affected_nets);
  * @param moving_blk_inf Data structure that holds information, e.g., old location and new locatoin, about all moving blocks
  * @param affected_pins Netlist pins which are affected, in terms placement cost, by the proposed move.
  * @param timing_delta_c Timing cost change based on the proposed move
- * @param num_affected_nets A pointer to the first free element of ts_nets_to_update. If a new net is added, the pointer should be increamented.
  * @param is_src_moving Is the moving pin the source of a net.
  */
 static void update_net_info_on_pin_move(const t_place_algorithm& place_algorithm,
@@ -168,7 +166,6 @@ static void update_net_info_on_pin_move(const t_place_algorithm& place_algorithm
                                                const t_pl_moved_block& moving_blk_inf,
                                                std::vector<ClusterPinId>& affected_pins,
                                                double& timing_delta_c,
-                                               int& num_affected_nets,
                                                bool is_src_moving);
 
 /**
@@ -446,10 +443,9 @@ static double wirelength_crossing_count(size_t fanout);
 /**
  * @brief Calculates and returns the total bb (wirelength) cost change that would result from moving the blocks 
  * indicated in the blocks_affected data structure.
- * @param num_affected_nets Number of valid elements in ts_bb_coord_new 
  * @param bb_delta_c Cost difference after and before moving the block
  */
-static void set_bb_delta_cost(const int num_affected_nets, double& bb_delta_c);
+static void set_bb_delta_cost(double& bb_delta_c);
 
 /******************************* End of Function definitions ************************************/
 
@@ -642,13 +638,14 @@ static void update_td_delta_costs(const PlaceDelayModel* delay_model,
 }
 
 ///@brief Record effected nets.
-static void record_affected_net(const ClusterNetId net,
-                                int& num_affected_nets) {
+static void record_affected_net(const ClusterNetId net) {
     /* Record effected nets. */
     if (proposed_net_cost[net] < 0.) {
         /* Net not marked yet. */
-        ts_nets_to_update[num_affected_nets] = net;
-        num_affected_nets++;
+        size_t last_size = ts_nets_to_update.size();
+        VTR_ASSERT(last_size < ts_nets_to_update.capacity());
+        ts_nets_to_update.resize(last_size + 1);
+        ts_nets_to_update[last_size] = net;
 
         /* Flag to say we've marked this net. */
         proposed_net_cost[net] = 1.;
@@ -663,7 +660,6 @@ static void update_net_info_on_pin_move(const t_place_algorithm& place_algorithm
                                                const t_pl_moved_block& moving_blk_inf,
                                                std::vector<ClusterPinId>& affected_pins,
                                                double& timing_delta_c,
-                                               int& num_affected_nets,
                                                bool is_src_moving) {
     const auto& cluster_ctx = g_vpr_ctx.clustering();
     const ClusterNetId net_id = cluster_ctx.clb_nlist.pin_net(pin_id);
@@ -677,7 +673,7 @@ static void update_net_info_on_pin_move(const t_place_algorithm& place_algorithm
     }
 
     /* Record effected nets */
-    record_affected_net(net_id, num_affected_nets);
+    record_affected_net(net_id);
 
     const auto& cube_bb = g_vpr_ctx.placement().cube_bb;
 
@@ -1852,8 +1848,8 @@ static double wirelength_crossing_count(size_t fanout) {
     }
 }
 
-static void set_bb_delta_cost(const int num_affected_nets, double& bb_delta_c) {
-    for (int inet_affected = 0; inet_affected < num_affected_nets;
+static void set_bb_delta_cost(double& bb_delta_c) {
+    for (size_t inet_affected = 0; inet_affected < ts_nets_to_update.size();
          inet_affected++) {
         ClusterNetId net_id = ts_nets_to_update[inet_affected];
         const auto& cube_bb = g_vpr_ctx.placement().cube_bb;
@@ -1871,7 +1867,7 @@ static void set_bb_delta_cost(const int num_affected_nets, double& bb_delta_c) {
     }
 }
 
-int find_affected_nets_and_update_costs(
+void find_affected_nets_and_update_costs(
     const t_place_algorithm& place_algorithm,
     const PlaceDelayModel* delay_model,
     const PlacerCriticalities* criticalities,
@@ -1882,7 +1878,7 @@ int find_affected_nets_and_update_costs(
     VTR_ASSERT_SAFE(timing_delta_c == 0.);
     auto& clb_nlist = g_vpr_ctx.clustering().clb_nlist;
 
-    int num_affected_nets = 0;
+    ts_nets_to_update.resize(0);
 
     /* Go through all the blocks moved. */
     for (int iblk = 0; iblk < blocks_affected.num_moved_blocks; iblk++) {
@@ -1907,16 +1903,13 @@ int find_affected_nets_and_update_costs(
                                         moving_block_inf,
                                         affected_pins,
                                         timing_delta_c,
-                                        num_affected_nets,
                                         is_src_moving);
         }
     }
 
     /* Now update the bounding box costs (since the net bounding     *
      * boxes are up-to-date). The cost is only updated once per net. */
-    set_bb_delta_cost(num_affected_nets, bb_delta_c);
-
-    return num_affected_nets;
+    set_bb_delta_cost(bb_delta_c);
 }
 
 double comp_bb_cost(e_cost_methods method) {
@@ -1997,13 +1990,12 @@ double comp_layer_bb_cost(e_cost_methods method) {
     return cost;
 }
 
-void update_move_nets(int num_nets_affected,
-                      const bool cube_bb) {
+void update_move_nets(const bool cube_bb) {
     /* update net cost functions and reset flags. */
     auto& cluster_ctx = g_vpr_ctx.clustering();
     auto& place_move_ctx = g_placer_ctx.mutable_move();
 
-    for (int inet_affected = 0; inet_affected < num_nets_affected;
+    for (size_t inet_affected = 0; inet_affected < ts_nets_to_update.size();
          inet_affected++) {
         ClusterNetId net_id = ts_nets_to_update[inet_affected];
 
@@ -2033,9 +2025,9 @@ void update_move_nets(int num_nets_affected,
     }
 }
 
-void reset_move_nets(int num_nets_affected) {
+void reset_move_nets() {
     /* Reset the net cost function flags first. */
-    for (int inet_affected = 0; inet_affected < num_nets_affected;
+    for (size_t inet_affected = 0; inet_affected < ts_nets_to_update.size();
          inet_affected++) {
         ClusterNetId net_id = ts_nets_to_update[inet_affected];
         proposed_net_cost[net_id] = -1;
@@ -2242,7 +2234,8 @@ void init_try_swap_net_cost_structs(size_t num_nets, bool cube_bb) {
     /*This initialize the whole matrix to OPEN which is an invalid value*/
     ts_layer_sink_pin_count.resize({num_nets, size_t(num_layers)}, OPEN);
 
-    ts_nets_to_update.resize(num_nets, ClusterNetId::INVALID());
+    ts_nets_to_update.reserve(num_nets);
+    ts_nets_to_update.resize(0);
 }
 
 void free_try_swap_net_cost_structs() {

vpr/src/place/net_cost_handler.h

@@ -45,7 +45,7 @@ enum e_cost_methods {
  * @param timing_delta_c
  * @return The number of affected nets.
  */
-int find_affected_nets_and_update_costs(
+void find_affected_nets_and_update_costs(
     const t_place_algorithm& place_algorithm,
     const PlaceDelayModel* delay_model,
     const PlacerCriticalities* criticalities,
@@ -85,14 +85,13 @@ double comp_layer_bb_cost(e_cost_methods method);
  * @param num_nets_affected The number of nets affected by the move. It is used to determine the index up to which elements in ts_nets_to_update are valid.
  * @param cube_bb True if we should use the 3D bounding box (cube_bb), false otherwise.
  */
-void update_move_nets(int num_nets_affected,
-                      const bool cube_bb);
+void update_move_nets(const bool cube_bb);
 
 /**
  * @brief Reset the net cost function flags (proposed_net_cost and bb_updated_before)
  * @param num_nets_affected
  */
-void reset_move_nets(int num_nets_affected);
+void reset_move_nets();
 
 /**
  * @brief re-calculates different terms of the cost function (wire-length, timing, NoC) and update "costs" accordingly. It is important to note that

vpr/src/place/place.cpp

@@ -1378,7 +1378,7 @@ static e_move_result try_swap(const t_annealing_state* state,
         //
         //Also find all the pins affected by the swap, and calculates new connection
         //delays and timing costs and store them in proposed_* data structures.
-        int num_nets_affected = find_affected_nets_and_update_costs(
+        find_affected_nets_and_update_costs(
             place_algorithm, delay_model, criticalities, blocks_affected,
             bb_delta_c, timing_delta_c);
 
@@ -1481,8 +1481,7 @@ static e_move_result try_swap(const t_annealing_state* state,
             }
 
             /* Update net cost functions and reset flags. */
-            update_move_nets(num_nets_affected,
-                             g_vpr_ctx.placement().cube_bb);
+            update_move_nets(g_vpr_ctx.placement().cube_bb);
 
             /* Update clb data structures since we kept the move. */
             commit_move_blocks(blocks_affected);
@@ -1506,7 +1505,7 @@ static e_move_result try_swap(const t_annealing_state* state,
             VTR_ASSERT_SAFE(move_outcome == REJECTED);
 
             /* Reset the net cost function flags first. */
-            reset_move_nets(num_nets_affected);
+            reset_move_nets();
 
             /* Restore the place_ctx.block_locs data structures to their state before the move. */
             revert_move_blocks(blocks_affected);