Merge pull request #2178 from verilog-to-routing/tight_floor_plan_bugs

tight floor plan memory leak bugs

Author: zhaisitong

libs/libarchfpga/src/cad_types.h

@@ -120,6 +120,10 @@ 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;

libs/librrgraph/src/io/gen/rr_graph_uxsdcxx.h

@@ -2072,6 +2072,7 @@ inline enum_loc_side lex_enum_loc_side(const char *in, bool throw_on_invalid, co
 /* Internal loading functions, which validate and load a PugiXML DOM tree into memory. */
 inline int load_int(const char *in, const std::function<void(const char *)> * report_error){
 	int out;
+    errno = 0;
 	out = std::strtol(in, NULL, 10);
 	if(errno != 0)
 		noreturn_report(report_error, ("Invalid value `" + std::string(in) + "` when loading into a int.").c_str());
@@ -2080,6 +2081,7 @@ inline int load_int(const char *in, const std::function<void(const char *)> * re
 
 inline unsigned int load_unsigned_int(const char *in, const std::function<void(const char *)> * report_error){
 	unsigned int out;
+    errno = 0;
 	out = std::strtoul(in, NULL, 10);
 	if(errno != 0)
 		noreturn_report(report_error, ("Invalid value `" + std::string(in) + "` when loading into a unsigned int.").c_str());
@@ -2088,6 +2090,7 @@ inline unsigned int load_unsigned_int(const char *in, const std::function<void(c
 
 inline float load_float(const char *in, const std::function<void(const char *)> * report_error){
 	float out;
+    errno = 0;
 	out = std::strtof(in, NULL);
 	if(errno != 0)
 		noreturn_report(report_error, ("Invalid value `" + std::string(in) + "` when loading into a float.").c_str());

vpr/src/base/gen/vpr_constraints_uxsdcxx.h

@@ -427,6 +427,7 @@ template<std::size_t N>
 /* Internal loading functions, which validate and load a PugiXML DOM tree into memory. */
 inline int load_int(const char* in, const std::function<void(const char*)>* report_error) {
     int out;
+    errno = 0;
     out = std::strtol(in, NULL, 10);
     if (errno != 0)
         noreturn_report(report_error, ("Invalid value `" + std::string(in) + "` when loading into a int.").c_str());

vpr/src/base/vpr_api.cpp

@@ -395,12 +395,6 @@ bool vpr_flow(t_vpr_setup& vpr_setup, t_arch& arch) {
         vpr_analysis_flow(vpr_setup, arch, route_status, is_flat);
     }
 
-    //clean packing-placement data
-    if (vpr_setup.PackerOpts.doPacking == STAGE_DO) {
-        auto& helper_ctx = g_vpr_ctx.mutable_cl_helper();
-        free_cluster_placement_stats(helper_ctx.cluster_placement_stats);
-    }
-
     //close the graphics
     vpr_close_graphics(vpr_setup);
 

vpr/src/base/vpr_context.h

@@ -325,10 +325,6 @@ struct ClusteringHelperContext : public Context {
 
     // the utilization of external input/output pins during packing (between 0 and 1)
     t_ext_pin_util_targets target_external_pin_util;
-
-    ~ClusteringHelperContext() {
-        delete[] primitives_list;
-    }
 };
 
 /**

vpr/src/pack/cluster_placement.cpp

@@ -261,8 +261,7 @@ static void load_cluster_placement_stats_for_pb_graph_node(t_cluster_placement_s
     const t_pb_type* pb_type = pb_graph_node->pb_type;
     bool success;
     if (pb_type->modes == nullptr) {
-        placement_primitive = new t_cluster_placement_primitive;
-        *placement_primitive = t_cluster_placement_primitive();
+        placement_primitive = new t_cluster_placement_primitive();
         placement_primitive->pb_graph_node = pb_graph_node;
         placement_primitive->valid = true;
         pb_graph_node->cluster_placement_primitive = placement_primitive;
@@ -274,8 +273,7 @@ static void load_cluster_placement_stats_for_pb_graph_node(t_cluster_placement_s
                 || cluster_placement_stats->valid_primitives[i]->next_primitive->pb_graph_node->pb_type
                        == pb_graph_node->pb_type) {
                 if (cluster_placement_stats->valid_primitives[i] == nullptr) {
-                    cluster_placement_stats->valid_primitives[i] = new t_cluster_placement_primitive; /* head of linked list is empty, makes it easier to remove nodes later */
-                    *cluster_placement_stats->valid_primitives[i] = t_cluster_placement_primitive();
+                    cluster_placement_stats->valid_primitives[i] = new t_cluster_placement_primitive(); /* head of linked list is empty, makes it easier to remove nodes later */
                     cluster_placement_stats->num_pb_types++;
                 }
                 success = true;

vpr/src/pack/pack.cpp

@@ -246,7 +246,6 @@ bool try_pack(t_packer_opts* packer_opts,
         }
 
         //Reset clustering for re-packing
-        g_vpr_ctx.mutable_clustering().clb_nlist = ClusteredNetlist();
         for (auto blk : g_vpr_ctx.atom().nlist.blocks()) {
             g_vpr_ctx.mutable_atom().lookup.set_atom_clb(blk, ClusterBlockId::INVALID());
             g_vpr_ctx.mutable_atom().lookup.set_atom_pb(blk, nullptr);
@@ -257,6 +256,9 @@ bool try_pack(t_packer_opts* packer_opts,
         g_vpr_ctx.mutable_floorplanning().cluster_constraints.clear();
         //attraction_groups.reset_attraction_groups();
 
+        free_cluster_placement_stats(helper_ctx.cluster_placement_stats);
+        delete[] helper_ctx.primitives_list;
+
         ++pack_iteration;
     }
 

vpr/src/pack/pb_type_graph.cpp

@@ -141,8 +141,7 @@ void alloc_and_load_all_pb_graphs(bool load_power_structures, bool is_flat) {
 
     for (auto& type : device_ctx.logical_block_types) {
         if (type.pb_type) {
-            type.pb_graph_head = new t_pb_graph_node;
-            *type.pb_graph_head = t_pb_graph_node();
+            type.pb_graph_head = new t_pb_graph_node();
             int pin_count_in_cluster = 0;
             alloc_and_load_pb_graph(type.pb_graph_head, nullptr,
                                     type.pb_type, 0, load_power_structures, pin_count_in_cluster);
@@ -324,8 +323,7 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
 
     /* Power */
     if (load_power_structures) {
-        pb_graph_node->pb_node_power = new t_pb_graph_node_power;
-        *pb_graph_node->pb_node_power = t_pb_graph_node_power();
+        pb_graph_node->pb_node_power = new t_pb_graph_node_power();
         pb_graph_node->pb_node_power->transistor_cnt_buffers = 0.;
         pb_graph_node->pb_node_power->transistor_cnt_interc = 0.;
         pb_graph_node->pb_node_power->transistor_cnt_pb_children = 0.;

vpr/src/pack/prepack.cpp

@@ -493,8 +493,7 @@ static void forward_expand_pack_pattern_from_edge(const t_pb_graph_edge* expansi
                 // a primitive that belongs to this pack pattern is found: 1) create a new pattern block,
                 // 2) assign an id to this pattern block, 3) increment the number of found blocks belonging to this
                 // pattern and 4) expand all its edges to find the other primitives that belong to this pattern
-                destination_block = new t_pack_pattern_block;
-                *destination_block = t_pack_pattern_block();
+                destination_block = new t_pack_pattern_block();
                 list_of_packing_patterns[curr_pattern_index].base_cost += compute_primitive_base_cost(destination_pb_graph_node);
                 destination_block->block_id = *L_num_blocks;
                 (*L_num_blocks)++;
@@ -635,8 +634,7 @@ static void backward_expand_pack_pattern_from_edge(const t_pb_graph_edge* expans
             /* If this pb_graph_node is part not of the current pattern index, put it in and expand all its edges */
             source_block = (t_pack_pattern_block*)source_pb_graph_node->temp_scratch_pad;
             if (source_block == nullptr || source_block->pattern_index != curr_pattern_index) {
-                source_block = new t_pack_pattern_block;
-                *source_block = t_pack_pattern_block();
+                source_block = new t_pack_pattern_block();
                 source_block->block_id = *L_num_blocks;
                 (*L_num_blocks)++;
                 list_of_packing_patterns[curr_pattern_index].base_cost += compute_primitive_base_cost(source_pb_graph_node);
@@ -693,17 +691,15 @@ static void backward_expand_pack_pattern_from_edge(const t_pb_graph_edge* expans
             if (destination_pin != nullptr) {
                 VTR_ASSERT(((t_pack_pattern_block*)source_pb_graph_node->temp_scratch_pad)->pattern_index == curr_pattern_index);
                 source_block = (t_pack_pattern_block*)source_pb_graph_node->temp_scratch_pad;
-                pack_pattern_connection = new t_pack_pattern_connections;
-                *pack_pattern_connection = t_pack_pattern_connections();
+                pack_pattern_connection = new t_pack_pattern_connections();
                 pack_pattern_connection->from_block = source_block;
                 pack_pattern_connection->from_pin = expansion_edge->input_pins[i];
                 pack_pattern_connection->to_block = destination_block;
                 pack_pattern_connection->to_pin = destination_pin;
                 pack_pattern_connection->next = source_block->connections;
                 source_block->connections = pack_pattern_connection;
 
-                pack_pattern_connection = new t_pack_pattern_connections;
-                *pack_pattern_connection = t_pack_pattern_connections();
+                pack_pattern_connection = new t_pack_pattern_connections();
                 pack_pattern_connection->from_block = source_block;
                 pack_pattern_connection->from_pin = expansion_edge->input_pins[i];
                 pack_pattern_connection->to_block = destination_block;