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

Revert "Remove Arch::getBudgetOverride()"

Browse Source 
This reverts commit 749dae4ae5.
This commit is contained in:
Eddie Hung 2018-07-26 21:37:19 -07:00
parent 21d46fb633
commit 97e546041e
6 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecp5/arch.cc
View File

@ -413,6 +413,8 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
return 200 * (abs(src.location.x - dst.location.x) + abs(src.location.y - dst.location.y)); return 200 * (abs(src.location.x - dst.location.x) + abs(src.location.y - dst.location.y));
} }
delay_t Arch::getBudgetOverride(const PortRef &pr, delay_t v) const { return v; }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
bool Arch::place() { return placer1(getCtx()); } bool Arch::place() { return placer1(getCtx()); }

1
ecp5/arch.h
View File

@ -780,6 +780,7 @@ struct Arch : BaseCtx
delay_t getRipupDelayPenalty() const { return 200; } delay_t getRipupDelayPenalty() const { return 200; }
float getDelayNS(delay_t v) const { return v * 0.001; } float getDelayNS(delay_t v) const { return v * 0.001; }
uint32_t getDelayChecksum(delay_t v) const { return v; } uint32_t getDelayChecksum(delay_t v) const { return v; }
delay_t getBudgetOverride(const PortRef &pr, delay_t v) const;
// ------------------------------------------------- // -------------------------------------------------

2
generic/arch.cc
View File

@ -403,6 +403,8 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
return (dx + dy) * grid_distance_to_delay; return (dx + dy) * grid_distance_to_delay;
} }
delay_t Arch::getBudgetOverride(const PortRef &pr, delay_t v) const { return v; }
// --------------------------------------------------------------- // ---------------------------------------------------------------
bool Arch::place() { return placer1(getCtx()); } bool Arch::place() { return placer1(getCtx()); }

1
generic/arch.h
View File

@ -198,6 +198,7 @@ struct Arch : BaseCtx
delay_t getRipupDelayPenalty() const { return 1.0; } delay_t getRipupDelayPenalty() const { return 1.0; }
float getDelayNS(delay_t v) const { return v; } float getDelayNS(delay_t v) const { return v; }
uint32_t getDelayChecksum(delay_t v) const { return 0; } uint32_t getDelayChecksum(delay_t v) const { return 0; }
delay_t getBudgetOverride(const PortRef &pr, delay_t v) const;
bool pack() { return true; } bool pack() { return true; }
bool place(); bool place();

7
ice40/arch.cc
View File

@ -587,6 +587,13 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
return xscale * abs(xd) + yscale * abs(yd) + offset; return xscale * abs(xd) + yscale * abs(yd) + offset;
} }
delay_t Arch::getBudgetOverride(const PortRef &pr, delay_t v) const
{
if (pr.port == id("COUT"))
return 0;
return v;
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
bool Arch::place() { return placer1(getCtx()); } bool Arch::place() { return placer1(getCtx()); }

1
ice40/arch.h
View File

@ -688,6 +688,7 @@ struct Arch : BaseCtx
delay_t getRipupDelayPenalty() const { return 200; } delay_t getRipupDelayPenalty() const { return 200; }
float getDelayNS(delay_t v) const { return v * 0.001; } float getDelayNS(delay_t v) const { return v * 0.001; }
uint32_t getDelayChecksum(delay_t v) const { return v; } uint32_t getDelayChecksum(delay_t v) const { return v; }
delay_t getBudgetOverride(const PortRef &pr, delay_t v) const;
// ------------------------------------------------- // -------------------------------------------------