Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into chipdbng

This commit is contained in:
Clifford Wolf 2018-06-17 18:22:39 +02:00
commit 8e8838c8a7
2 changed files with 2 additions and 6 deletions

View File

@ -191,16 +191,12 @@ static bool try_swap_position(Design *design, CellInfo *cell, BelId newBel,
other_cell = design->cells[other];
chip.unbindBel(newBel);
}
if (!isValidBelForCell(design, cell, newBel))
goto swap_fail;
for (const auto &port : cell->ports)
if (port.second.net != nullptr)
update.insert(port.second.net);
if (other != IdString()) {
if (!isValidBelForCell(design, other_cell, oldBel))
goto swap_fail;
for (const auto &port : other_cell->ports)
if (port.second.net != nullptr)
update.insert(port.second.net);

View File

@ -440,8 +440,8 @@ void route_design(Design *design, bool verbose)
"routing.\n",
int(netsQueue.size()));
ripup_pip_penalty *= 1.5;
ripup_wire_penalty *= 1.5;
ripup_pip_penalty += 15;
ripup_wire_penalty += 15;
}
}