aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5/arch.cc
diff options
context:
space:
mode:
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()
{