Merge branch 'redist_slack' into 'redist_slack'

# Conflicts:
#   common/timing.cc

3 files changed, 8 insertions, 1 deletions

diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 2b40e79a..36cefded 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -413,6 +413,8 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
     return 200 * (abs(src.location.x - dst.location.x) + abs(src.location.y - dst.location.y));
 }
 
+delay_t Arch::getBudgetOverride(NetInfo *net_info, int user_idx, delay_t budget) const { return budget; }
+
 // -----------------------------------------------------------------------
 
 bool Arch::place() { return placer1(getCtx()); }
diff --git a/ecp5/arch.h b/ecp5/arch.h
index 2421428f..df0df311 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -780,6 +780,7 @@ struct Arch : BaseCtx
     delay_t getRipupDelayPenalty() const { return 200; }
     float getDelayNS(delay_t v) const { return v * 0.001; }
     uint32_t getDelayChecksum(delay_t v) const { return v; }
+    delay_t getBudgetOverride(NetInfo *net_info, int user_idx, delay_t budget) const;
 
     // -------------------------------------------------
 
diff --git a/ecp5/main.cc b/ecp5/main.cc
index 90096855..68660ced 100644
--- a/ecp5/main.cc
+++ b/ecp5/main.cc
@@ -169,8 +169,12 @@ int main(int argc, char *argv[])
 
             if (!ctx->pack() && !ctx->force)
                 log_error("Packing design failed.\n");
-            if (vm.count("freq"))
+            if (vm.count("freq")) {
                 ctx->target_freq = vm["freq"].as<double>() * 1e6;
+                ctx->user_freq = true;
+            } else {
+                log_warning("Target frequency not specified. Will optimise for max frequency.\n");
+            }
             assign_budget(ctx.get());
             ctx->check();
             print_utilisation(ctx.get());