[packer] Fixing warnings and code format

Author: RonZ13

vpr/src/pack/greedy_candidate_selector.cpp

@@ -62,7 +62,6 @@ static void add_molecule_to_pb_stats_candidates(
     PackMoleculeId molecule_id,
     ClusterGainStats& cluster_gain_stats,
     t_logical_block_type_ptr cluster_type,
-    int max_queue_size,
     AttractionInfo& attraction_groups,
     const Prepacker& prepacker,
     const AtomNetlist& atom_netlist,
@@ -747,9 +746,7 @@ PackMoleculeId GreedyCandidateSelector::get_next_candidate_for_cluster(
     // then we need to clear the feasible blocks list and reset the number of pops.
     // This ensures that we can continue searching for feasible blocks for the remaining
     // steps (2.transitive, 3.high fanout, 4.attraction group).
-    if (cluster_gain_stats.feasible_blocks.empty() || 
-        cluster_gain_stats.current_stage_candidates_proposed_limit_reached()
-    ){
+    if (cluster_gain_stats.feasible_blocks.empty() || cluster_gain_stats.current_stage_candidates_proposed_limit_reached()) {
         cluster_gain_stats.feasible_blocks.clear();
         cluster_gain_stats.num_candidates_proposed = 0;
     }
@@ -788,7 +785,8 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_connectivity_an
     const ClusterLegalizer& cluster_legalizer,
     AttractionInfo& attraction_groups) {
 
-    cluster_gain_stats.explore_transitive_fanout = true; /* If no legal molecules found, enable exploration of molecules two hops away */
+    cluster_gain_stats.explore_transitive_fanout = true;                                  /* If no legal molecules found, enable exploration of molecules two hops away */
+    cluster_gain_stats.candidates_propose_limit = packer_opts_.feasible_block_array_size; // set the limit of candidates to propose
 
     for (AtomBlockId blk_id : cluster_gain_stats.marked_blocks) {
         // Get the molecule that contains this block.
@@ -799,7 +797,6 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_connectivity_an
             add_molecule_to_pb_stats_candidates(molecule_id,
                                                 cluster_gain_stats,
                                                 cluster_legalizer.get_cluster_type(legalization_cluster_id),
-                                                packer_opts_.feasible_block_array_size,
                                                 attraction_groups,
                                                 prepacker_,
                                                 atom_netlist_,
@@ -815,6 +812,7 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_transitive_conn
     AttractionInfo& attraction_groups) {
     //TODO: For now, only done by fan-out; should also consider fan-in
     cluster_gain_stats.explore_transitive_fanout = false;
+    cluster_gain_stats.candidates_propose_limit = std::min(packer_opts_.feasible_block_array_size, AAPACK_MAX_TRANSITIVE_EXPLORE); // set the limit of candidates to propose
 
     /* First time finding transitive fanout candidates therefore alloc and load them */
     load_transitive_fanout_candidates(cluster_gain_stats,
@@ -828,8 +826,6 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_transitive_conn
             add_molecule_to_pb_stats_candidates(molecule_id,
                                                 cluster_gain_stats,
                                                 cluster_legalizer.get_cluster_type(legalization_cluster_id),
-                                                std::min(packer_opts_.feasible_block_array_size,
-                                                         AAPACK_MAX_TRANSITIVE_EXPLORE),
                                                 attraction_groups,
                                                 prepacker_,
                                                 atom_netlist_,
@@ -848,6 +844,7 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_highfanout_conn
      * related blocks */
 
     AtomNetId net_id = cluster_gain_stats.tie_break_high_fanout_net;
+    cluster_gain_stats.candidates_propose_limit = std::min(packer_opts_.feasible_block_array_size, AAPACK_MAX_TRANSITIVE_EXPLORE); // set the limit of candidates to propose
 
     int count = 0;
     for (AtomPinId pin_id : atom_netlist_.net_pins(net_id)) {
@@ -862,8 +859,6 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_highfanout_conn
             add_molecule_to_pb_stats_candidates(molecule_id,
                                                 cluster_gain_stats,
                                                 cluster_legalizer.get_cluster_type(legalization_cluster_id),
-                                                std::min(packer_opts_.feasible_block_array_size,
-                                                         AAPACK_MAX_HIGH_FANOUT_EXPLORE),
                                                 attraction_groups,
                                                 prepacker_,
                                                 atom_netlist_,
@@ -891,6 +886,7 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_attraction_grou
      * group molecules for candidate molecules.
      */
     AttractGroupId grp_id = cluster_gain_stats.attraction_grp_id;
+    cluster_gain_stats.candidates_propose_limit = packer_opts_.feasible_block_array_size; // set the limit of candidates to propose
     if (grp_id == AttractGroupId::INVALID()) {
         return;
     }
@@ -923,7 +919,6 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_attraction_grou
                 add_molecule_to_pb_stats_candidates(molecule_id,
                                                     cluster_gain_stats,
                                                     cluster_legalizer.get_cluster_type(legalization_cluster_id),
-                                                    packer_opts_.feasible_block_array_size,
                                                     attraction_groups,
                                                     prepacker_,
                                                     atom_netlist_,
@@ -945,7 +940,6 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_attraction_grou
             add_molecule_to_pb_stats_candidates(molecule_id,
                                                 cluster_gain_stats,
                                                 cluster_legalizer.get_cluster_type(legalization_cluster_id),
-                                                packer_opts_.feasible_block_array_size,
                                                 attraction_groups,
                                                 prepacker_,
                                                 atom_netlist_,
@@ -960,7 +954,6 @@ void GreedyCandidateSelector::add_cluster_molecule_candidates_by_attraction_grou
 static void add_molecule_to_pb_stats_candidates(PackMoleculeId molecule_id,
                                                 ClusterGainStats& cluster_gain_stats,
                                                 t_logical_block_type_ptr cluster_type,
-                                                int max_queue_size,
                                                 AttractionInfo& attraction_groups,
                                                 const Prepacker& prepacker,
                                                 const AtomNetlist& atom_netlist,

vpr/src/pack/greedy_candidate_selector.h

@@ -135,7 +135,7 @@ struct ClusterGainStats {
     unsigned num_candidates_proposed;
 
     /// @brief Check if the current stage candidates proposed limit is reached.
-    bool current_stage_candidates_proposed_limit_reached(){
+    bool current_stage_candidates_proposed_limit_reached() {
         return num_candidates_proposed >= candidates_propose_limit;
     }
 };