diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-06-25 18:14:51 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-06-25 18:14:51 +0200 |
| commit | ec47ce2320fdc9d698e71c07af0844f7ecc2445c (patch) | |
| tree | b7a3b232daed5ef0ff7521dc6b5765613c37206b /common | |
| parent | 9affcf82d969bf34aae449a28391451a4f4fdfd8 (diff) | |
| parent | 76ff7919132a58971b197a40e7fba119f0b021f5 (diff) | |
| download | nextpnr-ec47ce2320fdc9d698e71c07af0844f7ecc2445c.tar.gz nextpnr-ec47ce2320fdc9d698e71c07af0844f7ecc2445c.tar.bz2 nextpnr-ec47ce2320fdc9d698e71c07af0844f7ecc2445c.zip | |
Merge master
Diffstat (limited to 'common')
| -rw-r--r-- | common/timing.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/timing.cc b/common/timing.cc index 582c347f..60aef3fa 100644 --- a/common/timing.cc +++ b/common/timing.cc @@ -546,7 +546,8 @@ struct Timing for (size_t i = 0; i < sink_net->users.size(); i++) { auto &user = sink_net->users.at(i); if (user.cell == drv.cell && user.port == port.first) { - sink_nd.min_required.at(i) = net_min_required - comb_delay.maxDelay(); + sink_nd.min_required.at(i) = std::min(sink_nd.min_required.at(i), + net_min_required - comb_delay.maxDelay()); break; } } @@ -752,7 +753,7 @@ void timing_analysis(Context *ctx, bool print_histogram, bool print_fmax, bool p } if (clock_reports.empty()) { - log_warning("No clocks found in design"); + log_warning("No clocks found in design\n"); } std::sort(xclock_paths.begin(), xclock_paths.end(), [ctx](const ClockPair &a, const ClockPair &b) { |