Skip to content

Commit cb5abed

Browse files
SamuelHo10SamuelHo10
committed
code cleanup
1 parent 4456bad commit cb5abed

File tree

2 files changed

+41
-42
lines changed

2 files changed

+41
-42
lines changed

‎vpr/src/draw/draw_rr.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,8 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
237237
auto& device_ctx = g_vpr_ctx.device();
238238
const auto& rr_graph = device_ctx.rr_graph;
239239

240-
e_rr_type from_type, to_type;
241-
242-
from_type = rr_graph.node_type(inode);
240+
e_rr_type to_type;
241+
e_rr_type from_type = rr_graph.node_type(inode);
243242

244243
// Currently don't visualize source or sinks.
245244
if (from_type == e_rr_type::SOURCE || from_type == e_rr_type::SINK) {

‎vpr/src/draw/draw_rr_edges.cpp

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ void draw_intra_cluster_pin_to_pin(RRNodeId intra_cluster_node, RRNodeId inter_c
311311
return;
312312
}
313313

314-
for (const e_side& pin_side : TOTAL_2D_SIDES) {
314+
for (const e_side pin_side : TOTAL_2D_SIDES) {
315315
// Draw connections to each side of the inter-cluster node
316316
if (!rr_graph.is_node_on_specific_side(inter_cluster_node, pin_side)) {
317317
continue;
@@ -359,7 +359,7 @@ void draw_pin_to_pin(RRNodeId opin_node, RRNodeId ipin_node, ezgl::renderer* g)
359359
*/
360360
float x1 = 0, y1 = 0;
361361
std::vector<e_side> opin_candidate_sides;
362-
for (const e_side& opin_candidate_side : TOTAL_2D_SIDES) {
362+
for (const e_side opin_candidate_side : TOTAL_2D_SIDES) {
363363
if (rr_graph.is_node_on_specific_side(opin_node, opin_candidate_side)) {
364364
opin_candidate_sides.push_back(opin_candidate_side);
365365
}
@@ -369,7 +369,7 @@ void draw_pin_to_pin(RRNodeId opin_node, RRNodeId ipin_node, ezgl::renderer* g)
369369

370370
float x2 = 0, y2 = 0;
371371
std::vector<e_side> ipin_candidate_sides;
372-
for (const e_side& ipin_candidate_side : TOTAL_2D_SIDES) {
372+
for (const e_side ipin_candidate_side : TOTAL_2D_SIDES) {
373373
if (rr_graph.is_node_on_specific_side(ipin_node, ipin_candidate_side)) {
374374
ipin_candidate_sides.push_back(ipin_candidate_side);
375375
}
@@ -390,7 +390,7 @@ void draw_pin_to_sink(RRNodeId ipin_node, RRNodeId sink_node, ezgl::renderer* g)
390390

391391
float x1 = 0, y1 = 0;
392392
/* Draw the line for each ipin on different sides */
393-
for (const e_side& pin_side : TOTAL_2D_SIDES) {
393+
for (const e_side pin_side : TOTAL_2D_SIDES) {
394394
if (!rr_graph.is_node_on_specific_side(ipin_node, pin_side)) {
395395
continue;
396396
}
@@ -416,7 +416,7 @@ void draw_source_to_pin(RRNodeId source_node, RRNodeId opin_node, ezgl::renderer
416416
draw_get_rr_src_sink_coords(rr_graph.rr_nodes()[size_t(source_node)], &x1, &y1);
417417

418418
/* Draw the line for each ipin on different sides */
419-
for (const e_side& pin_side : TOTAL_2D_SIDES) {
419+
for (const e_side pin_side : TOTAL_2D_SIDES) {
420420
if (!rr_graph.is_node_on_specific_side(opin_node, pin_side)) {
421421
continue;
422422
}
@@ -483,7 +483,7 @@ e_side get_pin_side(RRNodeId pin_node, RRNodeId chan_node) {
483483
* the actual offset of the pin in the context of grid width and height
484484
*/
485485
std::vector<e_side> pin_candidate_sides;
486-
for (const e_side& pin_candidate_side : TOTAL_2D_SIDES) {
486+
for (const e_side pin_candidate_side : TOTAL_2D_SIDES) {
487487
if ((rr_graph.is_node_on_specific_side(pin_node, pin_candidate_side))
488488
&& (grid_type->pinloc[width_offset][height_offset][pin_candidate_side][rr_graph.node_pin_num(pin_node)])) {
489489
pin_candidate_sides.push_back(pin_candidate_side);
@@ -629,7 +629,7 @@ void draw_rr_edge(RRNodeId inode, RRNodeId prev_node, ezgl::color color, ezgl::r
629629
bool inode_inter_cluster = is_inter_cluster_node(rr_graph, inode);
630630
int current_node_layer = rr_graph.node_layer(inode);
631631

632-
e_rr_type prev_type = rr_graph.node_type(RRNodeId(prev_node));
632+
e_rr_type prev_type = rr_graph.node_type(prev_node);
633633
bool prev_node_inter_cluster = is_inter_cluster_node(rr_graph, prev_node);
634634
int prev_node_layer = rr_graph.node_layer(prev_node);
635635

@@ -668,68 +668,68 @@ void draw_rr_edge(RRNodeId inode, RRNodeId prev_node, ezgl::color color, ezgl::r
668668
void draw_inter_cluster_rr_edge(RRNodeId inode, RRNodeId prev_node, e_rr_type rr_type, e_rr_type prev_type, ezgl::renderer* g) {
669669
const RRGraphView& rr_graph = g_vpr_ctx.device().rr_graph;
670670
t_edge_size iedge = find_edge(prev_node, inode);
671-
short switch_type = rr_graph.edge_switch(RRNodeId(prev_node), iedge);
671+
short switch_type = rr_graph.edge_switch(prev_node, iedge);
672672

673-
switch (rr_type) {
674-
case e_rr_type::IPIN: {
673+
switch (rr_type)
674+
case e_rr_type::IPIN:
675675
if (prev_type == e_rr_type::OPIN) {
676676
draw_pin_to_pin(prev_node, inode, g);
677677
} else {
678678
draw_pin_to_chan_edge(inode, prev_node, g);
679679
}
680680
break;
681-
}
682-
case e_rr_type::CHANX: {
683-
switch (prev_type) {
684-
case e_rr_type::CHANX: {
681+
682+
case e_rr_type::CHANX:
683+
switch (prev_type)
684+
case e_rr_type::CHANX:
685685
draw_chanx_to_chanx_edge(prev_node, inode, switch_type, g);
686686
break;
687-
}
688-
case e_rr_type::CHANY: {
687+
688+
case e_rr_type::CHANY:
689689
draw_chanx_to_chany_edge(inode, prev_node, FROM_Y_TO_X, switch_type, g);
690690
break;
691-
}
692-
case e_rr_type::OPIN: {
691+
692+
case e_rr_type::OPIN:
693693
draw_pin_to_chan_edge(prev_node, inode, g);
694694
break;
695-
}
696-
default: {
695+
696+
default:
697697
VPR_ERROR(VPR_ERROR_OTHER,
698698
"Unexpected connection from an rr_node of type %d to one of type %d.\n",
699699
prev_type, rr_type);
700-
}
701-
}
700+
701+
702702
break;
703-
}
704-
case e_rr_type::CHANY: {
705-
switch (prev_type) {
706-
case e_rr_type::CHANX: {
703+
704+
case e_rr_type::CHANY:
705+
switch (prev_type)
706+
case e_rr_type::CHANX:
707707
draw_chanx_to_chany_edge(prev_node, inode,
708708
FROM_X_TO_Y, switch_type, g);
709709
break;
710-
}
711-
case e_rr_type::CHANY: {
712-
draw_chany_to_chany_edge(RRNodeId(prev_node), RRNodeId(inode),
710+
711+
case e_rr_type::CHANY:
712+
draw_chany_to_chany_edge(prev_node, inode,
713713
switch_type, g);
714714
break;
715-
}
716-
case e_rr_type::OPIN: {
715+
716+
case e_rr_type::OPIN:
717717
draw_pin_to_chan_edge(prev_node, inode, g);
718718

719719
break;
720-
}
721-
default: {
720+
721+
default:
722722
VPR_ERROR(VPR_ERROR_OTHER,
723723
"Unexpected connection from an rr_node of type %d to one of type %d.\n",
724724
prev_type, rr_type);
725-
}
726-
}
725+
726+
727727
break;
728-
}
729-
default: {
728+
729+
default:
730730
break;
731-
}
732-
}
731+
732+
733733
}
734734

735735
#endif

0 commit comments

Comments
 (0)