Skip to content

Commit cd2b546

Browse files
committed
[libs][rr_graph] replate to get_rr_type
1 parent 3c8afb7 commit cd2b546

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

libs/librrgraph/src/base/rr_node_types.h

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,29 @@ constexpr vtr::array<e_rr_type, const char*, (size_t)e_rr_type::NUM_RR_TYPES> rr
5656
"CHANX", "CHANY", "CHANZ",
5757
"MUX"};
5858

59-
const std::unordered_map<std::string, e_rr_type> rr_node_type_map = {{"SOURCE", e_rr_type::SOURCE},
60-
{"SINK", e_rr_type::SINK},
61-
{"IPIN", e_rr_type::IPIN},
62-
{"OPIN", e_rr_type::OPIN},
63-
{"CHANX", e_rr_type::CHANX},
64-
{"CHANY", e_rr_type::CHANY},
65-
{"CHANZ", e_rr_type::CHANZ},
66-
{"MUX", e_rr_type::MUX}};
59+
inline e_rr_type get_rr_type(const std::string& type_name) {
60+
switch (type_name) {
61+
case "SOURCE":
62+
return e_rr_type::SOURCE;
63+
case "SINK":
64+
return e_rr_type::SINK;
65+
case "IPIN":
66+
return e_rr_type::IPIN;
67+
case "OPIN":
68+
return e_rr_type::OPIN;
69+
case "CHANX":
70+
return e_rr_type::CHANX;
71+
case "CHANY":
72+
return e_rr_type::CHANY;
73+
case "CHANZ":
74+
return e_rr_type::CHANZ;
75+
case "MUX":
76+
return e_rr_type::MUX;
77+
default:
78+
VTR_ASSERT_MSG(false, "Invalid RR type name");
79+
return e_rr_type::NUM_RR_TYPES;
80+
}
81+
}
6782

6883
/**
6984
* @enum Direction

vpr/src/route/rr_graph_generation/tileable_rr_graph/crr_generator/crr_connection_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ RRNodeId CRRConnectionBuilder::process_channel_node(const SegmentInfo& info,
332332
seg_index, seg_length, physical_length, direction, truncated);
333333

334334
// Create node hash and lookup
335-
NodeHash hash = std::make_tuple(rr_node_type_map.at(seg_type_label),
335+
NodeHash hash = std::make_tuple(get_rr_type(seg_type_label),
336336
seg_sequence,
337337
x_low, x_high, y_low, y_high);
338338
auto it = node_lookup.find(hash);

0 commit comments

Comments
 (0)