diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-08-04 10:32:07 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-08-04 10:32:07 +0200 |
| commit | 96291f17aac62f9b58370c67e4eeff71adc848c1 (patch) | |
| tree | a957f13f0dacfa4ac0066f2f872ed4d06dba7e61 /common/timing.cc | |
| parent | 8d372b86f3aed86c7a8ef7869e92335bd965c2ae (diff) | |
| parent | f5a1b93f0e9348437ece7fb7d46ac69af98536d0 (diff) | |
| download | nextpnr-96291f17aac62f9b58370c67e4eeff71adc848c1.tar.gz nextpnr-96291f17aac62f9b58370c67e4eeff71adc848c1.tar.bz2 nextpnr-96291f17aac62f9b58370c67e4eeff71adc848c1.zip | |
Merge branch 'master' of github.com:YosysHQ/nextpnr into lutperm
Diffstat (limited to 'common/timing.cc')
| -rw-r--r-- | common/timing.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/timing.cc b/common/timing.cc index 9777ab7d..f422ee91 100644 --- a/common/timing.cc +++ b/common/timing.cc @@ -125,7 +125,7 @@ void assign_budget(Context *ctx, bool quiet) { if (!quiet) { log_break(); - log_info("Annotating ports with timing budgets\n"); + log_info("Annotating ports with timing budgets for target frequency %.2f MHz\n", ctx->target_freq/1e6); } // Clear delays to a very high value first @@ -142,7 +142,7 @@ void assign_budget(Context *ctx, bool quiet) for (auto &net : ctx->nets) { for (auto &user : net.second->users) { // Post-update check - if (ctx->user_freq && user.budget < 0) + if (!ctx->auto_freq && user.budget < 0) log_warning("port %s.%s, connected to net '%s', has negative " "timing budget of %fns\n", user.cell->name.c_str(ctx), user.port.c_str(ctx), net.first.c_str(ctx), @@ -159,11 +159,11 @@ void assign_budget(Context *ctx, bool quiet) // For slack redistribution, if user has not specified a frequency // dynamically adjust the target frequency to be the currently // achieved maximum - if (!ctx->user_freq && ctx->slack_redist_iter > 0) { + if (ctx->auto_freq && ctx->slack_redist_iter > 0) { ctx->target_freq = 1e12 / (default_slack - min_slack); - /*if (ctx->verbose)*/ - log_info("minimum slack for this assign = %d, target Fmax for next update = %.2f MHz\n", min_slack, - ctx->target_freq / 1e6); + if (ctx->verbose) + log_info("minimum slack for this assign = %d, target Fmax for next update = %.2f MHz\n", min_slack, + ctx->target_freq / 1e6); } if (!quiet) |