Improve ic40 gfx

Signed-off-by: Clifford Wolf <clifford@clifford.at>

1 files changed, 131 insertions, 10 deletions

diff --git a/ice40/gfx.cc b/ice40/gfx.cc
index 58e52d65..e72b2515 100644
--- a/ice40/gfx.cc
+++ b/ice40/gfx.cc
@@ -37,6 +37,12 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.y1 = y1;
         el.y2 = y1;
         g.push_back(el);
+
+        el.x1 = x + main_swbox_x1 + 0.0025 * (idx + 35);
+        el.x2 = el.x1;
+        el.y1 = y1;
+        el.y2 = y + main_swbox_y1;
+        g.push_back(el);
     }
 
     if (id >= TILE_WIRE_SP4_H_R_0 && id <= TILE_WIRE_SP4_H_R_47) {
@@ -73,6 +79,12 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.y1 = y2;
         el.y2 = y3;
         g.push_back(el);
+
+        el.x1 = x + main_swbox_x1 + 0.0025 * ((idx ^ 1) + 35);
+        el.x2 = el.x1;
+        el.y1 = y2;
+        el.y2 = y + main_swbox_y1;
+        g.push_back(el);
     }
 
     // Vertical Span-4 Wires
@@ -89,6 +101,12 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.x1 = x1;
         el.x2 = x1;
         g.push_back(el);
+
+        el.y1 = y + 0.03 + 0.0025 * (270 - idx);
+        el.y2 = el.y1;
+        el.x1 = x1;
+        el.x2 = x + main_swbox_x1;
+        g.push_back(el);
     }
 
     if (id >= TILE_WIRE_SP4_V_B_0 && id <= TILE_WIRE_SP4_V_B_47) {
@@ -126,13 +144,17 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.x2 = x3;
         g.push_back(el);
 
-        float y1 = y + 0.03 + 0.0025 * (154 - idx);
-
-        el.y1 = y1;
-        el.y2 = y1;
+        el.y1 = y + 0.03 + 0.0025 * (145 - idx);
+        el.y2 = el.y1;
         el.x1 = x;
         el.x2 = x2;
         g.push_back(el);
+
+        el.y1 = y + 0.03 + 0.0025 * (270 - idx);
+        el.y2 = el.y1;
+        el.x1 = x2;
+        el.x2 = x + main_swbox_x1;
+        g.push_back(el);
     }
 
     // Horizontal Span-12 Wires
@@ -149,6 +171,12 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.y1 = y1;
         el.y2 = y1;
         g.push_back(el);
+
+        el.x1 = x + main_swbox_x1 + 0.0025 * (idx + 5);
+        el.x2 = el.x1;
+        el.y1 = y1;
+        el.y2 = y + main_swbox_y1;
+        g.push_back(el);
     }
 
     if (id >= TILE_WIRE_SP12_H_R_0 && id <= TILE_WIRE_SP12_H_R_23) {
@@ -185,20 +213,26 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.y1 = y2;
         el.y2 = y3;
         g.push_back(el);
+
+        el.x1 = x + main_swbox_x1 + 0.0025 * (idx + 5);
+        el.x2 = el.x1;
+        el.y1 = y2;
+        el.y2 = y + main_swbox_y1;
+        g.push_back(el);
     }
 
-    // Veritcal Right Span-4
+    // Vertical Right Span-4
 
     if (id >= TILE_WIRE_SP4_R_V_B_0 && id <= TILE_WIRE_SP4_R_V_B_47) {
         int idx = id - TILE_WIRE_SP4_R_V_B_0;
         GraphicElement el;
         el.type = GraphicElement::G_LINE;
 
-        float y1 = y + 0.03 + 0.0025 * (154 - idx);
+        float y1 = y + 0.03 + 0.0025 * (145 - idx);
 
         el.y1 = y1;
         el.y2 = y1;
-        el.x1 = x + 0.6;
+        el.x1 = x + main_swbox_x2;
         el.x2 = x + 1.0;
         g.push_back(el);
     }
@@ -217,6 +251,12 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.x1 = x1;
         el.x2 = x1;
         g.push_back(el);
