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

Update basic placer to use new API

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-14 15:21:00 +02:00
parent 3ef45d2a27
commit 2f01ec5157
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/place.cc
View File

@ -18,6 +18,7 @@
*/ */
#include "place.h" #include "place.h"
#include <cmath>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
#include <list> #include <list>
@ -134,13 +135,18 @@ static void place_cell(Design *design, CellInfo *cell)
if (chip.getBelType(bel) == targetType && chip.checkBelAvail(bel) && if (chip.getBelType(bel) == targetType && chip.checkBelAvail(bel) &&
isValidBelForCell(design, cell, bel)) { isValidBelForCell(design, cell, bel)) {
float distance = 0; float distance = 0;
PosInfo belPosition = chip.getBelPosition(bel); float 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 && pi.type == PORT_IN) {
CellInfo *drv = pi.net->driver.cell; CellInfo *drv = pi.net->driver.cell;
if (drv != nullptr && drv->bel != BelId()) if (drv != nullptr && drv->bel != BelId()) {
distance += chip.estimateDelay(chip.getBelPosition(drv->bel), belPosition); float otherx, othery;
chip.estimatePosition(drv->bel, otherx, othery);
distance += std::pow(belx - otherx, 2) +
std::pow(bely - othery, 2);
}
} }
} }
if (distance < best_distance) { if (distance < best_distance) {