diff options
author | Serge Bazanski <sergiusz@q3k.org> | 2018-08-26 17:14:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-26 17:14:34 +0100 |
commit | b8db177612d279bf95de54446d1deedeb833bdbd (patch) | |
tree | f5c18fadc28001628ad9509186c704425e5afcea /common | |
parent | 61b1a754905893de213ec79ab030df92ebe1d0ca (diff) | |
parent | 32a4c5bd798241feb45f630267d95d635c967b4a (diff) | |
download | nextpnr-b8db177612d279bf95de54446d1deedeb833bdbd.tar.gz nextpnr-b8db177612d279bf95de54446d1deedeb833bdbd.tar.bz2 nextpnr-b8db177612d279bf95de54446d1deedeb833bdbd.zip |
Merge pull request #66 from YosysHQ/issue65
Fix for min_slack == max_slack => bin_size == 0
Diffstat (limited to 'common')
-rw-r--r-- | common/timing.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/timing.cc b/common/timing.cc index 5e45f8a2..62697353 100644 --- a/common/timing.cc +++ b/common/timing.cc @@ -410,12 +410,13 @@ void timing_analysis(Context *ctx, bool print_histogram, bool print_path) log_info("estimated Fmax = %.2f MHz\n", 1e3 / ctx->getDelayNS(default_slack - min_slack)); if (print_histogram && slack_histogram.size() > 0) { - constexpr unsigned num_bins = 20; + unsigned num_bins = 20; unsigned bar_width = 60; auto min_slack = slack_histogram.begin()->first; auto max_slack = slack_histogram.rbegin()->first; - auto bin_size = (max_slack - min_slack) / num_bins; - std::vector<unsigned> bins(num_bins + 1); + auto bin_size = std::max(1u, (max_slack - min_slack) / num_bins); + num_bins = std::min((max_slack - min_slack) / bin_size, num_bins) + 1; + std::vector<unsigned> bins(num_bins); unsigned max_freq = 0; for (const auto &i : slack_histogram) { auto &bin = bins[(i.first - min_slack) / bin_size]; @@ -428,7 +429,7 @@ void timing_analysis(Context *ctx, bool print_histogram, bool print_path) log_info("Slack histogram:\n"); log_info(" legend: * represents %d endpoint(s)\n", max_freq / bar_width); log_info(" + represents [1,%d) endpoint(s)\n", max_freq / bar_width); - for (unsigned i = 0; i < bins.size(); ++i) + for (unsigned i = 0; i < num_bins; ++i) log_info("[%6d, %6d) |%s%c\n", min_slack + bin_size * i, min_slack + bin_size * (i + 1), std::string(bins[i] * bar_width / max_freq, '*').c_str(), (bins[i] * bar_width) % max_freq > 0 ? '+' : ' '); |