Skip to content

Commit ee938f3

Browse files
committed
[vpr][route][crr] fix format
1 parent d7f3183 commit ee938f3

File tree

2 files changed

+34
-7
lines changed

2 files changed

+34
-7
lines changed

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,10 @@ std::vector<Connection> CRRConnectionBuilder::get_tile_connections(size_t tile_x
180180
return tile_connections;
181181
}
182182

183-
std::map<size_t, RRNodeId> CRRConnectionBuilder::get_vertical_nodes(Coordinate x, Coordinate y, const DataFrame& df, const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const {
183+
std::map<size_t, RRNodeId> CRRConnectionBuilder::get_vertical_nodes(Coordinate x,
184+
Coordinate y,
185+
const DataFrame& df,
186+
const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const {
184187
std::map<size_t, RRNodeId> source_nodes;
185188
std::string prev_seg_type = "";
186189
int prev_seg_index = -1;
@@ -209,7 +212,10 @@ std::map<size_t, RRNodeId> CRRConnectionBuilder::get_vertical_nodes(Coordinate x
209212
return source_nodes;
210213
}
211214

212-
std::map<size_t, RRNodeId> CRRConnectionBuilder::get_horizontal_nodes(Coordinate x, Coordinate y, const DataFrame& df, const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const {
215+
std::map<size_t, RRNodeId> CRRConnectionBuilder::get_horizontal_nodes(Coordinate x,
216+
Coordinate y,
217+
const DataFrame& df,
218+
const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const {
213219
std::map<size_t, RRNodeId> sink_nodes;
214220
std::string prev_seg_type = "";
215221
int prev_seg_index = -1;
@@ -293,7 +299,10 @@ CRRConnectionBuilder::SegmentInfo CRRConnectionBuilder::parse_segment_info(const
293299
return info;
294300
}
295301

296-
RRNodeId CRRConnectionBuilder::process_opin_ipin_node(const SegmentInfo& info, Coordinate x, Coordinate y, const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const {
302+
RRNodeId CRRConnectionBuilder::process_opin_ipin_node(const SegmentInfo& info,
303+
Coordinate x,
304+
Coordinate y,
305+
const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const {
297306
VTR_ASSERT(info.side == Side::OPIN || info.side == Side::IPIN);
298307
e_rr_type node_type = (info.side == Side::OPIN) ? e_rr_type::OPIN : e_rr_type::IPIN;
299308
NodeHash hash = std::make_tuple(node_type,
@@ -308,7 +317,15 @@ RRNodeId CRRConnectionBuilder::process_opin_ipin_node(const SegmentInfo& info, C
308317
return RRNodeId::INVALID();
309318
}
310319

311-
RRNodeId CRRConnectionBuilder::process_channel_node(const SegmentInfo& info, Coordinate x, Coordinate y, const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup, int& prev_seg_index, Side& prev_side, std::string& prev_seg_type, int& prev_ptc_number, bool is_vertical) const {
320+
RRNodeId CRRConnectionBuilder::process_channel_node(const SegmentInfo& info,
321+
Coordinate x,
322+
Coordinate y,
323+
const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup,
324+
int& prev_seg_index,
325+
Side& prev_side,
326+
std::string& prev_seg_type,
327+
int& prev_ptc_number,
328+
bool is_vertical) const {
312329
// Check grid boundaries
313330
if ((info.side == Side::RIGHT && x == fpga_grid_x_) || (info.side == Side::TOP && y == fpga_grid_y_)) {
314331
return RRNodeId::INVALID();

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,22 @@ class CRRConnectionBuilder {
108108
std::vector<Connection>& tile_connections) const;
109109

110110
// Node processing methods
111-
std::map<size_t, RRNodeId> get_vertical_nodes(Coordinate x, Coordinate y, const DataFrame& df, const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const;
111+
std::map<size_t, RRNodeId> get_vertical_nodes(Coordinate x,
112+
Coordinate y,
113+
const DataFrame& df,
114+
const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const;
112115

113-
std::map<size_t, RRNodeId> get_horizontal_nodes(Coordinate x, Coordinate y, const DataFrame& df, const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const;
116+
std::map<size_t, RRNodeId> get_horizontal_nodes(Coordinate x,
117+
Coordinate y,
118+
const DataFrame& df,
119+
const std::unordered_map<NodeHash, RRNodeId, NodeHasher>& node_lookup) const;
114120

115121
// PTC sequence calculation
116-
std::string get_ptc_sequence(int seg_index, int seg_length, int physical_length, Direction direction, int truncated) const;
122+
std::string get_ptc_sequence(int seg_index,
123+
int seg_length,
124+
int physical_length,
125+
Direction direction,
126+
int truncated) const;
117127

118128
// Segment processing helpers
119129
struct SegmentInfo {

0 commit comments

Comments
 (0)