Remove atom_clb and atom_net global context mutation from packer

Author: AmirhosseinPoolad

vpr/src/base/clustered_netlist.cpp

@@ -170,8 +170,15 @@ ClusterNetId ClusteredNetlist::create_net(const std::string& name) {
 }
 
 void ClusteredNetlist::remove_block_impl(const ClusterBlockId blk_id) {
+    AtomPBBimap& atom_pb_bimap = g_vpr_ctx.mutable_atom().mutable_lookup().mutable_atom_pb_bimap();
+    AtomBlockId atom_blk_id = atom_pb_bimap.pb_atom(block_pbs_[blk_id]);
+    
+    // Remove the corresponding atom_clb lookup entry from global context (if exsits)
+    if (atom_blk_id) {
+        g_vpr_ctx.mutable_atom().mutable_lookup().set_atom_clb(atom_blk_id, ClusterBlockId::INVALID());
+    }
     //Remove & invalidate pointers
-    free_pb(block_pbs_[blk_id], g_vpr_ctx.mutable_atom().mutable_lookup().mutable_atom_pb_bimap());
+    free_pb(block_pbs_[blk_id], atom_pb_bimap);
     delete block_pbs_[blk_id];
     block_pbs_.insert(blk_id, NULL);
     block_types_.insert(blk_id, NULL);

vpr/src/pack/pack.cpp

@@ -250,12 +250,8 @@ bool try_pack(const t_packer_opts& packer_opts,
             VPR_FATAL_ERROR(VPR_ERROR_OTHER, "Failed to find device which satisfies resource requirements required: %s (available %s)", resource_reqs.c_str(), resource_avail.c_str());
         }
 
-        //Reset clustering for re-packing
-        for (auto net : g_vpr_ctx.atom().netlist().nets()) {
-            g_vpr_ctx.mutable_atom().mutable_lookup().remove_atom_net(net);
-        }
+        //Reset floorplanning constraints for re-packing
         g_vpr_ctx.mutable_floorplanning().cluster_constraints.clear();
-        //attraction_groups.reset_attraction_groups();
 
         // Reset the cluster legalizer for re-clustering.
         cluster_legalizer.reset();

vpr/src/util/vpr_utils.cpp

@@ -1366,7 +1366,7 @@ int num_ext_inputs_atom_block(AtomBlockId blk_id) {
 
 /**
  * @brief Free pb and remove its lookup data.
- *        CLB lookup data is removed from the global context
+ *        CLB lookup data is *not* removed from the global context
  *        and PB to Atom bimap data is removed from atom_pb_bimap
  *
  *  @param pb
@@ -1411,11 +1411,8 @@ void free_pb(t_pb* pb, AtomPBBimap& atom_pb_bimap) {
 
     } else {
         /* Primitive */
-        auto& atom_ctx = g_vpr_ctx.mutable_atom();
         auto blk_id = atom_pb_bimap.pb_atom(pb);
         if (blk_id) {
-            //Update atom netlist mapping
-            atom_ctx.mutable_lookup().set_atom_clb(blk_id, ClusterBlockId::INVALID());
             atom_pb_bimap.set_atom_pb(blk_id, nullptr);
         }
         atom_pb_bimap.set_atom_pb(AtomBlockId::INVALID(), pb);