Skip to content

Commit 88787fb

Browse files
soheilshahrouzsoheilshahrouz
committed
CHANY ---> t_rr_type::CHANY
1 parent 487944d commit 88787fb

20 files changed

+79
-82
lines changed

‎libs/librrgraph/src/base/check_rr_graph.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ void check_rr_graph(const RRGraphView& rr_graph,
154154
* - CHAN -> IPIN connections (unique rr_node for IPIN nodes on multiple sides)
155155
* - OPIN -> CHAN connections (unique rr_node for OPIN nodes on multiple sides)
156156
*/
157-
bool is_chan_to_chan = (rr_type == t_rr_type::CHANX || rr_type == CHANY) && (to_rr_type == CHANY || to_rr_type == t_rr_type::CHANX);
158-
bool is_chan_to_ipin = (rr_type == t_rr_type::CHANX || rr_type == CHANY) && to_rr_type == t_rr_type::IPIN;
159-
bool is_opin_to_chan = rr_type == t_rr_type::OPIN && (to_rr_type == t_rr_type::CHANX || to_rr_type == CHANY);
157+
bool is_chan_to_chan = (rr_type == t_rr_type::CHANX || rr_type == t_rr_type::CHANY) && (to_rr_type == t_rr_type::CHANY || to_rr_type == t_rr_type::CHANX);
158+
bool is_chan_to_ipin = (rr_type == t_rr_type::CHANX || rr_type == t_rr_type::CHANY) && to_rr_type == t_rr_type::IPIN;
159+
bool is_opin_to_chan = rr_type == t_rr_type::OPIN && (to_rr_type == t_rr_type::CHANX || to_rr_type == t_rr_type::CHANY);
160160
bool is_internal_edge = false;
161161
if (is_flat) {
162162
is_internal_edge = (rr_type == t_rr_type::IPIN && to_rr_type == t_rr_type::IPIN) || (rr_type == t_rr_type::OPIN && to_rr_type == t_rr_type::OPIN);
@@ -168,8 +168,8 @@ void check_rr_graph(const RRGraphView& rr_graph,
168168
}
169169

170170
//Between two wire segments
171-
VTR_ASSERT_MSG(to_rr_type == t_rr_type::CHANX || to_rr_type == CHANY || to_rr_type == t_rr_type::IPIN, "Expect channel type or input pin type");
172-
VTR_ASSERT_MSG(rr_type == CHANX || rr_type == CHANY || rr_type == t_rr_type::OPIN, "Expect channel type or output pin type");
171+
VTR_ASSERT_MSG(to_rr_type == t_rr_type::CHANX || to_rr_type == t_rr_type::CHANY || to_rr_type == t_rr_type::IPIN, "Expect channel type or input pin type");
172+
VTR_ASSERT_MSG(rr_type == CHANX || rr_type == t_rr_type::CHANY || rr_type == t_rr_type::OPIN, "Expect channel type or output pin type");
173173

174174
//While multiple connections between the same wires can be electrically legal,
175175
//they are redundant if they are of the same switch type.
@@ -190,8 +190,8 @@ void check_rr_graph(const RRGraphView& rr_graph,
190190
/* Redundant edges are not allowed for chan <-> chan connections
191191
* but allowed for input pin <-> chan or output pin <-> chan connections
192192
*/
193-
if ((to_rr_type == CHANX || to_rr_type == CHANY)
194-
&& (rr_type == CHANX || rr_type == CHANY)) {
193+
if ((to_rr_type == CHANX || to_rr_type == t_rr_type::CHANY)
194+
&& (rr_type == CHANX || rr_type == t_rr_type::CHANY)) {
195195
auto switch_type = rr_graph.rr_switch_inf(RRSwitchId(kv.first)).type();
196196

197197
VPR_ERROR(VPR_ERROR_ROUTE, "in check_rr_graph: node %d has %d redundant connections to node %d of switch type %d (%s)",
@@ -270,7 +270,7 @@ void check_rr_graph(const RRGraphView& rr_graph,
270270
|| (rr_graph.node_xhigh(rr_node) == int(grid.width()) - 2)
271271
|| (rr_graph.node_yhigh(rr_node) == int(grid.height()) - 2));
272272
bool is_wire = (rr_graph.node_type(rr_node) == CHANX
273-
|| rr_graph.node_type(rr_node) == CHANY);
273+
|| rr_graph.node_type(rr_node) == t_rr_type::CHANY);
274274

275275
if (!is_chain && !is_fringe && !is_wire) {
276276
if (rr_graph.node_type(rr_node) == t_rr_type::IPIN || rr_graph.node_type(rr_node) == t_rr_type::OPIN) {
@@ -436,7 +436,7 @@ void check_rr_node(const RRGraphView& rr_graph,
436436
}
437437
break;
438438

439-
case CHANY:
439+
case t_rr_type::CHANY:
440440
if (xhigh > int(grid.width()) - 2 || ylow < 1 || yhigh > int(grid.height()) - 2 || xlow != xhigh) {
441441
VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
442442
"Error in check_rr_node: CHANY out of range for endpoints (%d,%d) and (%d,%d)\n", xlow, ylow, xhigh, yhigh);
@@ -489,7 +489,7 @@ void check_rr_node(const RRGraphView& rr_graph,
489489
break;
490490

491491
case CHANX:
492-
case CHANY:
492+
case t_rr_type::CHANY:
493493
if (route_type == DETAILED) {
494494
nodes_per_chan = chan_width.max;
495495
tracks_per_node = 1;
@@ -522,7 +522,7 @@ void check_rr_node(const RRGraphView& rr_graph,
522522
C = rr_graph.node_C(rr_node);
523523
R = rr_graph.node_R(rr_node);
524524

525-
if (rr_type == CHANX || rr_type == CHANY) {
525+
if (rr_type == CHANX || rr_type == t_rr_type::CHANY) {
526526
if (C < 0. || R < 0.) {
527527
VPR_ERROR(VPR_ERROR_ROUTE,
528528
"in check_rr_node: node %d of type %d has R = %g and C = %g.\n", inode, rr_type, R, C);
@@ -545,7 +545,7 @@ static void check_unbuffered_edges(const RRGraphView& rr_graph, int from_node) {
545545
bool trans_matched;
546546

547547
from_rr_type = rr_graph.node_type(RRNodeId(from_node));
548-
if (from_rr_type != CHANX && from_rr_type != CHANY)
548+
if (from_rr_type != CHANX && from_rr_type != t_rr_type::CHANY)
549549
return;
550550

551551
from_num_edges = rr_graph.num_edges(RRNodeId(from_node));
@@ -554,7 +554,7 @@ static void check_unbuffered_edges(const RRGraphView& rr_graph, int from_node) {
554554
to_node = size_t(rr_graph.edge_sink_node(RRNodeId(from_node), from_edge));
555555
to_rr_type = rr_graph.node_type(RRNodeId(to_node));
556556

557-
if (to_rr_type != CHANX && to_rr_type != CHANY)
557+
if (to_rr_type != CHANX && to_rr_type != t_rr_type::CHANY)
558558
continue;
559559

560560
from_switch_type = rr_graph.edge_switch(RRNodeId(from_node), from_edge);

‎libs/librrgraph/src/base/rr_graph_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void RRGraphBuilder::add_node_to_all_locs(RRNodeId node) {
3838
switch (node_type) {
3939
case t_rr_type::SOURCE:
4040
case t_rr_type::SINK:
41-
case CHANY:
41+
case t_rr_type::CHANY:
4242
node_lookup_.add_node(node, node_layer, ix, iy, node_type, node_ptc_num, TOTAL_2D_SIDES[0]);
4343
break;
4444
case t_rr_type::CHANX:

‎libs/librrgraph/src/base/rr_graph_storage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct alignas(16) t_rr_node_data {
6363
int16_t xhigh_ = -1;
6464
int16_t yhigh_ = -1;
6565

66-
t_rr_type type_ = NUM_RR_TYPES;
66+
t_rr_type type_ = t_rr_type::NUM_RR_TYPES;
6767

6868
/* The character is a hex number which is a 4-bit truth table for node sides
6969
* The 4-bits in serial represent 4 sides on which a node could appear

‎libs/librrgraph/src/base/rr_graph_utils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ int seg_index_of_sblock(const RRGraphView& rr_graph, int from_node, int to_node)
9090
to_rr_type = rr_graph.node_type(RRNodeId(to_node));
9191

9292
if (from_rr_type == t_rr_type::CHANX) {
93-
if (to_rr_type == CHANY) {
93+
if (to_rr_type == t_rr_type::CHANY) {
9494
return (rr_graph.node_xlow(RRNodeId(to_node)));
9595
} else if (to_rr_type == t_rr_type::CHANX) {
9696
if (rr_graph.node_xlow(RRNodeId(to_node)) > rr_graph.node_xlow(RRNodeId(from_node))) { /* Going right */
@@ -106,10 +106,10 @@ int seg_index_of_sblock(const RRGraphView& rr_graph, int from_node, int to_node)
106106
}
107107
}
108108
/* End from_rr_type is CHANX */
109-
else if (from_rr_type == CHANY) {
109+
else if (from_rr_type == t_rr_type::CHANY) {
110110
if (to_rr_type == t_rr_type::CHANX) {
111111
return (rr_graph.node_ylow(RRNodeId(to_node)));
112-
} else if (to_rr_type == CHANY) {
112+
} else if (to_rr_type == t_rr_type::CHANY) {
113113
if (rr_graph.node_ylow(RRNodeId(to_node)) > rr_graph.node_ylow(RRNodeId(from_node))) { /* Going up */
114114
return (rr_graph.node_yhigh(RRNodeId(from_node)));
115115
} else { /* Going down */

‎libs/librrgraph/src/base/rr_graph_view.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class RRGraphView {
256256
/** @brief Check if a routing resource node is initialized.
257257
*/
258258
inline bool node_is_initialized(RRNodeId node) const {
259-
return !((node_type(node) == NUM_RR_TYPES)
259+
return !((node_type(node) == t_rr_type::NUM_RR_TYPES)
260260
&& (node_xlow(node) == -1) && (node_ylow(node) == -1)
261261
&& (node_xhigh(node) == -1) && (node_yhigh(node) == -1));
262262
}

‎libs/librrgraph/src/base/rr_node_types.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#ifndef RR_NODE_TYPES_H
2-
#define RR_NODE_TYPES_H
1+
#pragma once
32

43
#include <cstddef>
54
#include <iterator>
@@ -31,8 +30,8 @@ typedef enum e_rr_type : unsigned char {
3130
NUM_RR_TYPES
3231
} t_rr_type;
3332

34-
constexpr std::array<t_rr_type, NUM_RR_TYPES> RR_TYPES = {{SOURCE, SINK, IPIN, OPIN, CHANX, CHANY}};
35-
constexpr std::array<const char*, NUM_RR_TYPES> rr_node_typename{{"SOURCE", "SINK", "IPIN", "OPIN", "CHANX", "CHANY"}};
33+
constexpr std::array<t_rr_type, t_rr_type::NUM_RR_TYPES> RR_TYPES = {{SOURCE, SINK, IPIN, OPIN, CHANX, CHANY}};
34+
constexpr std::array<const char*, t_rr_type::NUM_RR_TYPES> rr_node_typename{{"SOURCE", "SINK", "IPIN", "OPIN", "CHANX", "CHANY"}};
3635

3736
/*
3837
* Direction::INC: wire driver is positioned at the low-coordinate end of the wire.
@@ -124,6 +123,4 @@ struct t_rr_rc_data {
124123

125124
// This is the data type of fast lookups of an rr-node given an (rr_type, layer, x, y, and the side)
126125
//[0..num_rr_types-1][0..num_layer-1][0..grid_width-1][0..grid_height-1][0..NUM_2D_SIDES-1][0..max_ptc-1]
127-
typedef std::array<vtr::NdMatrix<std::vector<RRNodeId>, 4>, NUM_RR_TYPES> t_rr_node_indices;
128-
129-
#endif
126+
typedef std::array<vtr::NdMatrix<std::vector<RRNodeId>, 4>, t_rr_type::NUM_RR_TYPES> t_rr_node_indices;

‎libs/librrgraph/src/base/rr_spatial_lookup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ bool RRSpatialLookup::remove_node(RRNodeId node,
291291
VTR_ASSERT_SAFE(layer >= 0);
292292
VTR_ASSERT_SAFE(x >= 0);
293293
VTR_ASSERT_SAFE(y >= 0);
294-
VTR_ASSERT_SAFE(type != NUM_RR_TYPES);
294+
VTR_ASSERT_SAFE(type != t_rr_type::NUM_RR_TYPES);
295295
VTR_ASSERT_SAFE(ptc >= 0);
296296
VTR_ASSERT_SAFE(side != NUM_2D_SIDES);
297297

‎vpr/src/base/stats.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ static void load_channel_occupancies(const Netlist<>& net_list,
316316
int j = rr_graph.node_ylow(inode);
317317
for (int i = rr_graph.node_xlow(inode); i <= rr_graph.node_xhigh(inode); i++)
318318
chanx_occ[i][j]++;
319-
} else if (rr_type == CHANY) {
319+
} else if (rr_type == t_rr_type::CHANY) {
320320
int i = rr_graph.node_xlow(inode);
321321
for (int j = rr_graph.node_ylow(inode); j <= rr_graph.node_yhigh(inode); j++)
322322
chany_occ[i][j]++;
@@ -354,11 +354,11 @@ void get_num_bends_and_length(ParentNetId inet, int* bends_ptr, int* len_ptr, in
354354
RRNodeId inode = rt_node.inode;
355355
t_rr_type curr_type = rr_graph.node_type(inode);
356356

357-
if (curr_type == t_rr_type::CHANX || curr_type == CHANY) {
357+
if (curr_type == t_rr_type::CHANX || curr_type == t_rr_type::CHANY) {
358358
segments++;
359359
length += rr_graph.node_length(inode);
360360

361-
if (curr_type != prev_type && (prev_type == t_rr_type::CHANX || prev_type == CHANY))
361+
if (curr_type != prev_type && (prev_type == t_rr_type::CHANX || prev_type == t_rr_type::CHANY))
362362
bends++;
363363
}
364364

‎vpr/src/base/vpr_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ struct t_det_routing_arch {
13621362
};
13631363

13641364
constexpr bool is_pin(e_rr_type type) { return (type == t_rr_type::IPIN || type == OPIN); }
1365-
constexpr bool is_chan(e_rr_type type) { return (type == t_rr_type::CHANX || type == CHANY); }
1365+
constexpr bool is_chan(e_rr_type type) { return (type == t_rr_type::CHANX || type == t_rr_type::CHANY); }
13661366
constexpr bool is_src_sink(e_rr_type type) { return (type == t_rr_type::SOURCE || type == t_rr_type::SINK); }
13671367

13681368
/**

‎vpr/src/draw/draw.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ int get_track_num(int inode, const vtr::OffsetMatrix<int>& chanx_track, const vt
641641
case t_rr_type::CHANX:
642642
return (chanx_track[i][j]);
643643

644-
case CHANY:
644+
case t_rr_type::CHANY:
645645
return (chany_track[i][j]);
646646

647647
default:

‎vpr/src/draw/draw_basic.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ void draw_congestion(ezgl::renderer* g) {
352352

353353
switch (rr_graph.node_type(inode)) {
354354
case t_rr_type::CHANX: //fallthrough
355-
case CHANY:
355+
case t_rr_type::CHANY:
356356
draw_rr_chan(inode, color, g);
357357
break;
358358

@@ -679,7 +679,7 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
679679
draw_chanx_to_chanx_edge(prev_node, inode, switch_type, g);
680680
break;
681681
}
682-
case CHANY: {
682+
case t_rr_type::CHANY: {
683683
draw_chanx_to_chany_edge(inode, prev_node, FROM_Y_TO_X, switch_type, g);
684684
break;
685685
}
@@ -697,7 +697,7 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
697697

698698
break;
699699
}
700-
case CHANY: {
700+
case t_rr_type::CHANY: {
701701
if (draw_state->draw_route_type == GLOBAL)
702702
chany_track[rr_graph.node_xlow(inode)][rr_graph.node_ylow(inode)]++;
703703

@@ -711,7 +711,7 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
711711
FROM_X_TO_Y, switch_type, g);
712712
break;
713713
}
714-
case CHANY: {
714+
case t_rr_type::CHANY: {
715715
draw_chany_to_chany_edge(RRNodeId(prev_node), RRNodeId(inode),
716716
switch_type, g);
717717
break;
@@ -840,10 +840,10 @@ void draw_routing_util(ezgl::renderer* g) {
840840
auto& device_ctx = g_vpr_ctx.device();
841841

842842
auto chanx_usage = calculate_routing_usage(t_rr_type::CHANX, draw_state->is_flat, false);
843-
auto chany_usage = calculate_routing_usage(CHANY, draw_state->is_flat, false);
843+
auto chany_usage = calculate_routing_usage(t_rr_type::CHANY, draw_state->is_flat, false);
844844

845845
auto chanx_avail = calculate_routing_avail(t_rr_type::CHANX);
846-
auto chany_avail = calculate_routing_avail(CHANY);
846+
auto chany_avail = calculate_routing_avail(t_rr_type::CHANY);
847847

848848
float min_util = 0.;
849849
float max_util = -std::numeric_limits<float>::infinity();

‎vpr/src/draw/draw_rr.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void draw_rr(ezgl::renderer* g) {
6363
/* If not highlighted node, assign color based on type. */
6464
switch (rr_graph.node_type(inode)) {
6565
case t_rr_type::CHANX:
66-
case CHANY:
66+
case t_rr_type::CHANY:
6767
draw_state->draw_rr_node[inode].color = DEFAULT_RR_NODE_COLOR;
6868
break;
6969
case t_rr_type::OPIN:
@@ -103,7 +103,7 @@ void draw_rr(ezgl::renderer* g) {
103103
draw_rr_edges(inode, g);
104104
break;
105105

106-
case CHANY:
106+
case t_rr_type::CHANY:
107107
draw_rr_chan(inode, draw_state->draw_rr_node[inode].color, g);
108108
draw_rr_edges(inode, g);
109109
break;
@@ -135,7 +135,7 @@ void draw_rr_chan(RRNodeId inode, const ezgl::color color, ezgl::renderer* g) {
135135

136136
t_rr_type type = rr_graph.node_type(inode);
137137

138-
VTR_ASSERT(type == t_rr_type::CHANX || type == CHANY);
138+
VTR_ASSERT(type == t_rr_type::CHANX || type == t_rr_type::CHANY);
139139

140140
ezgl::rectangle bound_box = draw_get_rr_chan_bbox(inode);
141141
Direction dir = rr_graph.node_direction(inode);
@@ -172,7 +172,7 @@ void draw_rr_chan(RRNodeId inode, const ezgl::color color, ezgl::renderer* g) {
172172
mux_dir = LEFT;
173173
}
174174
} else {
175-
VTR_ASSERT(type == CHANY);
175+
VTR_ASSERT(type == t_rr_type::CHANY);
176176
coord_min = rr_graph.node_ylow(inode);
177177
coord_max = rr_graph.node_yhigh(inode);
178178
if (dir == Direction::INC) {
@@ -304,7 +304,7 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
304304
case t_rr_type::OPIN:
305305
switch (to_type) {
306306
case t_rr_type::CHANX:
307-
case CHANY:
307+
case t_rr_type::CHANY:
308308
if (rgb_is_same(draw_state->draw_rr_node[inode].color, ezgl::MAGENTA)) {
309309
// If OPIN was clicked on, set color to fan-out
310310
ezgl::color color = draw_state->draw_rr_node[to_node].color;
@@ -383,7 +383,7 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
383383
switch_type, g);
384384
break;
385385

386-
case CHANY:
386+
case t_rr_type::CHANY:
387387
if (rgb_is_same(draw_state->draw_rr_node[inode].color, ezgl::MAGENTA)) {
388388
ezgl::color color = draw_state->draw_rr_node[to_node].color;
389389
g->set_color(color, transparency_factor);
@@ -408,7 +408,7 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
408408
}
409409
break;
410410

411-
case CHANY: /* from_type */
411+
case t_rr_type::CHANY: /* from_type */
412412
switch (to_type) {
413413
case t_rr_type::IPIN:
414414
if (draw_state->draw_rr_toggle == DRAW_NODES_SBOX_RR) {
@@ -453,7 +453,7 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
453453
FROM_Y_TO_X, switch_type, g);
454454
break;
455455

456-
case CHANY:
456+
case t_rr_type::CHANY:
457457
if (rgb_is_same(draw_state->draw_rr_node[inode].color, ezgl::MAGENTA)) {
458458
ezgl::color color = draw_state->draw_rr_node[to_node].color;
459459
g->set_color(color, transparency_factor);
@@ -722,7 +722,7 @@ RRNodeId draw_check_rr_node_hit(float click_x, float click_y) {
722722
break;
723723
}
724724
case t_rr_type::CHANX:
725-
case CHANY: {
725+
case t_rr_type::CHANY: {
726726
bound_box = draw_get_rr_chan_bbox(inode);
727727

728728
// Check if we clicked on this wire, with 30%
@@ -816,7 +816,7 @@ void draw_rr_costs(ezgl::renderer* g, const vtr::vector<RRNodeId, float>& rr_cos
816816

817817
switch (rr_graph.node_type(inode)) {
818818
case t_rr_type::CHANX: //fallthrough
819-
case CHANY:
819+
case t_rr_type::CHANY:
820820
draw_rr_chan(inode, color, g);
821821
if (with_edges) draw_rr_edges(inode, g);
822822
break;

‎vpr/src/route/check_route.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static bool check_adjacent(RRNodeId from_node, RRNodeId to_node, bool is_flat) {
355355

356356
case t_rr_type::OPIN:
357357
from_grid_type = device_ctx.grid.get_physical_type({from_xlow, from_ylow, from_layer});
358-
if (to_type == t_rr_type::CHANX || to_type == CHANY) {
358+
if (to_type == t_rr_type::CHANX || to_type == t_rr_type::CHANY) {
359359
num_adj += 1; //adjacent
360360
} else if (is_flat) {
361361
VTR_ASSERT(to_type == t_rr_type::OPIN || to_type == t_rr_type::IPIN); // If pin is located inside a cluster
@@ -428,18 +428,18 @@ static bool check_adjacent(RRNodeId from_node, RRNodeId to_node, bool is_flat) {
428428
}
429429
/* UDSD Modification by WMF End */
430430
}
431-
} else if (to_type == CHANY) {
431+
} else if (to_type == t_rr_type::CHANY) {
432432
num_adj += chanx_chany_adjacent(from_node, to_node);
433433
} else {
434434
VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
435435
"in check_adjacent: %d and %d are not adjacent", from_node, to_node);
436436
}
437437
break;
438438

439-
case CHANY:
439+
case t_rr_type::CHANY:
440440
if (to_type == IPIN) {
441441
num_adj += 1; //adjacent
442-
} else if (to_type == CHANY) {
442+
} else if (to_type == t_rr_type::CHANY) {
443443
from_yhigh = rr_graph.node_yhigh(from_node);
444444
to_yhigh = rr_graph.node_yhigh(to_node);
445445
if (from_xlow == to_xlow) {

0 commit comments

Comments
 (0)