From 5f37da970463b4197ddcdfeb94cfd7c7d6803682 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 19 Jun 2018 13:38:53 +0200
Subject: Add Context::force and "nextpnr-ice40 --force"

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 ice40/main.cc | 15 ++++++++++++---
 ice40/pack.cc |  3 ++-
 ice40/pack.h  |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'ice40')

diff --git a/ice40/main.cc b/ice40/main.cc
index 0ea3dc98..802a08b8 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
     po::options_description options("Allowed options");
     options.add_options()("help,h", "show help");
     options.add_options()("verbose,v", "verbose output");
+    options.add_options()("force,f", "keep running after errors");
     options.add_options()("gui", "start gui");
     options.add_options()("svg", "dump SVG file");
     options.add_options()("pack-only",
@@ -196,6 +197,10 @@ int main(int argc, char *argv[])
         ctx.verbose = true;
     }
 
+    if (vm.count("force")) {
+        ctx.force = true;
+    }
+
     if (vm.count("seed")) {
         ctx.rngseed(vm["seed"].as<int>());
     }
@@ -225,12 +230,16 @@ int main(int argc, char *argv[])
             apply_pcf(&ctx, pcf);
         }
 
-        pack_design(&ctx);
+        if (!pack_design(&ctx) && !ctx.force)
+            log_error("Packing design failed.\n");
+
         print_utilisation(&ctx);
 
         if (!vm.count("pack-only")) {
-            place_design_sa(&ctx);
-            route_design(&ctx);
+            if (!place_design_sa(&ctx) && !ctx.force)
+                log_error("Placing design failed.\n");
+            if (!route_design(&ctx) && !ctx.force)
+                log_error("Routing design failed.\n");
         }
     }
 
diff --git a/ice40/pack.cc b/ice40/pack.cc
index 1569fe01..60c86a43 100644
--- a/ice40/pack.cc
+++ b/ice40/pack.cc
@@ -390,7 +390,7 @@ static void promote_globals(Context *ctx)
 }
 
 // Main pack function
-void pack_design(Context *ctx)
+bool pack_design(Context *ctx)
 {
     pack_constants(ctx);
     promote_globals(ctx);
@@ -398,6 +398,7 @@ void pack_design(Context *ctx)
     pack_lut_lutffs(ctx);
     pack_nonlut_ffs(ctx);
     pack_ram(ctx);
+    return true;
 }
 
 NEXTPNR_NAMESPACE_END
diff --git a/ice40/pack.h b/ice40/pack.h
index 5495c986..92b76653 100644
--- a/ice40/pack.h
+++ b/ice40/pack.h
@@ -25,7 +25,7 @@
 
 NEXTPNR_NAMESPACE_BEGIN
 
-void pack_design(Context *ctx);
+bool pack_design(Context *ctx);
 
 NEXTPNR_NAMESPACE_END
 
-- 
cgit v1.2.3