formatting fix

jmah76 · jmah76 · commit fc15b62d2237 · 2022-06-29T08:03:27.000-04:00
diff --git a/vpr/src/pack/cluster.cpp b/vpr/src/pack/cluster.cpp
@@ -190,8 +190,8 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
 
     if (packer_opts.hill_climbing_flag) {
         clustering_data.hill_climbing_inputs_avail = new int[helper_ctx.max_cluster_size + 1];
-        for(int i = 0 ; i < helper_ctx.max_cluster_size + 1; i++)
-        	clustering_data.hill_climbing_inputs_avail[i] = 0;
+        for (int i = 0; i < helper_ctx.max_cluster_size + 1; i++)
+            clustering_data.hill_climbing_inputs_avail[i] = 0;
     } else {
         clustering_data.hill_climbing_inputs_avail = nullptr; /* if used, die hard */
     }
diff --git a/vpr/src/pack/cluster_feasibility_filter.cpp b/vpr/src/pack/cluster_feasibility_filter.cpp
@@ -320,18 +320,29 @@ static void expand_pb_graph_node_and_load_output_to_input_connections(t_pb_graph
                                                                       reference_pin, depth);
         }
         if (current_pb_graph_pin->is_primitive_pin()
-                    && current_pb_graph_pin->port->type == IN_PORT) {
-                    reference_pin->num_connectable_primitive_input_pins[depth]++;
-                    reference_pin->list_of_connectable_input_pin_ptrs[depth] = (t_pb_graph_pin**)vtr::realloc(
-                        reference_pin->list_of_connectable_input_pin_ptrs[depth],
-                        reference_pin->num_connectable_primitive_input_pins[depth]
-                            * sizeof(t_pb_graph_pin*));
-                    reference_pin->list_of_connectable_input_pin_ptrs[depth][reference_pin->num_connectable_primitive_input_pins[depth]
-                                                                             - 1]
-                        = current_pb_graph_pin;
-                }
+            && current_pb_graph_pin->port->type == IN_PORT) {
+            reference_pin->num_connectable_primitive_input_pins[depth]++;
+
+            //                    std::vector<t_pb_graph_pin*> temp(reference_pin->list_of_connectable_input_pin_ptrs[depth],
+            //                                		reference_pin->list_of_connectable_input_pin_ptrs[depth] + reference_pin->num_connectable_primitive_input_pins[depth] - 1);
+            //
+            //                                delete[]reference_pin->list_of_connectable_input_pin_ptrs[depth];
+            //                                reference_pin->list_of_connectable_input_pin_ptrs[depth] = new t_pb_graph_pin*[reference_pin->num_connectable_primitive_input_pins[depth]];
+            //                                for (i = 0 ; i < reference_pin->num_connectable_primitive_input_pins[depth] - 1 ; i++)
+            //                                	reference_pin->list_of_connectable_input_pin_ptrs[depth][i] = temp[i];
+            //
+            //                    			reference_pin->list_of_connectable_input_pin_ptrs[depth][reference_pin->num_connectable_primitive_input_pins[depth]
+            //                                                                                         - 1] = current_pb_graph_pin;
+
+            reference_pin->list_of_connectable_input_pin_ptrs[depth] = (t_pb_graph_pin**)vtr::realloc(
+                reference_pin->list_of_connectable_input_pin_ptrs[depth],
+                reference_pin->num_connectable_primitive_input_pins[depth]
+                    * sizeof(t_pb_graph_pin*));
+            reference_pin->list_of_connectable_input_pin_ptrs[depth][reference_pin->num_connectable_primitive_input_pins[depth]
+                                                                     - 1]
+                = current_pb_graph_pin;
         }
