revert to the version before fixing memory leaks, but making nightly_test5 well

Author: zhaisitong

libs/libarchfpga/src/cad_types.h

@@ -120,10 +120,6 @@ struct t_pack_patterns {
  * Linked list for easy insertion/deletion
  */
 struct t_cluster_placement_primitive {
-    t_cluster_placement_primitive() {
-        pb_graph_node = nullptr;
-        next_primitive = nullptr;
-    }
     t_pb_graph_node* pb_graph_node;
     t_cluster_placement_primitive* next_primitive;
     bool valid;

vpr/src/base/vpr_context.h

@@ -306,13 +306,13 @@ struct ClusteringHelperContext : public Context {
     std::map<t_logical_block_type_ptr, size_t> num_used_type_instances;
 
     // Stats keeper for placement information during packing/clustering
-    std::vector<t_cluster_placement_stats> cluster_placement_stats;
+    t_cluster_placement_stats* cluster_placement_stats;
 
     // total number of models in the architecture
     int num_models;
 
     int max_cluster_size;
-    std::vector<t_pb_graph_node*> primitives_list;
+    t_pb_graph_node** primitives_list;
 
     bool enable_pin_feasibility_filter;
     int feasible_block_array_size;
@@ -327,8 +327,7 @@ struct ClusteringHelperContext : public Context {
     t_ext_pin_util_targets target_external_pin_util;
 
     ~ClusteringHelperContext() {
-        cluster_placement_stats.clear();
-        primitives_list.clear();
+        delete[] primitives_list;
     }
 };
 

vpr/src/base/vpr_types.cpp

@@ -227,7 +227,7 @@ void free_pack_molecules(t_pack_molecule* list_of_pack_molecules) {
 /**
  * Free linked lists found in cluster_placement_stats_list
  */
-void free_cluster_placement_stats(std::vector<t_cluster_placement_stats>& cluster_placement_stats_list) {
+void free_cluster_placement_stats(t_cluster_placement_stats* cluster_placement_stats_list) {
     t_cluster_placement_primitive *cur, *next;
     auto& device_ctx = g_vpr_ctx.device();
 
@@ -260,5 +260,7 @@ void free_cluster_placement_stats(std::vector<t_cluster_placement_stats>& cluste
             }
             delete cluster_placement_stats_list[index].valid_primitives[j];
         }
+        delete[] cluster_placement_stats_list[index].valid_primitives;
     }
+    delete[] cluster_placement_stats_list;
 }

vpr/src/base/vpr_types.h

@@ -426,13 +426,13 @@ struct t_chain_info {
  * Contains linked lists to placement locations based on status of primitive
  */
 struct t_cluster_placement_stats {
-    int num_pb_types;                                             ///<num primitive pb_types inside complex block
-    bool has_long_chain;                                          ///<specifies if this cluster has a molecule placed in it that belongs to a long chain (a chain that spans more than one cluster)
-    const t_pack_molecule* curr_molecule;                         ///<current molecule being considered for packing
-    std::vector<t_cluster_placement_primitive*> valid_primitives; ///<[0..num_pb_types-1] ptrs to linked list of valid primitives, for convenience, each linked list head is empty
-    t_cluster_placement_primitive* in_flight;                     ///<ptrs to primitives currently being considered
-    t_cluster_placement_primitive* tried;                         ///<ptrs to primitives that are open but current logic block unable to pack to
-    t_cluster_placement_primitive* invalid;                       ///<ptrs to primitives that are invalid
+    int num_pb_types;                                 ///<num primitive pb_types inside complex block
+    bool has_long_chain;                              ///<specifies if this cluster has a molecule placed in it that belongs to a long chain (a chain that spans more than one cluster)
+    const t_pack_molecule* curr_molecule;             ///<current molecule being considered for packing
+    t_cluster_placement_primitive** valid_primitives; ///<[0..num_pb_types-1] ptrs to linked list of valid primitives, for convenience, each linked list head is empty
+    t_cluster_placement_primitive* in_flight;         ///<ptrs to primitives currently being considered
+    t_cluster_placement_primitive* tried;             ///<ptrs to primitives that are open but current logic block unable to pack to
+    t_cluster_placement_primitive* invalid;           ///<ptrs to primitives that are invalid
 };
 
 /******************************************************************
@@ -1673,6 +1673,6 @@ void free_pack_molecules(t_pack_molecule* list_of_pack_molecules);
 /**
  * @brief Free the linked lists to placement locations based on status of primitive inside placement stats data structure.
  */
-void free_cluster_placement_stats(std::vector<t_cluster_placement_stats>& cluster_placement_stats);
+void free_cluster_placement_stats(t_cluster_placement_stats* cluster_placement_stats);
 
 #endif

vpr/src/pack/cluster.cpp

@@ -140,6 +140,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
     bool is_cluster_legal;
     enum e_block_pack_status block_pack_status;
 
+    t_cluster_placement_stats* cur_cluster_placement_stats_ptr;
     t_lb_router_data* router_data = nullptr;
     t_pack_molecule *istart, *next_molecule, *prev_molecule;
 
@@ -199,7 +200,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
 	check_for_duplicate_inputs ();
 #endif
     alloc_and_init_clustering(max_molecule_stats,
-                              helper_ctx.cluster_placement_stats, helper_ctx.primitives_list, molecule_head,
+                              &(helper_ctx.cluster_placement_stats), &(helper_ctx.primitives_list), molecule_head,
                               clustering_data, net_output_feeds_driving_block_input,
                               unclustered_list_head_size, cluster_stats.num_molecules);
 
@@ -299,7 +300,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                 /*it doesn't make sense to do a timing analysis here since there*
                  *is only one atom block clustered it would not change anything      */
             }
-
+            cur_cluster_placement_stats_ptr = &(helper_ctx.cluster_placement_stats[cluster_ctx.clb_nlist.block_type(clb_index)->index]);
             cluster_stats.num_unrelated_clustering_attempts = 0;
             next_molecule = get_molecule_for_cluster(cluster_ctx.clb_nlist.block_pb(clb_index),
                                                      attraction_groups,
@@ -308,7 +309,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                                                      packer_opts.transitive_fanout_threshold,
                                                      packer_opts.feasible_block_array_size,
                                                      &cluster_stats.num_unrelated_clustering_attempts,
-                                                     helper_ctx.cluster_placement_stats[cluster_ctx.clb_nlist.block_type(clb_index)->index],
+                                                     cur_cluster_placement_stats_ptr,
                                                      clb_inter_blk_nets,
                                                      clb_index,
                                                      verbosity,
@@ -337,7 +338,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                 prev_molecule = next_molecule;
 
                 try_fill_cluster(packer_opts,
-                                 helper_ctx.cluster_placement_stats[cluster_ctx.clb_nlist.block_type(clb_index)->index],
+                                 cur_cluster_placement_stats_ptr,
                                  prev_molecule,
                                  next_molecule,
                                  num_repeated_molecules,