Skip to content

Commit 098e613

Browse files
committed
[vpr][route][crr] remove crr generator inst
1 parent e1f97f6 commit 098e613

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ std::vector<std::string> SwitchBlockManager::get_all_patterns() const {
123123

124124
std::string SwitchBlockManager::find_matching_pattern(const std::string& sw_name) const {
125125
for (const auto& pattern : ordered_switch_block_patterns_) {
126-
if (PatternMatcher::matches_pattern(sw_name, pattern)) {
126+
if (CRRPatternMatcher::matches_pattern(sw_name, pattern)) {
127127
return pattern;
128128
}
129129
}

vpr/src/route/rr_graph_generation/tileable_rr_graph/tileable_rr_graph_edge_builder.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,19 +325,17 @@ void build_rr_graph_regular_edges(const RRGraphView& rr_graph,
325325
vtr::Point<size_t> gsb_range(grids.width() - 1, grids.height() - 1);
326326

327327
// Building CRR Graph
328-
const crrgenerator::CRRConnectionBuilder* crr_connection_builder = nullptr;
328+
std::unique_ptr<crrgenerator::CRRConnectionBuilder> crr_connection_builder;;
329329
crrgenerator::SwitchBlockManager sb_manager;
330330
crrgenerator::NodeLookupManager node_lookup(rr_graph, grids.width(), grids.height());
331-
crrgenerator::CRRGraphGenerator parser(crr_opts, rr_graph, node_lookup, sb_manager);
332331
if (build_crr_edges) {
333332
sb_manager.initialize(crr_opts.sb_maps, crr_opts.sb_templates);
334333
node_lookup.initialize();
335-
crr_connection_builder = std::make_unique<CRRConnectionBuilder>(input_graph_,
336-
node_lookup,
337-
sb_manager);
338-
const DeviceGrid& grid = g_vpr_ctx.device().grid;
339-
crr_connection_builder->initialize(grid.width() - 2,
340-
grid.height() - 2,
334+
crr_connection_builder = std::make_unique<crrgenerator::CRRConnectionBuilder>(rr_graph,
335+
node_lookup,
336+
sb_manager);
337+
crr_connection_builder->initialize(grids.width() - 2,
338+
grids.height() - 2,
341339
crr_opts.annotated_rr_graph);
342340
}
343341

0 commit comments

Comments
 (0)