Skip to content

Commit c31469a

Browse files
jmah76jmah76
committed
formatting
1 parent 7cbddc7 commit c31469a

File tree

4 files changed

+29
-30
lines changed

4 files changed

+29
-30
lines changed

‎libs/libarchfpga/src/arch_util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ static void free_pb_graph(t_pb_graph_node* pb_graph_node) {
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
}
333333
delete[](pb_graph_node->output_pins[i][j].list_of_connectable_input_pin_ptrs);
334334
}

‎libs/libarchfpga/src/physical_types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,9 +1256,9 @@ class t_pb_graph_pin {
12561256

12571257
/* combinational timing information */
12581258
int num_pin_timing = 0; /* Number of ipin to opin timing edges*/
1259-
std::vector<t_pb_graph_pin*>pin_timing; /* timing edge sink pins [0..num_pin_timing-1]*/
1260-
std::vector<float> pin_timing_del_max; /* primitive ipin to opin max-delay [0..num_pin_timing-1]*/
1261-
std::vector<float> pin_timing_del_min; /* primitive ipin to opin min-delay [0..num_pin_timing-1]*/
1259+
std::vector<t_pb_graph_pin*> pin_timing; /* timing edge sink pins [0..num_pin_timing-1]*/
1260+
std::vector<float> pin_timing_del_max; /* primitive ipin to opin max-delay [0..num_pin_timing-1]*/
1261+
std::vector<float> pin_timing_del_min; /* primitive ipin to opin min-delay [0..num_pin_timing-1]*/
12621262
int num_pin_timing_del_max_annotated = 0; //The list of valid pin_timing_del_max entries runs from [0..num_pin_timing_del_max_annotated-1]
12631263
int num_pin_timing_del_min_annotated = 0; //The list of valid pin_timing_del_max entries runs from [0..num_pin_timing_del_min_annotated-1]
12641264

‎vpr/src/pack/cluster_feasibility_filter.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -323,21 +323,22 @@ static void expand_pb_graph_node_and_load_output_to_input_connections(t_pb_graph
323323
&& current_pb_graph_pin->port->type == IN_PORT) {
324324
reference_pin->num_connectable_primitive_input_pins[depth]++;
325325

326-
if (reference_pin->num_connectable_primitive_input_pins[depth] - 1 > 0){
327-
std::vector<t_pb_graph_pin*> temp(reference_pin->list_of_connectable_input_pin_ptrs[depth],
328-
reference_pin->list_of_connectable_input_pin_ptrs[depth] + reference_pin->num_connectable_primitive_input_pins[depth] - 1);
329-
330-
delete[]reference_pin->list_of_connectable_input_pin_ptrs[depth];
331-
reference_pin->list_of_connectable_input_pin_ptrs[depth] = new t_pb_graph_pin*[reference_pin->num_connectable_primitive_input_pins[depth]];
332-
for (i = 0 ; i < reference_pin->num_connectable_primitive_input_pins[depth] - 1 ; i++)
333-
reference_pin->list_of_connectable_input_pin_ptrs[depth][i] = temp[i];
334-
335-
reference_pin->list_of_connectable_input_pin_ptrs[depth][reference_pin->num_connectable_primitive_input_pins[depth]
336-
- 1] = current_pb_graph_pin;
326+
if (reference_pin->num_connectable_primitive_input_pins[depth] - 1 > 0) {
327+
std::vector<t_pb_graph_pin*> temp(reference_pin->list_of_connectable_input_pin_ptrs[depth],
328+
reference_pin->list_of_connectable_input_pin_ptrs[depth] + reference_pin->num_connectable_primitive_input_pins[depth] - 1);
329+
330+
delete[] reference_pin->list_of_connectable_input_pin_ptrs[depth];
331+
reference_pin->list_of_connectable_input_pin_ptrs[depth] = new t_pb_graph_pin*[reference_pin->num_connectable_primitive_input_pins[depth]];
332+
for (i = 0; i < reference_pin->num_connectable_primitive_input_pins[depth] - 1; i++)
333+
reference_pin->list_of_connectable_input_pin_ptrs[depth][i] = temp[i];
334+
335+
reference_pin->list_of_connectable_input_pin_ptrs[depth][reference_pin->num_connectable_primitive_input_pins[depth]
336+
- 1]
337+
= current_pb_graph_pin;
337338
}
338339

339-
else{
340-
reference_pin->list_of_connectable_input_pin_ptrs[depth] = new t_pb_graph_pin*[reference_pin->num_connectable_primitive_input_pins[depth]];
340+
else {
341+
reference_pin->list_of_connectable_input_pin_ptrs[depth] = new t_pb_graph_pin*[reference_pin->num_connectable_primitive_input_pins[depth]];
341342
}
342343
reference_pin->list_of_connectable_input_pin_ptrs[depth][reference_pin->num_connectable_primitive_input_pins[depth]
343344
- 1]

‎vpr/src/pack/pb_type_graph.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,9 @@ void free_pb_graph_edges() {
361361
if (edges[i].pack_pattern_indices) {
362362
delete[](edges[i].pack_pattern_indices);
363363
}
364-
// if (edges[i].pack_pattern_names) {
365-
// vtr::free(edges[i].pack_pattern_names);
366-
// }
364+
// if (edges[i].pack_pattern_names) {
365+
// vtr::free(edges[i].pack_pattern_names);
366+
// }
367367
}
368368
edges_head = edges_head->next;
369369
num_edges_head = num_edges_head->next;
@@ -1170,18 +1170,16 @@ static bool realloc_and_load_pb_graph_pin_ptrs_at_var(const int line_num,
11701170
int prev_num_pins = *num_pins;
11711171
*num_pins += (abs(pb_msb - pb_lsb) + 1) * (abs(pin_msb - pin_lsb) + 1);
11721172

1173-
if (prev_num_pins > 0){
1174-
std::vector<t_pb_graph_pin*>temp(*pb_graph_pins, *pb_graph_pins + prev_num_pins);
1175-
delete[](*pb_graph_pins);
1176-
*pb_graph_pins = new t_pb_graph_pin*[*num_pins];
1177-
for (i = 0 ; i < prev_num_pins ; i ++)
1178-
(*pb_graph_pins)[i] = temp[i];
1179-
}
1180-
else{
1181-
*pb_graph_pins = new t_pb_graph_pin*[*num_pins];
1173+
if (prev_num_pins > 0) {
1174+
std::vector<t_pb_graph_pin*> temp(*pb_graph_pins, *pb_graph_pins + prev_num_pins);
1175+
delete[](*pb_graph_pins);
1176+
*pb_graph_pins = new t_pb_graph_pin*[*num_pins];
1177+
for (i = 0; i < prev_num_pins; i++)
1178+
(*pb_graph_pins)[i] = temp[i];
1179+
} else {
1180+
*pb_graph_pins = new t_pb_graph_pin*[*num_pins];
11821181
}
11831182

1184-
11851183
i = j = 0;
11861184

11871185
ipb = pb_lsb;

0 commit comments

Comments
 (0)