-
+    }
 }
 
 /**
diff --git a/vpr/src/pack/cluster_placement.cpp b/vpr/src/pack/cluster_placement.cpp
@@ -65,9 +65,9 @@ t_cluster_placement_stats* alloc_and_load_cluster_placement_stats() {
     for (const auto& type : device_ctx.logical_block_types) {
         cluster_placement_stats_list[type.index] = t_cluster_placement_stats();
         if (!is_empty_type(&type)) {
-            cluster_placement_stats_list[type.index].valid_primitives = new t_cluster_placement_primitive* [get_max_primitives_in_pb_type(type.pb_type) + 1];
-            for (int i = 0 ; i < get_max_primitives_in_pb_type(type.pb_type) + 1; i ++)
-            	cluster_placement_stats_list[type.index].valid_primitives[i] = nullptr;
+            cluster_placement_stats_list[type.index].valid_primitives = new t_cluster_placement_primitive*[get_max_primitives_in_pb_type(type.pb_type) + 1];
+            for (int i = 0; i < get_max_primitives_in_pb_type(type.pb_type) + 1; i++)
+                cluster_placement_stats_list[type.index].valid_primitives[i] = nullptr;
 
             /* too much memory allocated but shouldn't be a problem */
             cluster_placement_stats_list[type.index].curr_molecule = nullptr;
diff --git a/vpr/src/pack/cluster_util.cpp b/vpr/src/pack/cluster_util.cpp
@@ -577,9 +577,9 @@ void alloc_and_init_clustering(const t_molecule_stats& max_molecule_stats,
         }
         cur_molecule = cur_molecule->next;
     }
-    *primitives_list = new t_pb_graph_node* [max_molecule_size];
-    for (int i = 0 ; i < max_molecule_size; i ++)
-    	(*primitives_list)[i] = nullptr;
+    *primitives_list = new t_pb_graph_node*[max_molecule_size];
+    for (int i = 0; i < max_molecule_size; i++)
+        (*primitives_list)[i] = nullptr;
 }
 
 /*****************************************/