+
+        el.y1 = y + 0.03 + 0.0025 * (300 - idx);
+        el.y2 = el.y1;
+        el.x1 = x1;
+        el.x2 = x + main_swbox_x1;
+        g.push_back(el);
     }
 
     if (id >= TILE_WIRE_SP12_V_B_0 && id <= TILE_WIRE_SP12_V_B_23) {
@@ -253,6 +293,65 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.x1 = x2;
         el.x2 = x3;
         g.push_back(el);
+
+        el.y1 = y + 0.03 + 0.0025 * (300 - (idx ^ 1));
+        el.y2 = el.y1;
+        el.x1 = x2;
+        el.x2 = x + main_swbox_x1;
+        g.push_back(el);
+    }
+
+    // Global2Local
+
+    if (id >= TILE_WIRE_GLB2LOCAL_0 && id <= TILE_WIRE_GLB2LOCAL_3) {
+        int idx = id - TILE_WIRE_GLB2LOCAL_0;
+        GraphicElement el;
+        el.type = GraphicElement::G_LINE;
+        el.x1 = x + main_swbox_x1 + 0.005 * (idx + 5);
+        el.x2 = el.x1;
+        el.y1 = y + main_swbox_y2;
+        el.y2 = el.y1 + 0.02;
+        g.push_back(el);
+    }
+
+    // GlobalNets
+
+    if (id >= TILE_WIRE_GLB_NETWK_0 && id <= TILE_WIRE_GLB_NETWK_7) {
+        int idx = id - TILE_WIRE_GLB_NETWK_0;
+        GraphicElement el;
+        el.type = GraphicElement::G_LINE;
+        el.x1 = x + main_swbox_x1 - 0.05;
+        el.x2 = x + main_swbox_x1;
+        el.y1 = y + main_swbox_y2 - 0.005 * (13 - idx);
+        el.y2 = el.y1;
+        g.push_back(el);
+    }
+
+    // Neighbours
+
+    if (id >= TILE_WIRE_NEIGH_OP_BNL_0 && id <= TILE_WIRE_NEIGH_OP_TOP_7) {
+        int idx = id - TILE_WIRE_NEIGH_OP_BNL_0;
+        GraphicElement el;
+        el.type = GraphicElement::G_LINE;
+        el.y1 = y + main_swbox_y1 + 0.0025 * (idx + 10) + 0.01 * (idx / 8);
+        el.y2 = el.y1;
+        el.x1 = x + main_swbox_x1 - 0.05;
+        el.x2 = x + main_swbox_x1;
+        g.push_back(el);
+    }
+
+    // Local Tracks
+
+    if (id >= TILE_WIRE_LOCAL_G0_0 && id <= TILE_WIRE_LOCAL_G3_7) {
+        int idx = id - TILE_WIRE_LOCAL_G0_0;
+        GraphicElement el;
+        el.type = GraphicElement::G_LINE;
+        el.x1 = x + main_swbox_x2;
+        el.x2 = x + local_swbox_x1;
+        float yoff = y + (local_swbox_y1 + local_swbox_y2) / 2 - 0.005 * 16 - 0.075;
+        el.y1 = yoff + 0.005 * idx + 0.05 * (idx / 8);
+        el.y2 = el.y1;
+        g.push_back(el);
     }
 
     // LC Inputs
@@ -263,7 +362,7 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         int input = idx % 4;
         GraphicElement el;
         el.type = GraphicElement::G_LINE;
-        el.x1 = x + lc_lut_swbox_x2;
+        el.x1 = x + local_swbox_x2;
         el.x2 = x + logic_cell_x1;
         el.y1 = y + 0.4675 + (0.005 * input) + z * logic_cell_pitch;
         el.y2 = el.y1;
@@ -275,13 +374,13 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
     if (id >= TILE_WIRE_LUTFF_0_OUT && id <= TILE_WIRE_LUTFF_7_OUT) {
         int idx = id - TILE_WIRE_LUTFF_0_OUT;
 
-        float y1 = y + 0.03 + 0.0025 * (102 - idx);
+        float y1 = y + 0.03 + 0.0025 * (159 - idx);
 
         GraphicElement el;
         el.type = GraphicElement::G_LINE;
         el.y1 = y1;
         el.y2 = y1;
-        el.x1 = x + 0.3;
+        el.x1 = x + main_swbox_x2;
         el.x2 = x + 0.97 + 0.0025 * idx;
         g.push_back(el);
 
@@ -294,6 +393,28 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
         el.x1 = x + logic_cell_x2;
         g.push_back(el);
     }
+
+    // LC Control
+
+    if (id >= TILE_WIRE_LUTFF_GLOBAL_CEN && id <= TILE_WIRE_LUTFF_GLOBAL_S_R) {
+        int idx = id - TILE_WIRE_LUTFF_GLOBAL_CEN;
+        GraphicElement el;
+        el.type = GraphicElement::G_LINE;
+
+        el.x1 = x + main_swbox_x2 - 0.005 * (idx + 5);
+        el.x2 = el.x1;
+        el.y1 = y + main_swbox_y2;
+        el.y2 = el.y1 + 0.005 * (idx + 3);
+        g.push_back(el);
+
+        el.y1 = el.y2;
+        el.x2 = x + logic_cell_x2 - 0.005 * (2 - idx + 5);
+        g.push_back(el);
+
+        el.y2 = y + logic_cell_y2 + 7*logic_cell_pitch;
+        el.x1 = el.x2;
+        g.push_back(el);
+    }
 }
 
 NEXTPNR_NAMESPACE_END