Merge branch 'master' into openfpga

Author: tangxifan

vpr/src/draw/draw_types.cpp

@@ -13,7 +13,15 @@
  *******************************************/
 ezgl::color t_draw_state::block_color(ClusterBlockId blk) const {
     if (use_default_block_color_[blk]) {
-        t_physical_tile_type_ptr tile_type = get_physical_tile_type(blk);
+        t_physical_tile_type_ptr tile_type = nullptr;
+        auto& cluster_ctx = g_vpr_ctx.clustering();
+        auto& place_ctx = g_vpr_ctx.placement();
+        if (place_ctx.block_locs.empty()) { //No placement, pick best match
+            tile_type = pick_physical_type(cluster_ctx.clb_nlist.block_type(blk));
+        } else { // Have placement, select physical tile implementing blk
+            tile_type = physical_tile_type(blk);
+        }
+        VTR_ASSERT(tile_type != nullptr);
         return get_block_type_color(tile_type);
     } else {
         return block_color_[blk];

vpr/src/pack/re_cluster.cpp

@@ -73,14 +73,6 @@ bool move_mol_to_new_cluster(t_pack_molecule* molecule,
     //Commit or revert the move
     if (is_created) {
         commit_mol_move(old_clb, new_clb, during_packing, true);
-        // Update the clb-->atoms lookup table
-        helper_ctx.atoms_lookup.resize(helper_ctx.total_clb_num);
-        for (int i_atom = 0; i_atom < molecule_size; ++i_atom) {
-            if (molecule->atom_block_ids[i_atom]) {
-                helper_ctx.atoms_lookup[new_clb].insert(molecule->atom_block_ids[i_atom]);
-            }
-        }
-
         VTR_LOGV(verbosity > 4, "Atom:%zu is moved to a new cluster\n", molecule->atom_block_ids[molecule->root]);
     } else {
         revert_mol_move(old_clb, molecule, old_router_data, during_packing, clustering_data);

vpr/src/pack/re_cluster_util.cpp

@@ -190,6 +190,14 @@ bool start_new_cluster_for_mol(t_pack_molecule* molecule,
         int molecule_size = get_array_size_of_molecule(molecule);
         update_cluster_pb_stats(molecule, molecule_size, clb_index, true);
 
+        // Update the clb-->atoms lookup table
+        helper_ctx.atoms_lookup.resize(helper_ctx.total_clb_num);
+        for (int i_atom = 0; i_atom < molecule_size; ++i_atom) {
+            if (molecule->atom_block_ids[i_atom]) {
+                helper_ctx.atoms_lookup[clb_index].insert(molecule->atom_block_ids[i_atom]);
+            }
+        }
+
         //If you are still in packing, update the clustering data. Otherwise, update the clustered netlist.
         if (during_packing) {
             clustering_data.intra_lb_routing.push_back((*router_data)->saved_lb_nets);

vpr/src/util/vpr_utils.cpp

@@ -525,10 +525,9 @@ t_physical_tile_type_ptr physical_tile_type(ClusterBlockId blk) {
     auto& place_ctx = g_vpr_ctx.placement();
     auto& device_ctx = g_vpr_ctx.device();
 
-    auto block_loc = place_ctx.block_locs[blk];
-    auto loc = block_loc.loc;
+    auto block_loc = place_ctx.block_locs[blk].loc;
 
-    return device_ctx.grid.get_physical_type({loc.x, loc.y, loc.layer});
+    return device_ctx.grid.get_physical_type({block_loc.x, block_loc.y, block_loc.layer});
 }
 
 t_physical_tile_type_ptr physical_tile_type(AtomBlockId atom_blk) {
@@ -2148,20 +2147,6 @@ int max_pins_per_grid_tile() {
     return max_pins;
 }
 
-t_physical_tile_type_ptr get_physical_tile_type(const ClusterBlockId blk) {
-    auto& cluster_ctx = g_vpr_ctx.clustering();
-    auto& place_ctx = g_vpr_ctx.placement();
-    if (place_ctx.block_locs.empty()) { //No placement, pick best match
-        return pick_physical_type(cluster_ctx.clb_nlist.block_type(blk));
-    } else { //Have placement, select physical tile implementing blk
-        auto& device_ctx = g_vpr_ctx.device();
-
-        t_pl_loc loc = place_ctx.block_locs[blk].loc;
-
-        return device_ctx.grid.get_physical_type({loc.x, loc.y, loc.layer});
-    }
-}
-
 int net_pin_to_tile_pin_index(const ClusterNetId net_id, int net_pin_index) {
     auto& cluster_ctx = g_vpr_ctx.clustering();
 

vpr/src/util/vpr_utils.h

@@ -236,10 +236,6 @@ AtomBlockId find_memory_sibling(const t_pb* pb);
  */
 void place_sync_external_block_connections(ClusterBlockId iblk);
 
-//Returns the current tile implemnting blk (if placement is valid), or
-//the best expected physical tile the block should use (if no valid placement).
-t_physical_tile_type_ptr get_physical_tile_type(const ClusterBlockId blk);
-
 //Returns the physical pin of the tile, related to the given ClusterNedId, and the net pin index
 int net_pin_to_tile_pin_index(const ClusterNetId net_id, int net_pin_index);