@@ -815,8 +815,8 @@ void alloc_and_load_pb_stats(t_pb* pb, const int feasible_block_array_size) {
     pb->pb_stats->lookahead_output_pins_used = std::vector<std::vector<AtomNetId>>(pb->pb_graph_node->num_output_pin_class);
     pb->pb_stats->num_feasible_blocks = NOT_VALID;
     pb->pb_stats->feasible_blocks = new t_pack_molecule*[feasible_block_array_size];
-    for (int i = 0 ; i < feasible_block_array_size ; i ++)
-    	pb->pb_stats->feasible_blocks[i] = nullptr;
+    for (int i = 0; i < feasible_block_array_size; i++)
+        pb->pb_stats->feasible_blocks[i] = nullptr;
 
     pb->pb_stats->tie_break_high_fanout_net = AtomNetId::INVALID();
 
diff --git a/vpr/src/pack/lb_type_rr_graph.cpp b/vpr/src/pack/lb_type_rr_graph.cpp
@@ -353,7 +353,7 @@ static void alloc_and_load_lb_type_rr_graph_for_pb_graph_node(const t_pb_graph_n
                 lb_type_rr_node_graph[pin_index].num_modes = num_modes;
                 lb_type_rr_node_graph[pin_index].num_fanout = new short[num_modes];
                 lb_type_rr_node_graph[pin_index].outedges = new t_lb_type_rr_node_edge*[num_modes];
-                for (int i = 0; i < num_modes; i++){
+                for (int i = 0; i < num_modes; i++) {
                     lb_type_rr_node_graph[pin_index].outedges[i] = nullptr;
                     lb_type_rr_node_graph[pin_index].num_fanout[i] = 0;
                 }
@@ -452,7 +452,7 @@ static void alloc_and_load_lb_type_rr_graph_for_pb_graph_node(const t_pb_graph_n
                 lb_type_rr_node_graph[pin_index].num_modes = num_modes;
                 lb_type_rr_node_graph[pin_index].num_fanout = new short[num_modes];
                 lb_type_rr_node_graph[pin_index].outedges = new t_lb_type_rr_node_edge*[num_modes];
-                for (int i = 0; i < num_modes; i++){
+                for (int i = 0; i < num_modes; i++) {
                     lb_type_rr_node_graph[pin_index].outedges[i] = nullptr;
                     lb_type_rr_node_graph[pin_index].num_fanout[i] = 0;
                 }
@@ -507,7 +507,7 @@ static void alloc_and_load_lb_type_rr_graph_for_pb_graph_node(const t_pb_graph_n
                     lb_type_rr_node_graph[pin_index].num_modes = num_modes;
                     lb_type_rr_node_graph[pin_index].num_fanout = new short[num_modes];
                     lb_type_rr_node_graph[pin_index].outedges = new t_lb_type_rr_node_edge*[num_modes];
-                    for (int i = 0; i < num_modes; i++){
+                    for (int i = 0; i < num_modes; i++) {
                         lb_type_rr_node_graph[pin_index].outedges[i] = nullptr;
                         lb_type_rr_node_graph[pin_index].num_fanout[i] = 0;
                     }
@@ -540,7 +540,7 @@ static void alloc_and_load_lb_type_rr_graph_for_pb_graph_node(const t_pb_graph_n
                     lb_type_rr_node_graph[pin_index].num_modes = num_modes;
                     lb_type_rr_node_graph[pin_index].num_fanout = new short[num_modes];
                     lb_type_rr_node_graph[pin_index].outedges = new t_lb_type_rr_node_edge*[num_modes];
-                    for (int i = 0; i < num_modes; i++){
+                    for (int i = 0; i < num_modes; i++) {
                         lb_type_rr_node_graph[pin_index].outedges[i] = nullptr;
                         lb_type_rr_node_graph[pin_index].num_fanout[i] = 0;
                     }
@@ -592,7 +592,7 @@ static void alloc_and_load_lb_type_rr_graph_for_pb_graph_node(const t_pb_graph_n
                 lb_type_rr_node_graph[pin_index].num_modes = num_modes;
                 lb_type_rr_node_graph[pin_index].num_fanout = new short[num_modes];
                 lb_type_rr_node_graph[pin_index].outedges = new t_lb_type_rr_node_edge*[num_modes];
-                for (int i = 0; i < num_modes; i++){
+                for (int i = 0; i < num_modes; i++) {
                     lb_type_rr_node_graph[pin_index].outedges[i] = nullptr;
                     lb_type_rr_node_graph[pin_index].num_fanout[i] = 0;
                 }
diff --git a/vpr/src/pack/output_clustering.cpp b/vpr/src/pack/output_clustering.cpp
@@ -56,10 +56,10 @@ static void print_stats() {
     num_clb_inputs_used = new int[device_ctx.logical_block_types.size()];
     num_clb_outputs_used = new int[device_ctx.logical_block_types.size()];
 
-    for (int i = 0 ; i < device_ctx.logical_block_types.size(); i ++){
-    	num_clb_types[i] = 0;
-    	num_clb_inputs_used[i] = 0;
-    	num_clb_outputs_used[i] = 0;
+    for (int i = 0; i < (int)device_ctx.logical_block_types.size(); i++) {
+        num_clb_types[i] = 0;
+        num_clb_inputs_used[i] = 0;
+        num_clb_outputs_used[i] = 0;
     }
 
     for (auto net_id : atom_ctx.nlist.nets()) {
diff --git a/vpr/src/pack/pb_type_graph.cpp b/vpr/src/pack/pb_type_graph.cpp
@@ -310,6 +310,7 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
     }
 
     /* Allocate and load child nodes for each mode and create interconnect in each mode */
+
     pb_graph_node->child_pb_graph_nodes = (t_pb_graph_node***)vtr::calloc(pb_type->num_modes, sizeof(t_pb_graph_node**));
     for (i = 0; i < pb_type->num_modes; i++) {
         pb_graph_node->child_pb_graph_nodes[i] = (t_pb_graph_node**)vtr::calloc(pb_type->modes[i].num_pb_type_children,
@@ -324,12 +325,10 @@ static void alloc_and_load_pb_graph(t_pb_graph_node* pb_graph_node,
         }
     }
 
-    if (pb_type->num_modes > 0) {
-        pb_graph_node->interconnect_pins = new t_interconnect_pins* [pb_type->num_modes] { nullptr };
-    } else {
-        pb_graph_node->interconnect_pins = nullptr;
-    }
+    pb_graph_node->interconnect_pins = new t_interconnect_pins*[pb_type->num_modes];
+
     for (i = 0; i < pb_type->num_modes; i++) {
+        pb_graph_node->interconnect_pins[i] = nullptr;
         /* Create interconnect for mode */
         alloc_and_load_mode_interconnect(pb_graph_node,
                                          pb_graph_node->child_pb_graph_nodes[i], &pb_type->modes[i],
@@ -645,14 +644,13 @@ t_pb_graph_pin*** alloc_and_load_port_pin_ptrs_from_string(const int line_num,
                   "No matching '{' for '}' in port %s\n", port_string);
     }
 
-    pb_graph_pins = new t_pb_graph_pin** [*num_sets];
+    pb_graph_pins = new t_pb_graph_pin**[*num_sets];
     *num_ptrs = new int[*num_sets];
-    for (int i = 0 ; i < *num_sets; i ++){
-    	pb_graph_pins[i] = nullptr;
-    	(*num_ptrs)[i] = 0;
+    for (i = 0; i < *num_sets; i++) {
+        pb_graph_pins[i] = nullptr;
+        (*num_ptrs)[i] = 0;
     }
 
-
     curr_set = 0;
     for (i = 0; i < num_tokens; i++) {
         VTR_ASSERT(tokens[i].type != TOKEN_NULL);
@@ -913,11 +911,11 @@ static void alloc_and_load_mux_interc_edges(t_interconnect* interconnect,
             vpr_throw(VPR_ERROR_ARCH, get_arch_file_name(), interconnect->line_num,
                       "# of pins for a particular data line of a mux must equal number of pins at output of mux\n");
         }
-        edges[i_inset].input_pins = new t_pb_graph_pin* [num_output_ptrs[0]];
-        edges[i_inset].output_pins = new t_pb_graph_pin* [num_output_ptrs[0]];
-        for (int i = 0 ; i < num_output_ptrs[0] ; i ++){
-        	 edges[i_inset].input_pins[i] = nullptr;
-        	 edges[i_inset].output_pins[i] = nullptr;
+        edges[i_inset].input_pins = new t_pb_graph_pin*[num_output_ptrs[0]];
+        edges[i_inset].output_pins = new t_pb_graph_pin*[num_output_ptrs[0]];
+        for (int i = 0; i < num_output_ptrs[0]; i++) {
+            edges[i_inset].input_pins[i] = nullptr;
+            edges[i_inset].output_pins[i] = nullptr;
         }
 
         edges[i_inset].num_input_pins = num_output_ptrs[0];
diff --git a/vpr/src/pack/prepack.cpp b/vpr/src/pack/prepack.cpp
@@ -352,9 +352,9 @@ void free_list_of_pack_patterns(std::vector<t_pack_patterns>& list_of_pack_patte
 void free_pack_pattern(t_pack_patterns* pack_pattern) {
     if (pack_pattern) {
         int num_pack_pattern_blocks = pack_pattern->num_blocks;
-        t_pack_pattern_block** pattern_block_list = new t_pack_pattern_block* [num_pack_pattern_blocks];
-        for (int i = 0 ; i < num_pack_pattern_blocks ; i++)
-        	pattern_block_list[i] = nullptr;
+        t_pack_pattern_block** pattern_block_list = new t_pack_pattern_block*[num_pack_pattern_blocks];
+        for (int i = 0; i < num_pack_pattern_blocks; i++)
+            pattern_block_list[i] = nullptr;
 
         free(pack_pattern->name);
         delete[](pack_pattern->is_block_optional);
@@ -786,9 +786,9 @@ t_pack_molecule* alloc_and_load_pack_molecules(t_pack_patterns* list_of_pack_pat
     auto& atom_ctx = g_vpr_ctx.atom();
     auto& atom_mutable_ctx = g_vpr_ctx.mutable_atom();
 
-     is_used = new bool[num_packing_patterns];
-     for (int i = 0; i < num_packing_patterns; i++)
-    	 is_used[i] = false;
+    is_used = new bool[num_packing_patterns];
+    for (i = 0; i < num_packing_patterns; i++)
+        is_used[i] = false;
 
     cur_molecule = list_of_molecules_head = nullptr;
 
