Skip to content

Commit ca9e9f1

Browse files
Wang-Yuanqi-sourceWang-Yuanqi-source
authored
Update tileable_rr_graph_node_builder.cpp
1 parent 9b8a3f2 commit ca9e9f1

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎vpr/src/tileable_rr_graph/tileable_rr_graph_node_builder.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ static size_t estimate_num_grid_rr_nodes_by_type(const DeviceGrid& grids,
8282
}
8383

8484
static size_t estimate_num_medium_rr_nodes(const DeviceGrid& grids,
85-
const vtr::NdMatrix<const t_vib_inf*, 3>& vib_grid,
85+
const vtr::NdMatrix<const VibInf*, 3>& vib_grid,
8686
const size_t& layer) {
8787
size_t num_grid_rr_nodes = 0;
8888

8989
VTR_ASSERT(grids.width() == vib_grid.dim_size(1) && grids.height() == vib_grid.dim_size(2));
9090
for (size_t ix = 0; ix < grids.width(); ++ix) {
9191
for (size_t iy = 0; iy < grids.height(); ++iy) {
9292

93-
const t_vib_inf* vib = vib_grid[layer][ix][iy];
93+
const VibInf* vib = vib_grid[layer][ix][iy];
9494
if (vib == nullptr) {
9595
VTR_LOGF_ERROR(__FILE__, __LINE__,
9696
"VIB at (%d, %d) is EMPTY!\n", ix, iy);
@@ -99,8 +99,8 @@ static size_t estimate_num_medium_rr_nodes(const DeviceGrid& grids,
9999
}
100100

101101
size_t count = 0;
102-
for (size_t i_first_stage = 0; i_first_stage < vib->first_stages.size(); i_first_stage++) {
103-
auto first_stage = vib->first_stages[i_first_stage];
102+
for (size_t i_first_stage = 0; i_first_stage < vib->get_first_stages().size(); i_first_stage++) {
103+
auto first_stage = vib->get_first_stages()[i_first_stage];
104104
if (first_stage.froms.size() == 0) {
105105
VTR_LOGF_ERROR(__FILE__, __LINE__,
106106
"VIB first stage '%s' at (%d, %d) has no from!\n", first_stage.mux_name, ix, iy);
@@ -109,7 +109,7 @@ static size_t estimate_num_medium_rr_nodes(const DeviceGrid& grids,
109109
count++;
110110
}
111111

112-
VTR_ASSERT(count == vib->first_stages.size());
112+
VTR_ASSERT(count == vib->get_first_stages().size());
113113
num_grid_rr_nodes += count;
114114
}
115115
}
@@ -363,7 +363,7 @@ static size_t estimate_num_chany_rr_nodes(const DeviceGrid& grids,
363363
* Estimate the number of nodes by each type in a routing resource graph
364364
***********************************************************************/
365365
static std::vector<size_t> estimate_num_rr_nodes(const DeviceGrid& grids,
366-
const vtr::NdMatrix<const t_vib_inf*, 3>& vib_grid,
366+
const vtr::NdMatrix<const VibInf*, 3>& vib_grid,
367367
const size_t& layer,
368368
const vtr::Point<size_t>& chan_width,
369369
const std::vector<t_segment_inf>& segment_inf_x,
@@ -434,7 +434,7 @@ static std::vector<size_t> estimate_num_rr_nodes(const DeviceGrid& grids,
434434
void alloc_tileable_rr_graph_nodes(RRGraphBuilder& rr_graph_builder,
435435
vtr::vector<RRNodeId, RRSwitchId>& rr_node_driver_switches,
436436
const DeviceGrid& grids,
437-
const vtr::NdMatrix<const t_vib_inf*, 3>& vib_grid,
437+
const vtr::NdMatrix<const VibInf*, 3>& vib_grid,
438438
const size_t& layer,
439439
const vtr::Point<size_t>& chan_width,
440440
const std::vector<t_segment_inf>& segment_inf_x,
@@ -689,10 +689,10 @@ static void load_one_grid_medium_nodes_basic_info(RRGraphBuilder& rr_graph_build
689689
std::vector<t_rr_rc_data>& rr_rc_data,
690690
const size_t& layer,
691691
const vtr::Point<size_t>& grid_coordinate,
692-
const vtr::NdMatrix<const t_vib_inf*, 3>& vib_grid) {
692+
const vtr::NdMatrix<const VibInf*, 3>& vib_grid) {
693693

694-
const t_vib_inf* vib = vib_grid[layer][grid_coordinate.x()][grid_coordinate.y()];
695-
size_t num_medium_nodes = vib->first_stages.size();
694+
const VibInf* vib = vib_grid[layer][grid_coordinate.x()][grid_coordinate.y()];
695+
size_t num_medium_nodes = vib->get_first_stages().size();
696696
for (size_t i_medium = 0; i_medium < num_medium_nodes; i_medium++) {
697697
/* Create a new node and fill information */
698698
RRNodeId node = rr_graph_builder.create_node(layer, grid_coordinate.x(), grid_coordinate.y(), MEDIUM, i_medium, SIDES[0]);
@@ -711,7 +711,7 @@ static void load_one_grid_medium_nodes_basic_info(RRGraphBuilder& rr_graph_build
711711
rr_graph_builder.set_node_cost_index(node, RRIndexedDataId(MEDIUM_COST_INDEX));
712712

713713
/* Switch info */
714-
rr_node_driver_switches[node] = RRSwitchId(vib->switch_idx);
714+
rr_node_driver_switches[node] = RRSwitchId(vib->get_switch_idx());
715715

716716
/* RC data */
717717
rr_graph_builder.set_node_rc_index(node, NodeRCIndex(find_create_rr_rc_data(0., 0., rr_rc_data)));
@@ -726,11 +726,11 @@ static void load_grid_nodes_basic_info(RRGraphBuilder& rr_graph_builder,
726726
vtr::vector<RRNodeId, RRSwitchId>& rr_node_driver_switches,
727727
std::vector<t_rr_rc_data>& rr_rc_data,
728728
const DeviceGrid& grids,
729-
const vtr::NdMatrix<const t_vib_inf*, 3>& vib_grid,
729+
const vtr::NdMatrix<const VibInf*, 3>& vib_grid,
730730
const size_t& layer,
731731
const RRSwitchId& wire_to_ipin_switch,
732732
const RRSwitchId& delayless_switch,
733-
const bool& perimeter_cb
733+
const bool& perimeter_cb,
734734
const bool& is_vib_arch) {
735735
for (size_t iy = 0; iy < grids.height(); ++iy) {
736736
for (size_t ix = 0; ix < grids.width(); ++ix) {
@@ -809,10 +809,10 @@ static void load_grid_nodes_basic_info(RRGraphBuilder& rr_graph_builder,
809809
for (size_t ix = 0; ix < grids.width(); ++ix) {
810810

811811
t_physical_tile_loc tile_loc(ix, iy, layer);
812-
VTR_ASSERT(vib_grid[layer][ix][iy]->pbtype_name == grids.get_physical_type(tile_loc)->name);
812+
VTR_ASSERT(vib_grid[layer][ix][iy]->get_pbtype_name() == grids.get_physical_type(tile_loc)->name);
813813
vtr::Point<size_t> grid_coordinate(ix, iy);
814814

815-
rr_graph_builder.node_lookup().reserve_nodes(layer, ix, iy, MEDIUM, vib_grid[layer][ix][iy]->first_stages.size(), SIDES[0]);
815+
rr_graph_builder.node_lookup().reserve_nodes(layer, ix, iy, MEDIUM, vib_grid[layer][ix][iy]->get_first_stages().size(), SIDES[0]);
816816

817817
load_one_grid_medium_nodes_basic_info(rr_graph_builder,
818818
rr_node_driver_switches,
@@ -1299,7 +1299,7 @@ void create_tileable_rr_graph_nodes(const RRGraphView& rr_graph,
12991299
std::map<RRNodeId, std::vector<size_t>>& rr_node_track_ids,
13001300
std::vector<t_rr_rc_data>& rr_rc_data,
13011301
const DeviceGrid& grids,
1302-
const vtr::NdMatrix<const t_vib_inf*, 3>& vib_grid,
1302+
const vtr::NdMatrix<const VibInf*, 3>& vib_grid,
13031303
const size_t& layer,
13041304
const vtr::Point<size_t>& chan_width,
13051305
const std::vector<t_segment_inf>& segment_inf_x,

0 commit comments

Comments
 (0)