aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5/arch.cc
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2019-02-25 11:07:55 +0000
committerDavid Shah <dave@ds0.me>2019-02-25 11:49:25 +0000
commitdf79d94944b4d92207be7ddedc6424b7c931f313 (patch)
tree49215217265802745407465c41f9b493e74f47b1 /ecp5/arch.cc
parent95a85c8ea76cdd0a1c5824200451569366c9eb8c (diff)
downloadnextpnr-df79d94944b4d92207be7ddedc6424b7c931f313.tar.gz
nextpnr-df79d94944b4d92207be7ddedc6424b7c931f313.tar.bz2
nextpnr-df79d94944b4d92207be7ddedc6424b7c931f313.zip
ecp5: DELAY fixes
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'ecp5/arch.cc')
-rw-r--r--ecp5/arch.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index cd5fa0cb..da0f7b1a 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -504,17 +504,13 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay
// -----------------------------------------------------------------------
-<<<<<<< HEAD
-bool Arch::place() { return placer1(getCtx(), Placer1Cfg(getCtx())); }
-=======
bool Arch::place()
{
- bool result = placer_heap(getCtx());
+ bool result = placer1(getCtx(), Placer1Cfg(getCtx()));
if (result)
permute_luts();
return result;
}
->>>>>>> 136e030... lut permutation
bool Arch::route()
{