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

placer1: Legalise after reaching a diameter, not temperature

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-01-08 10:36:30 +00:00
parent 9cd5980d35
commit 4cf8549f5c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/placer1.cc
View File

@ -317,7 +317,7 @@ class SAPlacer
} }
// Once cooled below legalise threshold, run legalisation and start requiring // Once cooled below legalise threshold, run legalisation and start requiring
// legal moves only // legal moves only
if (temp < legalise_temp && require_legal) { if (diameter < legalise_dia && require_legal) {
if (legalise_relative_constraints(ctx)) { if (legalise_relative_constraints(ctx)) {
// Only increase temperature if something was moved // Only increase temperature if something was moved
autoplaced.clear(); autoplaced.clear();
@ -329,8 +329,8 @@ class SAPlacer
else if (cell.second->belStrength < STRENGTH_STRONG) else if (cell.second->belStrength < STRENGTH_STRONG)
autoplaced.push_back(cell.second); autoplaced.push_back(cell.second);
} }
temp = post_legalise_temp; // temp = post_legalise_temp;
diameter = std::min<int>(M, diameter * post_legalise_dia_scale); // diameter = std::min<int>(M, diameter * post_legalise_dia_scale);
ctx->shuffle(autoplaced); ctx->shuffle(autoplaced);
// Legalisation is a big change so force a slack redistribution here // Legalisation is a big change so force a slack redistribution here
@ -901,9 +901,7 @@ class SAPlacer
std::vector<NetInfo *> net_by_udata; std::vector<NetInfo *> net_by_udata;
std::vector<decltype(NetInfo::udata)> old_udata; std::vector<decltype(NetInfo::udata)> old_udata;
bool require_legal = true; bool require_legal = true;
const float legalise_temp = 0.001; const int legalise_dia = 4;
const float post_legalise_temp = 0.002;
const float post_legalise_dia_scale = 1.5;
Placer1Cfg cfg; Placer1Cfg cfg;
}; };