From 823ceaacbf87aa222f7396891b5018cb00b6e9ef Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Sun, 5 Aug 2018 22:31:59 -0700
Subject: [PATCH] Change getBudgetOverride() signature to return bool and
 modify budget in place

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

diff --git a/ice40/arch.cc b/ice40/arch.cc
index 0b168383..b8bb13ea 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -637,17 +637,19 @@ std::vector<GroupId> Arch::getGroupGroups(GroupId group) const
 
 // -----------------------------------------------------------------------
 
-delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const
+bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const
 {
     const auto &driver = net_info->driver;
     if (driver.port == id_cout) {
         auto driver_loc = getBelLocation(driver.cell->bel);
         auto sink_loc = getBelLocation(sink.cell->bel);
         if (driver_loc.y == sink_loc.y)
-            return 0;
-        return 250;
+            budget = 0;
+        else
+            budget = 190;
+        return true;
     }
-    return budget;
+    return false;
 }
 
 // -----------------------------------------------------------------------
diff --git a/ice40/arch.h b/ice40/arch.h
index 236f73f1..328950df 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -766,7 +766,7 @@ struct Arch : BaseCtx
     delay_t getRipupDelayPenalty() const { return 200; }
     float getDelayNS(delay_t v) const { return v * 0.001; }
     uint32_t getDelayChecksum(delay_t v) const { return v; }
-    delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const;
+    bool getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const;
 
     // -------------------------------------------------