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

placer: only lock/unlock at beginning, yield elsewhere

Browse Source
This commit is contained in:
Sergiusz Bazanski 2018-07-26 22:47:04 +01:00
parent d2c3807598
commit 48713be0eb
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/placer1.cc
View File

@ -75,10 +75,10 @@ class SAPlacer
bool place() bool place()
{ {
log_break(); log_break();
ctx->lock();
size_t placed_cells = 0; size_t placed_cells = 0;
// Initial constraints placer // Initial constraints placer
ctx->lock();
for (auto &cell_entry : ctx->cells) { for (auto &cell_entry : ctx->cells) {
CellInfo *cell = cell_entry.second.get(); CellInfo *cell = cell_entry.second.get();
auto loc = cell->attrs.find(ctx->id("BEL")); auto loc = cell->attrs.find(ctx->id("BEL"));
@ -112,6 +112,7 @@ class SAPlacer
} }
int constr_placed_cells = placed_cells; int constr_placed_cells = placed_cells;
log_info("Placed %d cells based on constraints.\n", int(placed_cells)); log_info("Placed %d cells based on constraints.\n", int(placed_cells));
ctx->yield();
// Sort to-place cells for deterministic initial placement // Sort to-place cells for deterministic initial placement
std::vector<CellInfo *> autoplaced; std::vector<CellInfo *> autoplaced;
@ -123,28 +124,25 @@ class SAPlacer
} }
std::sort(autoplaced.begin(), autoplaced.end(), [](CellInfo *a, CellInfo *b) { return a->name < b->name; }); std::sort(autoplaced.begin(), autoplaced.end(), [](CellInfo *a, CellInfo *b) { return a->name < b->name; });
ctx->shuffle(autoplaced); ctx->shuffle(autoplaced);
ctx->unlock();
// Place cells randomly initially // Place cells randomly initially
log_info("Creating initial placement for remaining %d cells.\n", int(autoplaced.size())); log_info("Creating initial placement for remaining %d cells.\n", int(autoplaced.size()));
for (auto cell : autoplaced) { for (auto cell : autoplaced) {
ctx->lock();
place_initial(cell); place_initial(cell);
placed_cells++; placed_cells++;
if ((placed_cells - constr_placed_cells) % 500 == 0) if ((placed_cells - constr_placed_cells) % 500 == 0)
log_info(" initial placement placed %d/%d cells\n", int(placed_cells - constr_placed_cells), log_info(" initial placement placed %d/%d cells\n", int(placed_cells - constr_placed_cells),
int(autoplaced.size())); int(autoplaced.size()));
ctx->unlock();
} }
if ((placed_cells - constr_placed_cells) % 500 != 0) if ((placed_cells - constr_placed_cells) % 500 != 0)
log_info(" initial placement placed %d/%d cells\n", int(placed_cells - constr_placed_cells), log_info(" initial placement placed %d/%d cells\n", int(placed_cells - constr_placed_cells),
int(autoplaced.size())); int(autoplaced.size()));
ctx->yield();
log_info("Running simulated annealing placer.\n"); log_info("Running simulated annealing placer.\n");
// Calculate metric after initial placement // Calculate metric after initial placement
ctx->lock();
curr_metric = 0; curr_metric = 0;
curr_tns = 0; curr_tns = 0;
for (auto &net : ctx->nets) { for (auto &net : ctx->nets) {
@ -152,7 +150,6 @@ class SAPlacer
metrics[net.first] = wl; metrics[net.first] = wl;
curr_metric += wl; curr_metric += wl;
} }
ctx->unlock();
int n_no_progress = 0; int n_no_progress = 0;
double avg_metric = curr_metric; double avg_metric = curr_metric;
@ -249,7 +246,7 @@ class SAPlacer
ctx->yield(); ctx->yield();
} }
// Final post-pacement validitiy check // Final post-pacement validitiy check
ctx->lock(); ctx->yield();
for (auto bel : ctx->getBels()) { for (auto bel : ctx->getBels()) {
IdString cell = ctx->getBoundBelCell(bel); IdString cell = ctx->getBoundBelCell(bel);
if (!ctx->isBelLocationValid(bel)) { if (!ctx->isBelLocationValid(bel)) {