Skip to content

Commit 5366e76

Browse files
committed
removed brackets around objs to be deleted
1 parent 2ab89a1 commit 5366e76

11 files changed

+77
-77
lines changed

libs/libarchfpga/src/arch_util.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static void free_all_pb_graph_nodes(std::vector<t_logical_block_type>& type_desc
298298
if (type.pb_type) {
299299
if (type.pb_graph_head) {
300300
free_pb_graph(type.pb_graph_head);
301-
delete (type.pb_graph_head);
301+
delete type.pb_graph_head;
302302
}
303303
}
304304
}
@@ -317,45 +317,45 @@ static void free_pb_graph(t_pb_graph_node* pb_graph_node) {
317317
for (i = 0; i < pb_graph_node->num_input_ports; i++) {
318318
for (j = 0; j < pb_graph_node->num_input_pins[i]; j++) {
319319
if (pb_graph_node->input_pins[i][j].parent_pin_class)
320-
delete[](pb_graph_node->input_pins[i][j].parent_pin_class);
320+
delete[] pb_graph_node->input_pins[i][j].parent_pin_class;
321321
}
322322
delete[] pb_graph_node->input_pins[i];
323323
}
324324
for (i = 0; i < pb_graph_node->num_output_ports; i++) {
325325
for (j = 0; j < pb_graph_node->num_output_pins[i]; j++) {
326326
if (pb_graph_node->output_pins[i][j].parent_pin_class)
327-
delete[](pb_graph_node->output_pins[i][j].parent_pin_class);
327+
delete[] pb_graph_node->output_pins[i][j].parent_pin_class;
328328

329329
if (pb_graph_node->output_pins[i][j].list_of_connectable_input_pin_ptrs) {
330330
for (k = 0; k < pb_graph_node->pb_type->depth; k++) {
331-
delete[](pb_graph_node->output_pins[i][j].list_of_connectable_input_pin_ptrs[k]);
331+
delete[] pb_graph_node->output_pins[i][j].list_of_connectable_input_pin_ptrs[k];
332332
}
333-
delete[](pb_graph_node->output_pins[i][j].list_of_connectable_input_pin_ptrs);
333+
delete[]pb_graph_node->output_pins[i][j].list_of_connectable_input_pin_ptrs;
334334
}
335335

336336
if (pb_graph_node->output_pins[i][j].num_connectable_primitive_input_pins)
337-
delete[](pb_graph_node->output_pins[i][j].num_connectable_primitive_input_pins);
337+
delete[] pb_graph_node->output_pins[i][j].num_connectable_primitive_input_pins;
338338
}
339339
delete[] pb_graph_node->output_pins[i];
340340
}
341341
for (i = 0; i < pb_graph_node->num_clock_ports; i++) {
342342
for (j = 0; j < pb_graph_node->num_clock_pins[i]; j++) {
343343
if (pb_graph_node->clock_pins[i][j].parent_pin_class)
344-
delete[](pb_graph_node->clock_pins[i][j].parent_pin_class);
344+
delete[] pb_graph_node->clock_pins[i][j].parent_pin_class;
345345
}
346346
delete[] pb_graph_node->clock_pins[i];
347347
}
348348

349-
delete[](pb_graph_node->input_pins);
350-
delete[](pb_graph_node->output_pins);
351-
delete[](pb_graph_node->clock_pins);
349+
delete[] pb_graph_node->input_pins;
350+
delete[] pb_graph_node->output_pins;
351+
delete[] pb_graph_node->clock_pins;
352352

353-
delete[](pb_graph_node->num_input_pins);
354-
delete[](pb_graph_node->num_output_pins);
355-
delete[](pb_graph_node->num_clock_pins);
353+
delete[] pb_graph_node->num_input_pins;
354+
delete[] pb_graph_node->num_output_pins;
355+
delete[] pb_graph_node->num_clock_pins;
356356

357-
delete[](pb_graph_node->input_pin_class_size);
358-
delete[](pb_graph_node->output_pin_class_size);
357+
delete[] pb_graph_node->input_pin_class_size;
358+
delete[] pb_graph_node->output_pin_class_size;
359359

360360
if (pb_graph_node->interconnect_pins) {
361361
for (i = 0; i < pb_graph_node->pb_type->num_modes; i++) {
@@ -371,19 +371,19 @@ static void free_pb_graph(t_pb_graph_node* pb_graph_node) {
371371

372372
t_interconnect_power* interconn_power = interconn->interconnect_power;
373373
for (int iport = 0; iport < interconn_power->num_input_ports; ++iport) {
374-
delete[](pb_graph_node->interconnect_pins[i][j].input_pins[iport]);
374+
delete[] pb_graph_node->interconnect_pins[i][j].input_pins[iport];
375375
}
376376
for (int iport = 0; iport < interconn_power->num_output_ports; ++iport) {
377-
delete[](pb_graph_node->interconnect_pins[i][j].output_pins[iport]);
377+
delete[] pb_graph_node->interconnect_pins[i][j].output_pins[iport];
378378
}
379-
delete[](pb_graph_node->interconnect_pins[i][j].input_pins);
380-
delete[](pb_graph_node->interconnect_pins[i][j].output_pins);
379+
delete[] pb_graph_node->interconnect_pins[i][j].input_pins;
380+
delete[] pb_graph_node->interconnect_pins[i][j].output_pins;
381381
}
382-
delete[](pb_graph_node->interconnect_pins[i]);
382+
delete[] pb_graph_node->interconnect_pins[i];
383383
}
384384
}
385-
delete[](pb_graph_node->interconnect_pins);
386-
delete (pb_graph_node->pb_node_power);
385+
delete[] pb_graph_node->interconnect_pins;
386+
delete pb_graph_node->pb_node_power;
387387

388388
for (i = 0; i < pb_type->num_modes; i++) {
389389
for (j = 0; j < pb_type->modes[i].num_pb_type_children; j++) {

vpr/src/base/read_netlist.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -751,10 +751,10 @@ static void processPorts(pugi::xml_node Parent, t_pb* pb, t_pb_routes& pb_route,
751751
}
752752
}
753753
for (j = 0; j < num_sets; j++) {
754-
delete[](pin_node[j]);
754+
delete[] pin_node[j];
755755
}
756-
delete[](pin_node);
757-
delete[](num_ptrs);
756+
delete[] pin_node;
757+
delete[] num_ptrs;
758758
if (!found) {
759759
vpr_throw(VPR_ERROR_NET_F, netlist_file_name, loc_data.line(Cur),
760760
"Unknown interconnect %s connecting to pin %s.\n",
@@ -820,10 +820,10 @@ static void processPorts(pugi::xml_node Parent, t_pb* pb, t_pb_routes& pb_route,
820820
}
821821
}
822822
for (j = 0; j < num_sets; j++) {
823-
delete[](pin_node[j]);
823+
delete[] pin_node[j];
824824
}
825-
delete[](pin_node);
826-
delete[](num_ptrs);
825+
delete[] pin_node;
826+
delete[] num_ptrs;
827827
if (!found) {
828828
vpr_throw(VPR_ERROR_NET_F, netlist_file_name, loc_data.line(Cur),
829829
"Unknown interconnect %s connecting to pin %s.\n",

vpr/src/base/vpr_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ struct ClusteringHelperContext : public Context {
284284
std::vector<t_lb_type_rr_node>* lb_type_rr_graphs;
285285

286286
~ClusteringHelperContext() {
287-
delete[](primitives_list);
287+
delete[] primitives_list;
288288
}
289289
};
290290

vpr/src/base/vpr_types.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,31 +236,31 @@ void free_cluster_placement_stats(t_cluster_placement_stats* cluster_placement_s
236236
cur = cluster_placement_stats_list[index].tried;
237237
while (cur != nullptr) {
238238
next = cur->next_primitive;
239-
delete (cur);
239+
delete cur;
240240
cur = next;
241241
}
242242
cur = cluster_placement_stats_list[index].in_flight;
243243
while (cur != nullptr) {
244244
next = cur->next_primitive;
245-
delete (cur);
245+
delete cur;
246246
cur = next;
247247
}
248248
cur = cluster_placement_stats_list[index].invalid;
249249
while (cur != nullptr) {
250250
next = cur->next_primitive;
251-
delete (cur);
251+
delete cur;
252252
cur = next;
253253
}
254254
for (int j = 0; j < cluster_placement_stats_list[index].num_pb_types; j++) {
255255
cur = cluster_placement_stats_list[index].valid_primitives[j]->next_primitive;
256256
while (cur != nullptr) {
257257
next = cur->next_primitive;
258-
delete (cur);
258+
delete cur;
259259
cur = next;
260260
}
261-
delete (cluster_placement_stats_list[index].valid_primitives[j]);
261+
delete cluster_placement_stats_list[index].valid_primitives[j];
262262
}
263-
delete[](cluster_placement_stats_list[index].valid_primitives);
263+
delete[] cluster_placement_stats_list[index].valid_primitives;
264264
}
265-
delete[](cluster_placement_stats_list);
265+
delete[] cluster_placement_stats_list;
266266
}

vpr/src/pack/cluster_util.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,15 @@ void free_clustering_data(const t_packer_opts& packer_opts,
237237
clustering_data.intra_lb_routing.clear();
238238

239239
if (packer_opts.hill_climbing_flag)
240-
delete[](clustering_data.hill_climbing_inputs_avail);
240+
delete[] clustering_data.hill_climbing_inputs_avail;
241241

242242
for (auto blk_id : cluster_ctx.clb_nlist.blocks())
243243
cluster_ctx.clb_nlist.remove_block(blk_id);
244244

245245
cluster_ctx.clb_nlist = ClusteredNetlist();
246246

247-
delete[](clustering_data.unclustered_list_head);
248-
delete[](clustering_data.memory_pool);
247+
delete[] clustering_data.unclustered_list_head;
248+
delete[] clustering_data.memory_pool;
249249
}
250250

251251
//check the clustering and output it
@@ -545,7 +545,7 @@ void alloc_and_init_clustering(const t_molecule_stats& max_molecule_stats,
545545

546546
next_ptr++;
547547
}
548-
delete[](molecule_array);
548+
delete[] molecule_array;
549549

550550
/* load net info */
551551
auto& atom_ctx = g_vpr_ctx.atom();

vpr/src/pack/lb_type_rr_graph.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ void free_all_lb_type_rr_graph(std::vector<t_lb_type_rr_node>* lb_type_rr_graphs
8686
if (node->outedges != nullptr) {
8787
for (int imode = 0; imode < node->num_modes; imode++) {
8888
if (node->outedges[imode] != nullptr) {
89-
delete[](node->outedges[imode]);
89+
delete[] node->outedges[imode];
9090
}
9191
}
92-
delete[](node->outedges);
92+
delete[] node->outedges;
9393
}
9494
if (node->num_fanout != nullptr) {
95-
delete[](node->num_fanout);
95+
delete[] node->num_fanout;
9696
}
9797
}
9898
}

vpr/src/pack/output_clustering.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ static void print_stats() {
130130
}
131131
VTR_LOG("Absorbed logical nets %d out of %d nets, %d nets not absorbed.\n",
132132
total_nets_absorbed, (int)atom_ctx.nlist.nets().size(), (int)atom_ctx.nlist.nets().size() - total_nets_absorbed);
133-
delete[](num_clb_types);
134-
delete[](num_clb_inputs_used);
135-
delete[](num_clb_outputs_used);
133+
delete[] num_clb_types;
134+
delete[] num_clb_inputs_used;
135+
delete[] num_clb_outputs_used;
136136
/* TODO: print more stats */
137137
}
138138

vpr/src/pack/pb_type_graph.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -356,20 +356,20 @@ void free_pb_graph_edges() {
356356
cur_num = num_edges_head;
357357
edges = (t_pb_graph_edge*)cur->data_vptr;
358358
for (int i = 0; i < (intptr_t)cur_num->data_vptr; i++) {
359-
delete[](edges[i].input_pins);
360-
delete[](edges[i].output_pins);
359+
delete[] edges[i].input_pins;
360+
delete[] edges[i].output_pins;
361361
if (edges[i].pack_pattern_indices) {
362-
delete[](edges[i].pack_pattern_indices);
362+
delete[] edges[i].pack_pattern_indices;
363363
}
364364
// if (edges[i].pack_pattern_names) {
365365
// vtr::free(edges[i].pack_pattern_names);
366366
// }
367367
}
368368
edges_head = edges_head->next;
369369
num_edges_head = num_edges_head->next;
370-
delete[](edges);
371-
delete (cur_num);
372-
delete (cur);
370+
delete[] edges;
371+
delete cur_num;
372+
delete cur;
373373
}
374374
}
375375

@@ -579,15 +579,15 @@ static void alloc_and_load_mode_interconnect(t_pb_graph_node* pb_graph_parent_no
579579
mode->interconnect[i].output_string);
580580
}
581581
for (j = 0; j < num_input_pb_graph_node_sets; j++) {
582-
delete[](input_pb_graph_node_pins[j]);
582+
delete[] input_pb_graph_node_pins[j];
583583
}
584584
delete[](input_pb_graph_node_pins);
585585
for (j = 0; j < num_output_pb_graph_node_sets; j++) {
586-
delete[](output_pb_graph_node_pins[j]);
586+
delete[] output_pb_graph_node_pins[j];
587587
}
588-
delete[](output_pb_graph_node_pins);
589-
delete[](num_input_pb_graph_node_pins);
590-
delete[](num_output_pb_graph_node_pins);
588+
delete[] output_pb_graph_node_pins;
589+
delete[] num_input_pb_graph_node_pins;
590+
delete[] num_output_pb_graph_node_pins;
591591
}
592592
}
593593

