3 files changed, 8 insertions, 2 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 74548391..7383e0e7 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -23,6 +23,7 @@
 #include <cstring>
 #include "log.h"
 #include "nextpnr.h"
+#include "placer1.h"
 #include "router1.h"
 #include "util.h"
 
@@ -289,6 +290,11 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
 
 // -----------------------------------------------------------------------
 
+bool Arch::place()
+{
+    return placer1(getCtx());
+}
+
 bool Arch::route()
 {
     return router1(getCtx());
diff --git a/ecp5/arch.h b/ecp5/arch.h
index c9c5a6a1..5f01c8c8 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -720,6 +720,7 @@ struct Arch : BaseCtx
 
     // -------------------------------------------------
 
+    bool place();
     bool route();
 
     // -------------------------------------------------
diff --git a/ecp5/main.cc b/ecp5/main.cc
index a6128d0f..45774431 100644
--- a/ecp5/main.cc
+++ b/ecp5/main.cc
@@ -44,7 +44,6 @@
 #include "design_utils.h"
 #include "jsonparse.h"
 #include "pack.h"
-#include "place_sa.h"
 #include "timing.h"
 
 USING_NEXTPNR_NAMESPACE
@@ -146,7 +145,7 @@ int main(int argc, char *argv[])
             if (vm.count("no-tmdriv"))
                 ctx.timing_driven = false;
 
-            if (!place_design_sa(&ctx) && !ctx.force)
+            if (!ctx.place() && !ctx.force)
                 log_error("Placing design failed.\n");
             ctx.check();
             if (!ctx.route() && !ctx.force)