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

Updating placer

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-14 20:25:35 +02:00
parent 2f01ec5157
commit 828c96f80b
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/place.cc
View File

@ -126,10 +126,14 @@ void place_design(Design *design)
static void place_cell(Design *design, CellInfo *cell) static void place_cell(Design *design, CellInfo *cell)
{ {
assert(cell->bel == BelId());
float best_distance = std::numeric_limits<float>::infinity(); float best_distance = std::numeric_limits<float>::infinity();
BelId best_bel = BelId(); BelId best_bel = BelId();
Chip &chip = design->chip; Chip &chip = design->chip;
if(cell->bel != BelId()) {
chip.unbindBel(cell->bel);
cell->bel = BelId();
}
BelType targetType = belTypeFromId(cell->type); BelType targetType = belTypeFromId(cell->type);
for (auto bel : chip.getBels()) { for (auto bel : chip.getBels()) {
if (chip.getBelType(bel) == targetType && chip.checkBelAvail(bel) && if (chip.getBelType(bel) == targetType && chip.checkBelAvail(bel) &&
@ -139,17 +143,28 @@ static void place_cell(Design *design, CellInfo *cell)
chip.estimatePosition(bel, belx, bely); chip.estimatePosition(bel, belx, bely);
for (auto port : cell->ports) { for (auto port : cell->ports) {
const PortInfo &pi = port.second; const PortInfo &pi = port.second;
if (pi.net != nullptr && pi.type == PORT_IN) { if (pi.net != nullptr) {
CellInfo *drv = pi.net->driver.cell; CellInfo *drv = pi.net->driver.cell;
if (drv != nullptr && drv->bel != BelId()) { if (drv != nullptr && drv->bel != BelId()) {
float otherx, othery; float otherx, othery;
chip.estimatePosition(drv->bel, otherx, othery); chip.estimatePosition(drv->bel, otherx, othery);
distance += std::pow(belx - otherx, 2) + distance += std::abs(belx - otherx) +
std::pow(bely - othery, 2); std::abs(bely - othery);
}
if (pi.net->users.size() < 5) {
for (auto user : pi.net->users) {
CellInfo *uc = user.cell;
if (uc != nullptr && uc->bel != BelId()) {
float otherx, othery;
chip.estimatePosition(uc->bel, otherx, othery);
distance += std::abs(belx - otherx) +
std::abs(bely - othery);
}
}
} }
} }
} }
if (distance < best_distance) { if (distance <= best_distance) {
best_distance = distance; best_distance = distance;
best_bel = bel; best_bel = bel;
} }
@ -198,13 +213,26 @@ void place_design_heuristic(Design *design)
} }
} }
log_info("place_constraints placed %d\n", placed_cells); log_info("place_constraints placed %d\n", placed_cells);
std::unordered_set<IdString> autoplaced;
for (auto cell : design->cells) { for (auto cell : design->cells) {
CellInfo *ci = cell.second; CellInfo *ci = cell.second;
if (ci->bel == BelId()) if (ci->bel == BelId()) {
place_cell(design, ci); place_cell(design, ci);
placed_cells++; autoplaced.insert(cell.first);
placed_cells++;
}
log_info("placed %d/%d\n", placed_cells, total_cells); log_info("placed %d/%d\n", placed_cells, total_cells);
} }
for (int i = 0 ; i < 3; i ++) {
int replaced_cells = 0;
for (auto cell : autoplaced) {
CellInfo *ci = design->cells[cell];
place_cell(design, ci);
replaced_cells++;
log_info("replaced %d/%d\n", replaced_cells, autoplaced.size());
}
}
} }
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END