diff options
| author | David Shah <dave@ds0.me> | 2018-12-02 12:23:18 +0000 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2018-12-06 10:53:01 +0000 |
| commit | e1c74ad3db06c7279b018a93416dc3be178002d5 (patch) | |
| tree | 583f5d983be75801c900e4c406a67e2c86703862 /common/timing.cc | |
| parent | b51308708bf7202c097deb7f70ff83e710e0970c (diff) | |
| download | nextpnr-e1c74ad3db06c7279b018a93416dc3be178002d5.tar.gz nextpnr-e1c74ad3db06c7279b018a93416dc3be178002d5.tar.bz2 nextpnr-e1c74ad3db06c7279b018a93416dc3be178002d5.zip | |
timing_opt: Fixes including single-move legality
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'common/timing.cc')
| -rw-r--r-- | common/timing.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/timing.cc b/common/timing.cc index 1f48261d..69ccc78f 100644 --- a/common/timing.cc +++ b/common/timing.cc @@ -472,6 +472,8 @@ struct Timing auto &nd = startdomain.second; if (nd.false_startpoint) continue; + if (startdomain.first.clock == async_clock) + continue; const delay_t net_length_plus_one = nd.max_path_length + 1; auto &net_min_remaining_budget = nd.min_remaining_budget; if (nd.min_required.empty()) @@ -555,6 +557,8 @@ struct Timing const NetInfo *net = net_entry.first; for (auto &startdomain : net_entry.second) { auto &nd = startdomain.second; + if (startdomain.first.clock == async_clock) + continue; if (nd.min_required.empty()) continue; auto &nc = (*net_crit)[net->name]; @@ -575,6 +579,8 @@ struct Timing for (auto &net_entry : net_data) { const NetInfo *net = net_entry.first; for (auto &startdomain : net_entry.second) { + if (startdomain.first.clock == async_clock) + continue; auto &nd = startdomain.second; if (nd.min_required.empty()) continue; @@ -588,7 +594,7 @@ struct Timing continue; delay_t dmax = crit_path->at(ClockPair{startdomain.first, startdomain.first}).path_delay; for (size_t i = 0; i < net->users.size(); i++) { - float criticality = 1.0 - ((nc.slack.at(i) - worst_slack.at(startdomain.first)) / dmax); + float criticality = 1.0f - (float(nc.slack.at(i) - worst_slack.at(startdomain.first)) / dmax); nc.criticality.at(i) = std::max(nc.criticality.at(i), criticality); } nc.max_path_length = std::max(nc.max_path_length, nd.max_path_length); |