caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

place_sa: Ignore Bels locked by manual placement for SA swaps

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-17 11:33:31 +02:00
parent f9bfccf68e
commit c604426341
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/place_sa.cc
View File

@ -107,6 +107,7 @@ struct SAState
int n_move, n_accept; int n_move, n_accept;
int diameter = 35; int diameter = 35;
std::vector<std::vector<std::vector<std::vector<BelId>>>> fast_bels; std::vector<std::vector<std::vector<std::vector<BelId>>>> fast_bels;
std::unordered_set<BelId> locked_bels;
}; };
// Get the total estimated wirelength for a net // Get the total estimated wirelength for a net
@ -255,12 +256,17 @@ BelId random_bel_for_cell(Design *design, CellInfo *cell, SAState &state,
const auto &fb = state.fast_bels.at(int(targetType)).at(nx).at(ny); const auto &fb = state.fast_bels.at(int(targetType)).at(nx).at(ny);
if (fb.size() == 0) if (fb.size() == 0)
continue; continue;
return fb.at(random_int_between(rnd, 0, fb.size())); BelId bel = fb.at(random_int_between(rnd, 0, fb.size()));
if (state.locked_bels.find(bel) != state.locked_bels.end())
continue;
return bel;
} }
} }
void place_design_sa(Design *design) void place_design_sa(Design *design)
{ {
SAState state;
size_t total_cells = design->cells.size(), placed_cells = 0; size_t total_cells = design->cells.size(), placed_cells = 0;
std::queue<CellInfo *> visit_cells; std::queue<CellInfo *> visit_cells;
// Initial constraints placer // Initial constraints placer
@ -286,6 +292,7 @@ void place_design_sa(Design *design)
cell->bel = bel; cell->bel = bel;
design->chip.bindBel(bel, cell->name); design->chip.bindBel(bel, cell->name);
state.locked_bels.insert(bel);
placed_cells++; placed_cells++;
visit_cells.push(cell); visit_cells.push(cell);
} }
@ -294,7 +301,6 @@ void place_design_sa(Design *design)
rnd_state rnd; rnd_state rnd;
rnd.state = 1; rnd.state = 1;
std::vector<CellInfo *> autoplaced; std::vector<CellInfo *> autoplaced;
SAState state;
// Place cells randomly initially // Place cells randomly initially
for (auto cell : design->cells) { for (auto cell : design->cells) {
CellInfo *ci = cell.second; CellInfo *ci = cell.second;