vpr/src/pack/pb_type_graph_annotations.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,17 @@ static void load_pack_pattern_annotations(const int line_num, t_pb_graph_node* p
166166

167167
if (in_port != nullptr) {
168168
for (i = 0; i < num_in_sets; i++) {
169-
delete[](in_port[i]);
169+
delete[] in_port[i];
170170
}
171-
delete[](in_port);
172-
delete[](num_in_ptrs);
171+
delete[] in_port;
172+
delete[] num_in_ptrs;
173173
}
174174
if (out_port != nullptr) {
175175
for (i = 0; i < num_out_sets; i++) {
176-
delete[](out_port[i]);
176+
delete[] out_port[i];
177177
}
178-
delete[](out_port);
179-
delete[](num_out_ptrs);
178+
delete[] out_port;
179+
delete[] num_out_ptrs;
180180
}
181181
}
182182

@@ -456,22 +456,22 @@ static void load_delay_annotations(const int line_num,
456456
//Clean-up
457457
if (in_port != nullptr) {
458458
for (i = 0; i < num_in_sets; i++) {
459-
delete[](in_port[i]);
459+
delete[] in_port[i];
460460
}
461-
delete[](in_port);
462-
delete[](num_in_ptrs);
461+
delete[] in_port;
462+
delete[] num_in_ptrs;
463463
}
464464
if (out_port != nullptr) {
465465
for (i = 0; i < num_out_sets; i++) {
466-
delete[](out_port[i]);
466+
delete[] out_port[i];
467467
}
468-
delete[](out_port);
469-
delete[](num_out_ptrs);
468+
delete[] out_port;
469+
delete[] num_out_ptrs;
470470
}
471471
for (i = 0; i < num_inputs; i++) {
472-
delete[](delay_matrix[i]);
472+
delete[] delay_matrix[i];
473473
}
474-
delete[](delay_matrix);
474+
delete[] delay_matrix;
475475
}
476476

