Skip to content

Commit cb8a3cb

Browse files
fix the x/y mismatch for CHANX nodes in rr_nodes and rr_node_indices
1 parent 0950877 commit cb8a3cb

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

vpr/src/route/rr_graph2.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ static void load_chan_rr_indices(const int max_chan_width,
11311131
if (!inode) {
11321132
inode = RRNodeId(*index);
11331133
++(*index);
1134-
rr_graph_builder.node_lookup().add_node(inode, layer, chan, start, type, track);
1134+
rr_graph_builder.node_lookup().add_node(inode, layer, node_start_x, node_start_y, type, track);
11351135
}
11361136

11371137
// Assign RRNodeId of start of wire to current position
@@ -1516,15 +1516,6 @@ void alloc_and_load_intra_cluster_rr_node_indices(RRGraphBuilder& rr_graph_build
15161516
}
15171517
}
15181518

1519-
/**
1520-
* Validate the node look-up matches all the node-level information
1521-
* in the storage of a routing resource graph
1522-
* This function will check the following aspects:
1523-
* - The type of each node matches its type that is indexed in the node look-up
1524-
* - For bounding box (xlow, ylow, xhigh, yhigh) of each node is indexable in the node look-up
1525-
* - The number of unique indexable nodes in the node look up matches the number of nodes in the storage
1526-
* This ensures that every node in the storage is indexable and there are no hidden nodes in the look-up
1527-
*/
15281519
bool verify_rr_node_indices(const DeviceGrid& grid,
15291520
const RRGraphView& rr_graph,
15301521
const vtr::vector<RRIndexedDataId, t_rr_indexed_data>& rr_indexed_data,

vpr/src/route/rr_graph2.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ void alloc_and_load_intra_cluster_rr_node_indices(RRGraphBuilder& rr_graph_build
5656
const vtr::vector<ClusterBlockId, std::unordered_set<int>>& pin_chains_num,
5757
int* index);
5858

59+
/**
60+
* Validate the node look-up matches all the node-level information
61+
* in the storage of a routing resource graph
62+
* This function will check the following aspects:
63+
* - The type of each node matches its type that is indexed in the node look-up
64+
* - For bounding box (xlow, ylow, xhigh, yhigh) of each node is indexable in the node look-up
65+
* - The number of unique indexable nodes in the node look up matches the number of nodes in the storage
66+
* This ensures that every node in the storage is indexable and there are no hidden nodes in the look-up
67+
*/
5968
bool verify_rr_node_indices(const DeviceGrid& grid,
6069
const RRGraphView& rr_graph,
6170
const vtr::vector<RRIndexedDataId, t_rr_indexed_data>& rr_indexed_data,

0 commit comments

Comments
 (0)