Merge pull request #30 from eddiehung/slack_redist_freq

Slack redistribution to auto-tune frequency only if --freq 0 set

1 files changed, 10 insertions, 7 deletions

diff --git a/ice40/main.cc b/ice40/main.cc
index 37e18215..46cdce71 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -319,6 +319,13 @@ int main(int argc, char *argv[])
 
         if (vm.count("slack_redist_iter")) {
             ctx->slack_redist_iter = vm["slack_redist_iter"].as<int>();
+            if (vm.count("freq") && vm["freq"].as<double>() == 0) {
+                ctx->auto_freq = true;
+#ifndef NO_GUI
+                if (!vm.count("gui"))
+#endif
+                    log_warning("Target frequency not specified. Will optimise for max frequency.\n");
+            }
         }
 
         if (vm.count("cstrweight")) {
@@ -385,13 +392,9 @@ int main(int argc, char *argv[])
         }
 
         if (vm.count("freq")) {
-            ctx->target_freq = vm["freq"].as<double>() * 1e6;
-            ctx->user_freq = true;
-        } else {
-#ifndef NO_GUI
-            if (!vm.count("gui"))
-#endif
-                log_warning("Target frequency not specified. Will optimise for max frequency.\n");
+            auto freq = vm["freq"].as<double>();
+            if (freq > 0)
+                ctx->target_freq = freq * 1e6;
         }
 
         ctx->timing_driven = true;