Refactoring bind/unbind API

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

3 files changed, 50 insertions, 12 deletions

diff --git a/ice40/arch.h b/ice40/arch.h
index a6b70a69..26504cff 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -533,17 +533,21 @@ struct Arch : BaseCtx
 
     uint32_t getBelChecksum(BelId bel) const { return bel.index; }
 
-    void bindBel(BelId bel, IdString cell)
+    void bindBel(BelId bel, IdString cell, PlaceStrength strength)
     {
         assert(bel != BelId());
         assert(bel_to_cell[bel.index] == IdString());
         bel_to_cell[bel.index] = cell;
+        cells[cell]->bel = bel;
+        cells[cell]->belStrength = strength;
     }
 
     void unbindBel(BelId bel)
     {
         assert(bel != BelId());
         assert(bel_to_cell[bel.index] != IdString());
+        cells[bel_to_cell[bel.index]]->bel = BelId();
+        cells[bel_to_cell[bel.index]]->belStrength = STRENGTH_NONE;
         bel_to_cell[bel.index] = IdString();
     }
 
@@ -553,7 +557,13 @@ struct Arch : BaseCtx
         return bel_to_cell[bel.index] == IdString();
     }
 
-    IdString getBelCell(BelId bel, bool conflicting = false) const
+    IdString getBoundBelCell(BelId bel) const
+    {
+        assert(bel != BelId());
+        return bel_to_cell[bel.index];
+    }
+
+    IdString getConflictingBelCell(BelId bel) const
     {
         assert(bel != BelId());
         return bel_to_cell[bel.index];
@@ -627,17 +637,20 @@ struct Arch : BaseCtx
 
     uint32_t getWireChecksum(WireId wire) const { return wire.index; }
 
-    void bindWire(WireId wire, IdString net)
+    void bindWire(WireId wire, IdString net, PlaceStrength strength)
     {
         assert(wire != WireId());
         assert(wire_to_net[wire.index] == IdString());
         wire_to_net[wire.index] = net;
+        nets[net]->wires[wire].pip = PipId();
+        nets[net]->wires[wire].strength = strength;
     }
 
     void unbindWire(WireId wire)
     {
         assert(wire != WireId());
         assert(wire_to_net[wire.index] != IdString());
+        nets[wire_to_net[wire.index]]->wires.erase(wire);
         wire_to_net[wire.index] = IdString();
     }
 
@@ -647,7 +660,13 @@ struct Arch : BaseCtx
         return wire_to_net[wire.index] == IdString();
     }
 
-    IdString getWireNet(WireId wire, bool conflicting = false) const
+    IdString getBoundWireNet(WireId wire) const
+    {
+        assert(wire != WireId());
+        return wire_to_net[wire.index];
+    }
+
+    IdString getConflictingWireNet(WireId wire) const
     {
         assert(wire != WireId());
         return wire_to_net[wire.index];
@@ -668,14 +687,22 @@ struct Arch : BaseCtx
 
     uint32_t getPipChecksum(PipId pip) const { return pip.index; }
 
-    void bindPip(PipId pip, IdString net)
+    void bindPip(PipId pip, IdString net, PlaceStrength strength)
     {
         assert(pip != PipId());
         assert(pip_to_net[pip.index] == IdString());
         assert(switches_locked[chip_info->pip_data[pip.index].switch_index] ==
                IdString());
+
         pip_to_net[pip.index] = net;
         switches_locked[chip_info->pip_data[pip.index].switch_index] = net;
+
+        WireId dst;
+        dst.index = chip_info->pip_data[pip.index].dst;
+        assert(wire_to_net[dst.index] == IdString());
+        wire_to_net[dst.index] = net;
+        nets[net]->wires[dst].pip = pip;
+        nets[net]->wires[dst].strength = strength;
     }
 
     void unbindPip(PipId pip)
@@ -684,6 +711,13 @@ struct Arch : BaseCtx
         assert(pip_to_net[pip.index] != IdString());
         assert(switches_locked[chip_info->pip_data[pip.index].switch_index] !=
                IdString());
+
+        WireId dst;
+        dst.index = chip_info->pip_data[pip.index].dst;
+        assert(wire_to_net[dst.index] != IdString());
+        wire_to_net[dst.index] = IdString();
+        nets[pip_to_net[pip.index]]->wires.erase(dst);
+
         pip_to_net[pip.index] = IdString();
         switches_locked[chip_info->pip_data[pip.index].switch_index] =
                 IdString();
@@ -696,14 +730,18 @@ struct Arch : BaseCtx
                IdString();
     }
 
-    IdString getPipNet(PipId pip, bool conflicting = false) const
+    IdString getBoundPipNet(PipId pip) const
     {
         assert(pip != PipId());
-        if (conflicting)
-            return switches_locked[chip_info->pip_data[pip.index].switch_index];
         return pip_to_net[pip.index];
     }
 
+    IdString getConflictingPipNet(PipId pip) const
+    {
+        assert(pip != PipId());
+        return switches_locked[chip_info->pip_data[pip.index].switch_index];
+    }
+
     AllPipRange getPips() const
     {
         AllPipRange range;
diff --git a/ice40/arch_place.cc b/ice40/arch_place.cc
index 7b79e031..d374b764 100644
--- a/ice40/arch_place.cc
+++ b/ice40/arch_place.cc
@@ -102,7 +102,7 @@ bool PlaceValidityChecker::isBelLocationValid(BelId bel)
     if (ctx->getBelType(bel) == TYPE_ICESTORM_LC) {
         std::vector<const CellInfo *> cells;
         for (auto bel_other : ctx->getBelsAtSameTile(bel)) {
-            IdString cell_other = ctx->getBelCell(bel_other, false);
+            IdString cell_other = ctx->getBoundBelCell(bel_other);
             if (cell_other != IdString()) {
                 const CellInfo *ci_other = ctx->cells[cell_other];
                 cells.push_back(ci_other);
@@ -110,7 +110,7 @@ bool PlaceValidityChecker::isBelLocationValid(BelId bel)
         }
         return logicCellsCompatible(ctx, cells);
     } else {
-        IdString cellId = ctx->getBelCell(bel, false);
+        IdString cellId = ctx->getBoundBelCell(bel);
         if (cellId == IdString())
             return true;
         else
@@ -126,7 +126,7 @@ bool PlaceValidityChecker::isValidBelForCell(CellInfo *cell, BelId bel)
         std::vector<const CellInfo *> cells;
 
         for (auto bel_other : ctx->getBelsAtSameTile(bel)) {
-            IdString cell_other = ctx->getBelCell(bel_other, false);
+            IdString cell_other = ctx->getBoundBelCell(bel_other);
             if (cell_other != IdString()) {
                 const CellInfo *ci_other = ctx->cells[cell_other];
                 cells.push_back(ci_other);
diff --git a/ice40/bitstream.cc b/ice40/bitstream.cc
index c46776a6..58c2e754 100644
--- a/ice40/bitstream.cc
+++ b/ice40/bitstream.cc
@@ -464,7 +464,7 @@ void write_asc(const Context *ctx, std::ostream &out)
     // Write symbols
     // const bool write_symbols = 1;
     for (auto wire : ctx->getWires()) {
-        IdString net = ctx->getWireNet(wire, false);
+        IdString net = ctx->getBoundWireNet(wire);
         if (net != IdString())
             out << ".sym " << wire.index << " " << net.str(ctx) << std::endl;
     }