477477
static void inferr_unspecified_pb_graph_node_delays(t_pb_graph_node* pb_graph_node) {

vpr/src/pack/prepack.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,12 @@ void free_pack_pattern(t_pack_patterns* pack_pattern) {
357357
pattern_block_list[i] = nullptr;
358358

359359
free(pack_pattern->name);
360-
delete[](pack_pattern->is_block_optional);
360+
delete[] pack_pattern->is_block_optional;
361361
free_pack_pattern_block(pack_pattern->root_block, pattern_block_list);
362362
for (int j = 0; j < num_pack_pattern_blocks; j++) {
363-
delete (pattern_block_list[j]);
363+
delete pattern_block_list[j];
364364
}
365-
delete[](pattern_block_list);
365+
delete[] pattern_block_list;
366366
}
367367
}
368368

@@ -848,7 +848,7 @@ t_pack_molecule* alloc_and_load_pack_molecules(t_pack_patterns* list_of_pack_pat
848848
}
849849
}
850850
}
851-
delete[](is_used);
851+
delete[] is_used;
852852

853853
/* List all atom blocks as a molecule for blocks that do not belong to any molecules.
854854
* This allows the packer to be consistent as it now packs molecules only instead of atoms and molecules
@@ -917,7 +917,7 @@ static void free_pack_pattern_block(t_pack_pattern_block* pattern_block, t_pack_
917917
free_pack_pattern_block(connection->from_block, pattern_block_list);
918918
free_pack_pattern_block(connection->to_block, pattern_block_list);
919919
next = connection->next;
920-
delete (connection);
920+
delete connection;
921921
connection = next;
922922
}
923923
}

vpr/src/util/vpr_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ void free_pb_stats(t_pb* pb) {
14011401
pb->pb_stats->num_pins_of_net_in_pb.clear();
14021402

14031403
if (pb->pb_stats->feasible_blocks) {
1404-
delete[](pb->pb_stats->feasible_blocks);
1404+
delete[] pb->pb_stats->feasible_blocks;
14051405
}
14061406
if (!pb->parent_pb) {
14071407
pb->pb_stats->transitive_fanout_candidates.clear();

0 commit comments

Comments
 (0)