Skip to content

Commit 1d674de

Browse files
committed
[lib][rr_graph] remove template id from edge info
1 parent 092a7cb commit 1d674de

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

libs/librrgraph/src/base/rr_edge.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@
88
#include "rr_graph_fwd.h"
99

1010
struct t_rr_edge_info {
11-
t_rr_edge_info(RRNodeId from, RRNodeId to, short type, bool is_remapped, std::optional<std::string> sw_template_id_=std::nullopt) noexcept
11+
t_rr_edge_info(RRNodeId from, RRNodeId to, short type, bool is_remapped) noexcept
1212
: from_node(from)
1313
, to_node(to)
1414
, switch_type(type)
15-
, remapped(is_remapped)
16-
, sw_template_id(std::move(sw_template_id_)) {}
15+
, remapped(is_remapped) {}
1716

1817
RRNodeId from_node = RRNodeId::INVALID();
1918
RRNodeId to_node = RRNodeId::INVALID();
2019
short switch_type = LIBRRGRAPH_UNDEFINED_VAL;
2120
bool remapped = false;
22-
std::optional<std::string> sw_template_id;
2321

2422
friend bool operator<(const t_rr_edge_info& lhs, const t_rr_edge_info& rhs) {
2523
VTR_ASSERT(lhs.remapped == rhs.remapped);

libs/librrgraph/src/base/rr_graph_view.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,6 @@ class RRGraphView {
515515
return node_storage_.edge_source_node(id, iedge);
516516
}
517517

518-
inline const std::optional<std::string>& edge_sw_template_id(RREdgeId edge) const {
519-
return node_storage_.edge_sw_template_id(edge);
520-
}
521-
522518
/** @brief Check if the edge is a configurable edge
523519
* @note A configurable edge represents a programmable switch between routing resources, which could be
524520
* - a multiplexer

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ void build_crr_gsb_edges(RRGraphBuilder& rr_graph_builder,
7272
rr_graph_builder.create_edge_in_cache(connection.src_node(),
7373
connection.sink_node(),
7474
rr_switch_id,
75-
false,
76-
std::make_optional(connection.sw_template_id()));
75+
false);
7776
}
7877
}

0 commit comments

Comments
 (0)