diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-17 18:22:39 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-17 18:22:39 +0200 |
| commit | 8e8838c8a725abc561d74eed81385df2057c38ba (patch) | |
| tree | b7767e99faf121f597442c0a62ede69380369a29 /common | |
| parent | acfef6971e8fc7b680b0f02638cf0162ceb27c25 (diff) | |
| parent | 2f9810a346e35de0dfe00607ee462436af545429 (diff) | |
| download | nextpnr-8e8838c8a725abc561d74eed81385df2057c38ba.tar.gz nextpnr-8e8838c8a725abc561d74eed81385df2057c38ba.tar.bz2 nextpnr-8e8838c8a725abc561d74eed81385df2057c38ba.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into chipdbng
Diffstat (limited to 'common')
| -rw-r--r-- | common/place_sa.cc | 4 | ||||
| -rw-r--r-- | common/route.cc | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/common/place_sa.cc b/common/place_sa.cc index 12ca30d8..a0c32c1d 100644 --- a/common/place_sa.cc +++ b/common/place_sa.cc @@ -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); diff --git a/common/route.cc b/common/route.cc index 247c8840..4cd2aa99 100644 --- a/common/route.cc +++ b/common/route.cc @@ -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; } } |