Merge branch 'master' into add_enable_pin_counting_filter_option_to_recluster_util

Author: KA7E

.gitmodules

@@ -3,5 +3,4 @@
 	url = https://github.com/catchorg/Catch2.git
 [submodule "libs/EXTERNAL/sockpp"]
 	path = libs/EXTERNAL/sockpp
-	#url = git@github.com:fpagliughi/sockpp.git
-	url = git@github.com:w0lek/sockpp.git # fork where in branch v1.0.0_no_complication_warnings there are compilation warnings fixes for upstream tag v1.0.0 of sockpp
+	url = https://github.com/w0lek/sockpp.git # fork where in branch v1.0.0_no_complication_warnings there are compilation warnings fixes for upstream tag v1.0.0 of sockpp

vpr/src/base/read_place.cpp

@@ -327,8 +327,8 @@ void print_place(const char* net_file,
 
     if (!place_ctx.block_locs.empty()) { //Only if placement exists
         for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
-            fprintf(fp, "%s\t", cluster_ctx.clb_nlist.block_name(blk_id).c_str());
-            if (strlen(cluster_ctx.clb_nlist.block_name(blk_id).c_str()) < 8)
+            fprintf(fp, "%s\t", cluster_ctx.clb_nlist.block_pb(blk_id)->name);
+            if (strlen(cluster_ctx.clb_nlist.block_pb(blk_id)->name) < 8)
                 fprintf(fp, "\t");
 
             fprintf(fp, "%d\t%d\t%d\t%d",

vpr/src/pack/re_cluster_util.cpp

@@ -722,7 +722,11 @@ static void update_cluster_pb_stats(const t_pack_molecule* molecule,
         }
 
         //Update atom netlist mapping
-        atom_ctx.lookup.set_atom_clb(blk_id, clb_index);
+        if (is_added) {
+            atom_ctx.lookup.set_atom_clb(blk_id, clb_index);
+        } else {
+            atom_ctx.lookup.set_atom_clb(blk_id, ClusterBlockId::INVALID());
+        }
 
         const t_pb* atom_pb = atom_ctx.lookup.atom_pb(blk_id);
         VTR_ASSERT(atom_pb);