[vpr][place] rebased all branch and fixed PR comments

Author: Yulang Luo

vpr/src/place/move_transactions.cpp

@@ -1,14 +1,15 @@
 #include "move_utils.h"
 
 #include "globals.h"
+#include "vtr_assert.h"
 
 t_pl_blocks_to_be_moved::t_pl_blocks_to_be_moved(size_t max_blocks){
         moved_blocks.reserve(max_blocks);
         moved_blocks.resize(0);
 }
 
 size_t t_pl_blocks_to_be_moved::get_size_and_increment() {
-    VTR_ASSERT(moved_blocks.size() < moved_blocks.capacity());
+    VTR_ASSERT_SAFE(moved_blocks.size() < moved_blocks.capacity());
     moved_blocks.resize(moved_blocks.size() + 1);
     return moved_blocks.size() - 1;
 }
@@ -49,11 +50,11 @@ void apply_move_blocks(const t_pl_blocks_to_be_moved& blocks_affected) {
 
     //Swap the blocks, but don't swap the nets or update place_ctx.grid_blocks
     //yet since we don't know whether the swap will be accepted
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); ++iblk) {
-        ClusterBlockId blk = blocks_affected.moved_blocks[iblk].block_num;
+    for (const auto& block : blocks_affected.moved_blocks) {
+        ClusterBlockId blk = block.block_num;
 
-        const t_pl_loc& old_loc = blocks_affected.moved_blocks[iblk].old_loc;
-        const t_pl_loc& new_loc = blocks_affected.moved_blocks[iblk].new_loc;
+        const t_pl_loc& old_loc = block.old_loc;
+        const t_pl_loc& new_loc = block.new_loc;
 
         // move the block to its new location
         place_ctx.block_locs[blk].loc = new_loc;
@@ -76,11 +77,11 @@ void commit_move_blocks(const t_pl_blocks_to_be_moved& blocks_affected) {
     auto& place_ctx = g_vpr_ctx.mutable_placement();
 
     /* Swap physical location */
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); ++iblk) {
-        ClusterBlockId blk = blocks_affected.moved_blocks[iblk].block_num;
+    for (const auto& block : blocks_affected.moved_blocks) {
+        ClusterBlockId blk = block.block_num;
 
-        const t_pl_loc& to = blocks_affected.moved_blocks[iblk].new_loc;
-        const t_pl_loc& from = blocks_affected.moved_blocks[iblk].old_loc;
+        const t_pl_loc& to = block.new_loc;
+        const t_pl_loc& from = block.old_loc;
 
         //Remove from old location only if it hasn't already been updated by a previous block update
         if (place_ctx.grid_blocks.block_at_location(from) == blk) {
@@ -106,11 +107,11 @@ void revert_move_blocks(const t_pl_blocks_to_be_moved& blocks_affected) {
     auto& device_ctx = g_vpr_ctx.device();
 
     // Swap the blocks back, nets not yet swapped they don't need to be changed
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); ++iblk) {
-        ClusterBlockId blk = blocks_affected.moved_blocks[iblk].block_num;
+    for (const auto& block : blocks_affected.moved_blocks) {
+        ClusterBlockId blk = block.block_num;
 
-        const t_pl_loc& old_loc = blocks_affected.moved_blocks[iblk].old_loc;
-        const t_pl_loc& new_loc = blocks_affected.moved_blocks[iblk].new_loc;
+        const t_pl_loc& old_loc = block.old_loc;
+        const t_pl_loc& new_loc = block.new_loc;
 
         // return the block to where it was before the swap
         place_ctx.block_locs[blk].loc = old_loc;

vpr/src/place/move_utils.cpp

@@ -1,13 +1,6 @@
 #include "move_utils.h"
-
-#include "place_util.h"
 #include "globals.h"
-
 #include "vtr_random.h"
-
-#include "draw_debug.h"
-#include "draw.h"
-
 #include "place_constraints.h"
 #include "placer_globals.h"
 
@@ -488,12 +481,12 @@ std::set<t_pl_loc> determine_locations_emptied_by_move(t_pl_blocks_to_be_moved&
     std::set<t_pl_loc> moved_from;
     std::set<t_pl_loc> moved_to;
 
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); ++iblk) {
+    for (const auto& block : blocks_affected.moved_blocks) {
         //When a block is moved its old location becomes free
-        moved_from.emplace(blocks_affected.moved_blocks[iblk].old_loc);
+        moved_from.emplace(block.old_loc);
 
         //But any block later moved to a position fills it
-        moved_to.emplace(blocks_affected.moved_blocks[iblk].new_loc);
+        moved_to.emplace(block.new_loc);
     }
 
     std::set<t_pl_loc> empty_locs;

vpr/src/place/net_cost_handler.cpp

@@ -192,7 +192,7 @@ 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 the size ofts_nets_to_update.
+ * @brief if "net" is not already stored as an affected net, add it in ts_nets_to_update.
  * @param net ID of a net affected by a move
  */
 static void record_affected_net(const ClusterNetId net);
@@ -560,8 +560,8 @@ static bool driven_by_moved_block(const ClusterNetId net,
     ClusterBlockId net_driver_block = clb_nlist.net_driver_block(
         net);
 
-    for (size_t block_num = 0; block_num < moved_blocks.size(); block_num++) {
-        if (net_driver_block == moved_blocks[block_num].block_num) {
+    for (const auto& block : moved_blocks) {
+        if (net_driver_block == block.block_num) {
             is_driven_by_move_blk = true;
             break;
         }
@@ -1892,9 +1892,8 @@ static double wirelength_crossing_count(size_t fanout) {
 }
 
 static void set_bb_delta_cost(double& bb_delta_c) {
-    for (size_t inet_affected = 0; inet_affected < ts_info.ts_nets_to_update.size();
-         inet_affected++) {
-        ClusterNetId net_id = ts_info.ts_nets_to_update[inet_affected];
+    for (const auto& ts_net: ts_info.ts_nets_to_update) {
+        ClusterNetId net_id = ts_net;
 
         pl_net_cost.proposed_net_cost[net_id] = bb_updater.get_net_cost(net_id);
 
@@ -1916,10 +1915,10 @@ void find_affected_nets_and_update_costs(
     ts_info.ts_nets_to_update.resize(0);
 
     /* Go through all the blocks moved. */
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); iblk++) {
-        const auto& moving_block_inf = blocks_affected.moved_blocks[iblk];
+    for (const auto& block : blocks_affected.moved_blocks) {
+        const auto& moving_block_inf = block;
         auto& affected_pins = blocks_affected.affected_pins;
-        ClusterBlockId blk = blocks_affected.moved_blocks[iblk].block_num;
+        ClusterBlockId blk = block.block_num;
 
         /* Go through all the pins in the moved block. */
         for (ClusterPinId blk_pin : clb_nlist.block_pins(blk)) {
@@ -2029,9 +2028,8 @@ void update_move_nets() {
     auto& cluster_ctx = g_vpr_ctx.clustering();
     auto& place_move_ctx = g_placer_ctx.mutable_move();
 
-    for (size_t inet_affected = 0; inet_affected < ts_info.ts_nets_to_update.size();
-         inet_affected++) {
-        ClusterNetId net_id = ts_info.ts_nets_to_update[inet_affected];
+    for (const auto& ts_net : ts_info.ts_nets_to_update) {
+        ClusterNetId net_id = ts_net;
 
         bb_updater.set_ts_bb_coord(net_id);
 
@@ -2053,9 +2051,8 @@ void update_move_nets() {
 
 void reset_move_nets() {
     /* Reset the net cost function flags first. */
-    for (size_t inet_affected = 0; inet_affected < ts_info.ts_nets_to_update.size();
-         inet_affected++) {
-        ClusterNetId net_id = ts_info.ts_nets_to_update[inet_affected];
+    for (const auto& ts_net : ts_info.ts_nets_to_update) {
+        ClusterNetId net_id = ts_net;
         pl_net_cost.proposed_net_cost[net_id] = -1;
         pl_net_cost.bb_update_status[net_id] = NetUpdateState::NOT_UPDATED_YET;
     }

vpr/src/place/net_cost_handler.h

@@ -36,6 +36,7 @@ enum e_cost_methods {
  *
  * The change in the bounding box cost is stored in `bb_delta_c`.
  * The change in the timing cost is stored in `timing_delta_c`.
+ * ts_nets_to_update is also extended with the latest net.
  *
  * @param place_algorithm
  * @param delay_model

vpr/src/place/noc_place_utils.cpp

@@ -136,8 +136,8 @@ void find_affected_noc_routers_and_update_noc_costs(const t_pl_blocks_to_be_move
     affected_noc_links.clear();
 
     // go through the moved blocks and process them only if they are NoC routers
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); ++iblk) {
-        ClusterBlockId blk = blocks_affected.moved_blocks[iblk].block_num;
+    for (const auto& block : blocks_affected.moved_blocks) {
+        ClusterBlockId blk = block.block_num;
 
         // check if the current moved block is a noc router
         if (noc_traffic_flows_storage.check_if_cluster_block_has_traffic_flows(blk)) {
@@ -291,8 +291,8 @@ void revert_noc_traffic_flow_routes(const t_pl_blocks_to_be_moved& blocks_affect
     std::unordered_set<NocTrafficFlowId> reverted_traffic_flows;
 
     // go through the moved blocks and process them only if they are NoC routers
-    for (size_t iblk = 0; iblk < blocks_affected.moved_blocks.size(); ++iblk) {
-        ClusterBlockId blk = blocks_affected.moved_blocks[iblk].block_num;
+    for (const auto& block : blocks_affected.moved_blocks) {
+        ClusterBlockId blk = block.block_num;
 
         // check if the current moved block is a noc router
         if (noc_traffic_flows_storage.check_if_cluster_block_has_traffic_flows(blk)) {
@@ -323,7 +323,7 @@ void re_route_traffic_flow(NocTrafficFlowId traffic_flow_id,
     // get the current traffic flow info
     const t_noc_traffic_flow& curr_traffic_flow = noc_traffic_flows_storage.get_single_noc_traffic_flow(traffic_flow_id);
 
-    /*  since the current traffic flow route will be 
+    /*  since the current traffic flow route will be
      * changed, first we need to decrement the bandwidth
      * usage of all links that are part of
      * the existing traffic flow route
@@ -994,4 +994,4 @@ static std::vector<NocLinkId> find_affected_links_by_flow_reroute(std::vector<No
                         std::back_inserter(unique_links));
 
     return unique_links;
-}
+}

vpr/src/place/place.cpp

@@ -1,20 +1,11 @@
 #include <cstdio>
 #include <cmath>
 #include <memory>
-#include <fstream>
-#include <iostream>
-#include <numeric>
-#include <chrono>
-#include <optional>
-
-#include "NetPinTimingInvalidator.h"
 #include "vtr_assert.h"
 #include "vtr_log.h"
 #include "vtr_util.h"
 #include "vtr_random.h"
-#include "vtr_geometry.h"
 #include "vtr_time.h"
-#include "vtr_math.h"
 #include "vtr_ndmatrix.h"
 
 #include "vpr_types.h"
@@ -27,11 +18,6 @@
 #include "placer_globals.h"
 #include "read_place.h"
 #include "draw.h"
-#include "place_and_route.h"
-#include "net_delay.h"
-#include "timing_place_lookup.h"
-#include "timing_place.h"
-#include "read_xml_arch_file.h"
 #include "echo_files.h"
 #include "place_macro.h"
 #include "histogram.h"
@@ -45,10 +31,7 @@
 #include "read_place.h"
 #include "place_constraints.h"
 #include "manual_moves.h"
-#include "buttons.h"
 
-#include "static_move_generator.h"
-#include "simpleRL_move_generator.h"
 #include "manual_move_generator.h"
 
 #include "PlacementDelayCalculator.h"
@@ -59,13 +42,11 @@
 #include "tatum/echo_writer.hpp"
 #include "tatum/TimingReporter.hpp"
 
-#include "placer_breakpoint.h"
 #include "RL_agent_util.h"
 #include "place_checkpoint.h"
 
 #include "clustered_netlist_utils.h"
 
-#include "cluster_placement.h"
 
 #include "noc_place_utils.h"
 
@@ -150,7 +131,7 @@ std::unique_ptr<FILE, decltype(&vtr::fclose)> f_move_stats_file(nullptr,
                         t,                                                                     \
                         int(b_from), int(b_to),                                                \
                         from_type->name, (to_type ? to_type->name : "EMPTY"),                  \
-                        affected_blocks.moved_blocks.size());                                     \
+                        affected_blocks.moved_blocks.size());                                  \
             }                                                                                  \
         } while (false)
 
@@ -1325,7 +1306,7 @@ static e_move_result try_swap(const t_annealing_state* state,
     if (manual_move_enabled) {
 #ifndef NO_GRAPHICS
         create_move_outcome = manual_move_display_and_propose(manual_move_generator, blocks_affected, proposed_action.move_type, rlim, placer_opts, criticalities);
-#else  //NO_GRAPHICS \
+#else  //NO_GRAPHICS
        //Cast to void to explicitly avoid warning.
         (void)manual_move_generator;
 #endif //NO_GRAPHICS

vpr/src/place/place_constraints.h

@@ -10,7 +10,6 @@
  */
 #include "move_transactions.h"
 #include "region.h"
-#include "clustered_netlist_utils.h"
 #include "partition_region.h"
 #include "place_macro.h"
 #include "grid_tile_lookup.h"
@@ -100,16 +99,16 @@ void print_macro_constraint_error(const t_pl_macro& pl_macro);
 inline bool floorplan_legal(const t_pl_blocks_to_be_moved& blocks_affected) {
     bool floorplan_legal;
 
-    for (size_t i = 0; i < blocks_affected.moved_blocks.size(); i++) {
-        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num,
-                                                      blocks_affected.moved_blocks[i].new_loc);
+    for (const auto& block : blocks_affected.moved_blocks) {
+        floorplan_legal = cluster_floorplanning_legal(block.block_num,
+                                                      block.new_loc);
         if (!floorplan_legal) {
             VTR_LOGV_DEBUG(g_vpr_ctx.placement().f_placer_debug,
                            "\tMove aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n",
-                           size_t(blocks_affected.moved_blocks[i].block_num),
-                           blocks_affected.moved_blocks[i].new_loc.x,
-                           blocks_affected.moved_blocks[i].new_loc.y,
-                           blocks_affected.moved_blocks[i].new_loc.sub_tile);
+                           size_t(block.block_num),
+                           block.new_loc.x,
+                           block.new_loc.y,
+                           block.new_loc.sub_tile);
             return false;
         }
     }