Merge branch 'master' into xt_direct_inport_double_check

Author: tangxifan

vpr/src/pack/cluster_legalizer.h

@@ -11,6 +11,7 @@
  * externally to the Packer in VPR.
  */
 
+#include <string>
 #include <vector>
 #include "atom_netlist_fwd.h"
 #include "noc_data_types.h"
@@ -433,6 +434,13 @@ class ClusterLegalizer {
         return cluster.pb;
     }
 
+    /// @brief Gets the name of the given cluster.
+    inline std::string get_cluster_name(LegalizationClusterId cluster_id) const {
+        VTR_ASSERT_SAFE(cluster_id.is_valid() && (size_t)cluster_id < legalization_clusters_.size());
+        const LegalizationCluster& cluster = legalization_clusters_[cluster_id];
+        return cluster.pb->name;
+    }
+
     /// @brief Gets the logical block type of the given cluster.
     inline t_logical_block_type_ptr get_cluster_type(LegalizationClusterId cluster_id) const {
         VTR_ASSERT_SAFE(cluster_id.is_valid() && (size_t)cluster_id < legalization_clusters_.size());

vpr/src/pack/cluster_util.cpp

@@ -39,8 +39,9 @@ static void echo_clusters(char* filename, const ClusterLegalizer& cluster_legali
     }
 
     for (auto& cluster_atom : cluster_atoms) {
-        const std::string& cluster_name = cluster_legalizer.get_cluster_pb(cluster_atom.first)->name;
-        fprintf(fp, "Cluster %s Id: %zu \n", cluster_name.c_str(), size_t(cluster_atom.first));
+        fprintf(fp, "Cluster %s Id: %zu \n",
+                cluster_legalizer.get_cluster_name(cluster_atom.first).c_str(),
+                size_t(cluster_atom.first));
         fprintf(fp, "\tAtoms in cluster: \n");
 
         int num_atoms = cluster_atom.second.size();

vpr/src/pack/greedy_clusterer.cpp

@@ -443,7 +443,7 @@ LegalizationClusterId GreedyClusterer::start_new_cluster(
 
     VTR_LOGV(log_verbosity_ > 2,
              "Complex block %zu: '%s' (%s) ", size_t(new_cluster_id),
-             cluster_legalizer.get_cluster_pb(new_cluster_id)->name,
+             cluster_legalizer.get_cluster_name(new_cluster_id).c_str(),
              cluster_legalizer.get_cluster_type(new_cluster_id)->name.c_str());
     VTR_LOGV(log_verbosity_ > 2, ".");
     //Progress dot for seed-block

vpr/src/pack/pack.cpp

@@ -580,22 +580,9 @@ bool try_pack(const t_packer_opts& packer_opts,
 
     VTR_ASSERT(current_packer_state == e_packer_state::SUCCESS);
 
-    /* Packing iterative improvement can be done here */
-    /*       Use the re-cluster API to edit it        */
-    /******************* Start *************************/
-    VTR_LOG("Start the iterative improvement process\n");
-    //iteratively_improve_packing(*packer_opts, clustering_data, 2);
-    VTR_LOG("the iterative improvement process is done\n");
-
-    /*
-     * auto& cluster_ctx = g_vpr_ctx.clustering();
-     * for (auto& blk_id : g_vpr_ctx.clustering().clb_nlist.blocks()) {
-     * free_pb_stats_recursive(cluster_ctx.clb_nlist.block_pb(blk_id));
-     * }
-     */
-    /******************** End **************************/
     g_vpr_ctx.mutable_atom().mutable_lookup().set_atom_pb_bimap_lock(false);
     g_vpr_ctx.mutable_atom().mutable_lookup().set_atom_to_pb_bimap(cluster_legalizer.atom_pb_lookup());
+
     //check clustering and output it
     check_and_output_clustering(cluster_legalizer, packer_opts, is_clock, &arch);