caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce id() lookups for commonly used update_budget()

Browse Source
This commit is contained in:
Eddie Hung 2018-07-24 21:21:11 -07:00
parent 32c7247785
commit 879f0d7c57
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ice40/arch.cc
View File

@ -188,6 +188,13 @@ Arch::Arch(ArchArgs args) : args(args)
id_i3 = id("I3"); id_i3 = id("I3");
id_dff_en = id("DFF_ENABLE"); id_dff_en = id("DFF_ENABLE");
id_neg_clk = id("NEG_CLK"); id_neg_clk = id("NEG_CLK");
id_cin = id("CIN");
id_cout = id("COUT");
id_o = id("O");
id_lo = id("LO");
id_icestorm_ram = id("ICESTORM_RAM");
id_rclk = id("RCLK");
id_wclk = id("WCLK");
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -696,26 +703,26 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) 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) &&
(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;
} else if (fromPort == id("I1") && toPort == id("COUT")) { } else if (fromPort == id_i1 && toPort == id_cout) {
delay = 260; delay = 260;
return true; return true;
} else if (fromPort == id("I2") && toPort == id("COUT")) { } else if (fromPort == id_i2 && toPort == id_cout) {
delay = 230; delay = 230;
return true; return true;
} else if (fromPort == id("CLK") && toPort == id("O")) { } else if (fromPort == id_clk && toPort == id_o) {
delay = 540; delay = 540;
return true; return true;
} }
} else if (cell->type == id("ICESTORM_RAM")) { } else if (cell->type == id_icestorm_ram) {
if (fromPort == id("RCLK")) { if (fromPort == id_rclk) {
delay = 2140; delay = 2140;
return true; return true;
} }
@ -725,14 +732,14 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort
IdString Arch::getPortClock(const CellInfo *cell, IdString port) const IdString Arch::getPortClock(const CellInfo *cell, IdString port) const
{ {
if (cell->type == id("ICESTORM_LC") && bool_or_default(cell->params, id("DFF_ENABLE"))) { if (cell->type == id_icestorm_lc && cell->lcInfo.dffEnable) {
if (port != id("LO") && port != id("CIN") && port != id("COUT")) if (port != id_lo && port != id_cin && port != id_cout)
return id("CLK"); return id_clk;
} else if (cell->type == id("ICESTORM_RAM")) { } else if (cell->type == id_icestorm_ram) {
if (port.str(this)[0] == 'R') if (port.str(this)[0] == 'R')
return id("RCLK"); return id_rclk;
else else
return id("WCLK"); return id_wclk;
} }
return IdString(); return IdString();
} }

3
ice40/arch.h
View File

@ -739,6 +739,9 @@ struct Arch : BaseCtx
IdString id_cen, id_clk, id_sr; IdString id_cen, id_clk, id_sr;
IdString id_i0, id_i1, id_i2, id_i3; IdString id_i0, id_i1, id_i2, id_i3;
IdString id_dff_en, id_neg_clk; IdString id_dff_en, id_neg_clk;
IdString id_cin, id_cout;
IdString id_o, id_lo;
IdString id_icestorm_ram, id_rclk, id_wclk;
}; };
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

17
ice40/place_legaliser.cc
View File

@ -90,21 +90,20 @@ static int get_cell_evilness(const Context *ctx, const CellInfo *cell)
// This returns how "evil" a logic cell is, and thus how likely it is to be ripped up // This returns how "evil" a logic cell is, and thus how likely it is to be ripped up
// during logic tile legalisation // during logic tile legalisation
int score = 0; int score = 0;
if (get_net_or_empty(cell, ctx->id("I0"))) if (get_net_or_empty(cell, ctx->id_i0))
++score; ++score;
if (get_net_or_empty(cell, ctx->id("I1"))) if (get_net_or_empty(cell, ctx->id_i1))
++score; ++score;
if (get_net_or_empty(cell, ctx->id("I2"))) if (get_net_or_empty(cell, ctx->id_i2))
++score; ++score;
if (get_net_or_empty(cell, ctx->id("I3"))) if (get_net_or_empty(cell, ctx->id_i3))
++score; ++score;
if (bool_or_default(cell->params, ctx->id("DFF_ENABLE"))) { if (cell->lcInfo.dffEnable) {
const NetInfo *cen = get_net_or_empty(cell, ctx->id("CEN")), *sr = get_net_or_empty(cell, ctx->id("SR")); if (cell->lcInfo.cen)
if (cen)
score += 10; score += 10;
if (sr) if (cell->lcInfo.sr)
score += 10; score += 10;
if (bool_or_default(cell->params, ctx->id("NEG_CLK"))) if (cell->lcInfo.negClk)
score += 5; score += 5;
} }
return score; return score;