From f4d8a25fb74a15da76359c5737098a7fd83e193c Mon Sep 17 00:00:00 2001
From: David Shah <dave@ds0.me>
Date: Sun, 27 Jan 2019 14:43:10 +0000
Subject: ice40: Add budget override for CO->I3 path

Signed-off-by: David Shah <dave@ds0.me>
---
 ice40/arch.cc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ice40/arch.cc b/ice40/arch.cc
index 04c70e94..46faafc4 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -621,6 +621,29 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay
             }
         }
         return true;
+    } else if (driver.port == id_COUT && sink.port == id_I3) {
+        bool same_y = driver.cell->constr_abs_z && driver.cell->constr_z < 7;
+        switch (args.type) {
+#ifndef ICE40_HX1K_ONLY
+        case ArchArgs::HX8K:
+#endif
+        case ArchArgs::HX1K:
+            budget = same_y ? 260 : 560;
+            break;
+#ifndef ICE40_HX1K_ONLY
+        case ArchArgs::LP384:
+        case ArchArgs::LP1K:
+        case ArchArgs::LP8K:
+            budget = same_y ? 380 : 670;
+            break;
+        case ArchArgs::UP5K:
+            budget = same_y ? 660 : 1220;
+            break;
+#endif
+        default:
+            log_error("Unsupported iCE40 chip type.\n");
+        }
+        return true;
     }
     return false;
 }
-- 
cgit v1.2.3


From 77bb5ea63a86f2ce5feb2f3ee13d920c85c29111 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Tue, 29 Jan 2019 10:43:14 -0800
Subject: [ice40] Refactor Arch::getBudgetOverride()

---
 ice40/arch.cc | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/ice40/arch.cc b/ice40/arch.cc
index 46faafc4..3c2f0380 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -594,26 +594,29 @@ std::vector<GroupId> Arch::getGroupGroups(GroupId group) 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 && sink.port == id_CIN) {
-        if (driver.cell->constr_abs_z && driver.cell->constr_z < 7)
+    if (driver.port == id_COUT) {
+        NPNR_ASSERT(sink.port == id_CIN || sink.port == id_I3);
+        NPNR_ASSERT(driver.cell->constr_abs_z);
+        bool cin = sink.port == id_CIN;
+        bool same_y = driver.cell->constr_z < 7;
+        if (cin && same_y)
             budget = 0;
         else {
-            NPNR_ASSERT(driver.cell->constr_z == 7);
             switch (args.type) {
 #ifndef ICE40_HX1K_ONLY
             case ArchArgs::HX8K:
 #endif
             case ArchArgs::HX1K:
-                budget = 190;
+                budget = cin ? 190 : (same_y ? 260 : 560);
                 break;
 #ifndef ICE40_HX1K_ONLY
             case ArchArgs::LP384:
             case ArchArgs::LP1K:
             case ArchArgs::LP8K:
-                budget = 290;
+                budget = cin ? 290 : (same_y ? 380 : 670);
                 break;
             case ArchArgs::UP5K:
-                budget = 560;
+                budget = cin ? 560 : (same_y ? 660 : 1220);
                 break;
 #endif
             default:
@@ -621,29 +624,6 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay
             }
         }
         return true;
-    } else if (driver.port == id_COUT && sink.port == id_I3) {
-        bool same_y = driver.cell->constr_abs_z && driver.cell->constr_z < 7;
-        switch (args.type) {
-#ifndef ICE40_HX1K_ONLY
-        case ArchArgs::HX8K:
-#endif
-        case ArchArgs::HX1K:
-            budget = same_y ? 260 : 560;
-            break;
-#ifndef ICE40_HX1K_ONLY
-        case ArchArgs::LP384:
-        case ArchArgs::LP1K:
-        case ArchArgs::LP8K:
-            budget = same_y ? 380 : 670;
-            break;
-        case ArchArgs::UP5K:
-            budget = same_y ? 660 : 1220;
-            break;
-#endif
-        default:
-            log_error("Unsupported iCE40 chip type.\n");
-        }
-        return true;
     }
     return false;
 }
-- 
cgit v1.2.3