ice40: Another carry timing fix

Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-07-03 14:04:32 +02:00
parent 9c4feb32a4
commit 59b2091f77

View File

@ -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 bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, delay_t &delay) const
{ {
if (cell->type == id("ICESTORM_LC")) { if (cell->type == id("ICESTORM_LC")) {
if (fromPort == id("I0") || fromPort == id("I1") || fromPort == id("I2") || fromPort == id("I3")) { if ((fromPort == id("I0") || fromPort == id("I1") || fromPort == id("I2") || fromPort == id("I3")) &&
if (toPort == id("O") || toPort == id("LO")) { (toPort == id("O") || toPort == id("LO"))) {
delay = 450; delay = 450;
return true; return true;
}
} else if (fromPort == id("CIN") && toPort == id("COUT")) { } else if (fromPort == id("CIN") && toPort == id("COUT")) {
delay = 120; delay = 120;
return true; return true;