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

various fixes for generic arch

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-08-02 17:40:14 +02:00
parent 114c230624
commit 1c1fd99b8b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
generic/arch.cc
View File

@ -149,12 +149,6 @@ void Arch::addDecalGraphic(DecalId decal, const GraphicElement &graphic)
refreshUi(); refreshUi();
} }
void Arch::setFrameDecal(DecalXY decalxy)
{
frame_decalxy = decalxy;
refreshUiFrame();
}
void Arch::setWireDecal(WireId wire, DecalXY decalxy) void Arch::setWireDecal(WireId wire, DecalXY decalxy)
{ {
wires.at(wire).decalxy = decalxy; wires.at(wire).decalxy = decalxy;
@ -403,18 +397,18 @@ 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::predictDelay(const NetInfo *net_info, const PortRef &sink) const; delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const
{ {
const auto &driver = net_info->driver; const auto &driver = net_info->driver;
auto driver_loc = getBelLocation(driver.cell->bel); auto driver_loc = getBelLocation(driver.cell->bel);
auto sink_loc = getBelLocation(sink.cell->bel); auto sink_loc = getBelLocation(sink.cell->bel);
int dx = abs(driver_loc.x - driver_loc.x); int dx = abs(driver_loc.x - driver_loc.x);
int dy = abs(sink_loc.y - sink_locy); int dy = abs(sink_loc.y - sink_loc.y);
return (dx + dy) * grid_distance_to_delay; return (dx + dy) * grid_distance_to_delay;
} }
delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const { return budget; } delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const { return budget; }
// --------------------------------------------------------------- // ---------------------------------------------------------------

1
generic/arch.h
View File

@ -110,7 +110,6 @@ struct Arch : BaseCtx
void addGroupGroup(IdString group, IdString grp); void addGroupGroup(IdString group, IdString grp);
void addDecalGraphic(DecalId decal, const GraphicElement &graphic); void addDecalGraphic(DecalId decal, const GraphicElement &graphic);
void setFrameDecal(DecalXY decalxy);
void setWireDecal(WireId wire, DecalXY decalxy); void setWireDecal(WireId wire, DecalXY decalxy);
void setPipDecal(PipId pip, DecalXY decalxy); void setPipDecal(PipId pip, DecalXY decalxy);
void setBelDecal(BelId bel, DecalXY decalxy); void setBelDecal(BelId bel, DecalXY decalxy);