diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-30 18:59:04 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-30 18:59:04 -0700 |
| commit | d5049bf0eda113db9a218fe855c7e3d7d65b4384 (patch) | |
| tree | 5df283caca55eba1883788a702ac1e6547c52be5 /common | |
| parent | 8371c0dd09e5b59189a391fb1b867e5249442046 (diff) | |
| parent | 0daffec2a0efdbea36201eeb5666d208a10d0226 (diff) | |
| download | nextpnr-d5049bf0eda113db9a218fe855c7e3d7d65b4384.tar.gz nextpnr-d5049bf0eda113db9a218fe855c7e3d7d65b4384.tar.bz2 nextpnr-d5049bf0eda113db9a218fe855c7e3d7d65b4384.zip | |
Merge remote-tracking branch 'origin/estdelay' into redist_slack
Diffstat (limited to 'common')
| -rw-r--r-- | common/nextpnr.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/nextpnr.cc b/common/nextpnr.cc index cf1b5982..5b0a45ed 100644 --- a/common/nextpnr.cc +++ b/common/nextpnr.cc @@ -93,7 +93,9 @@ delay_t Context::getNetinfoRouteDelay(NetInfo *net_info, int user_idx) const WireId src_wire = getNetinfoSourceWire(net_info); if (src_wire == WireId()) return 0; - WireId cursor = getNetinfoSinkWire(net_info, user_idx); + + WireId dst_wire = getNetinfoSinkWire(net_info, user_idx); + WireId cursor = dst_wire; delay_t delay = 0; while (cursor != WireId() && cursor != src_wire) { @@ -107,11 +109,9 @@ delay_t Context::getNetinfoRouteDelay(NetInfo *net_info, int user_idx) const } if (cursor == src_wire) - delay += getWireDelay(src_wire).maxDelay(); - else - delay += estimateDelay(src_wire, cursor); + return delay + getWireDelay(src_wire).maxDelay(); - return delay; + return predictDelay(src_wire, dst_wire); } static uint32_t xorshift32(uint32_t x) |