From 93a0d2456086b2c0e4a50d6ecc43ab028895bcad Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 9 Aug 2018 18:39:10 +0200
Subject: Use settings for placer1 and router1

---
 ice40/arch.cc | 13 ++-----------
 ice40/arch.h  |  2 --
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'ice40')

diff --git a/ice40/arch.cc b/ice40/arch.cc
index 7e2dd7f7..357b3018 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -565,18 +565,9 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay
 
 // -----------------------------------------------------------------------
 
-bool Arch::place()
-{
-    Placer1Cfg cfg;
-    cfg.constraintWeight = placer_constraintWeight;
-    return placer1(getCtx(), cfg);
-}
+bool Arch::place() { return placer1(getCtx(), Placer1Cfg(getCtx())); }
 
-bool Arch::route()
-{
-    Router1Cfg cfg;
-    return router1(getCtx(), cfg);
-}
+bool Arch::route() { return router1(getCtx(), Router1Cfg(getCtx())); }
 
 // -----------------------------------------------------------------------
 
diff --git a/ice40/arch.h b/ice40/arch.h
index 4c093ef9..2f2a0f30 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -832,8 +832,6 @@ struct Arch : BaseCtx
         }
         NPNR_ASSERT_FALSE("Expected PLL pin to share an output with an SB_IO D_IN_{0,1}");
     }
-
-    float placer_constraintWeight = 10;
 };
 
 void ice40DelayFuzzerMain(Context *ctx);
-- 
cgit v1.2.3


From e5006d4f2f767aab5c06d4e95151687a54902ad9 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 10 Aug 2018 19:11:30 +0200
Subject: Save settings and give nicer names to some

---
 ice40/pcf.cc     | 2 +-
 ice40/project.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ice40')

diff --git a/ice40/pcf.cc b/ice40/pcf.cc
index d9fc4e68..af5b3e17 100644
--- a/ice40/pcf.cc
+++ b/ice40/pcf.cc
@@ -66,7 +66,7 @@ bool apply_pcf(Context *ctx, std::string filename, std::istream &in)
                 log_error("unsupported pcf command '%s'\n", cmd.c_str());
             }
         }
-        ctx->settings.emplace(ctx->id("project/input/pcf"), filename);
+        ctx->settings.emplace(ctx->id("input/pcf"), filename);
         return true;
     } catch (log_execution_error_exception) {
         return false;
diff --git a/ice40/project.cc b/ice40/project.cc
index 8ca10e36..47c0903d 100644
--- a/ice40/project.cc
+++ b/ice40/project.cc
@@ -28,8 +28,8 @@ NEXTPNR_NAMESPACE_BEGIN
 void ProjectHandler::saveArch(Context *ctx, pt::ptree &root, std::string path)
 {
     root.put("project.arch.package", ctx->archArgs().package);
-    if (ctx->settings.find(ctx->id("project/input/pcf")) != ctx->settings.end()) {
-        std::string fn = ctx->settings[ctx->id("project/input/pcf")];
+    if (ctx->settings.find(ctx->id("input/pcf")) != ctx->settings.end()) {
+        std::string fn = ctx->settings[ctx->id("input/pcf")];
         root.put("project.input.pcf", make_relative(fn, path).string());
     }
 }
-- 
cgit v1.2.3