diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-03 14:04:32 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-03 14:04:32 +0200 |
| commit | 59b2091f777dd90006a6be9c97bcd72add8de6c5 (patch) | |
| tree | af55b1871c2a972f8deb34b27e3914f061552587 | |
| parent | 9c4feb32a4318af6630011410806832cf4adf1f0 (diff) | |
| download | nextpnr-59b2091f777dd90006a6be9c97bcd72add8de6c5.tar.gz nextpnr-59b2091f777dd90006a6be9c97bcd72add8de6c5.tar.bz2 nextpnr-59b2091f777dd90006a6be9c97bcd72add8de6c5.zip | |
ice40: Another carry timing fix
Signed-off-by: David Shah <davey1576@gmail.com>
| -rw-r--r-- | ice40/arch.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 333022c4..b48d4db8 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -489,11 +489,10 @@ std::vector<GraphicElement> Arch::getPipGraphics(PipId pip) const bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, delay_t &delay) const { if (cell->type == id("ICESTORM_LC")) { - if (fromPort == id("I0") || fromPort == id("I1") || fromPort == id("I2") || fromPort == id("I3")) { - if (toPort == id("O") || toPort == id("LO")) { - delay = 450; - return true; - } + if ((fromPort == id("I0") || fromPort == id("I1") || fromPort == id("I2") || fromPort == id("I3")) && + (toPort == id("O") || toPort == id("LO"))) { + delay = 450; + return true; } else if (fromPort == id("CIN") && toPort == id("COUT")) { delay = 120; return true; |