Merge branch 'redist_slack' into 'master'

Update budgets throughout placement and routing

See merge request SymbioticEDA/nextpnr!16

1 files changed, 11 insertions, 2 deletions

diff --git a/ice40/main.cc b/ice40/main.cc
index 67393d41..01576cfd 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -105,6 +105,8 @@ int main(int argc, char *argv[])
         options.add_options()("asc", po::value<std::string>(), "asc bitstream file to write");
         options.add_options()("read", po::value<std::string>(), "asc bitstream file to read");
         options.add_options()("seed", po::value<int>(), "seed value for random number generator");
+        options.add_options()("slack_redist_iter", po::value<int>(),
+                              "number of iterations between slack redistribution");
         options.add_options()("version,V", "show version");
         options.add_options()("tmfuzz", "run path delay estimate fuzzer");
         options.add_options()("test", "check architecture database integrity");
@@ -304,6 +306,10 @@ int main(int argc, char *argv[])
             ctx->rngseed(vm["seed"].as<int>());
         }
 
+        if (vm.count("slack_redist_iter")) {
+            ctx->slack_redist_iter = vm["slack_redist_iter"].as<int>();
+        }
+
         if (vm.count("svg")) {
             std::cout << "<svg xmlns=\"http://www.w3.org/2000/svg\" "
                          "xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n";
@@ -365,8 +371,12 @@ int main(int argc, char *argv[])
             }
         }
 
-        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");
+        }
 
         ctx->timing_driven = true;
         if (vm.count("no-tmdriv"))
@@ -409,7 +419,6 @@ int main(int argc, char *argv[])
 
             if (!ctx->pack() && !ctx->force)
                 log_error("Packing design failed.\n");
-            assign_budget(ctx.get());
             ctx->check();
             print_utilisation(ctx.get());
             if (!vm.count("pack-only")) {