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

Merge pull request #1017 from YosysHQ/routerfix

Browse Source 
Router fix
This commit is contained in:
myrtle 2022-08-22 13:31:11 +02:00 committed by GitHub
commit 0f4166fedb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/kernel/nextpnr_types.h
View File

@ -205,9 +205,9 @@ struct RegionPlug : PseudoCell
WireId getPortWire(IdString port) const override { return port_wires.at(port); } WireId getPortWire(IdString port) const override { return port_wires.at(port); }
// TODO: partial reconfiguration region timing // TODO: partial reconfiguration region timing
bool getDelay(IdString fromPort, IdString toPort, DelayQuad &delay) const { return false; } bool getDelay(IdString fromPort, IdString toPort, DelayQuad &delay) const override { return false; }
TimingPortClass getPortTimingClass(IdString port, int &clockInfoCount) const { return TMG_IGNORE; } TimingPortClass getPortTimingClass(IdString port, int &clockInfoCount) const override { return TMG_IGNORE; }
virtual TimingClockingInfo getPortClockingInfo(IdString port, int index) const { return TimingClockingInfo{}; } TimingClockingInfo getPortClockingInfo(IdString port, int index) const override { return TimingClockingInfo{}; }
dict<IdString, WireId> port_wires; dict<IdString, WireId> port_wires;
Loc loc; Loc loc;

3
common/route/router2.cc
View File

@ -373,8 +373,7 @@ struct Router2
return base_cost * hist_cost * present_cost / (1 + (source_uses * crit_weight)) + bias_cost; return base_cost * hist_cost * present_cost / (1 + (source_uses * crit_weight)) + bias_cost;
} }
float get_togo_cost(NetInfo *net, store_index<PortRef> user, int wire, WireId src_sink, float crit_weight, float get_togo_cost(NetInfo *net, store_index<PortRef> user, int wire, WireId src_sink, bool bwd, float crit_weight)
bool bwd = false)
{ {
auto &nd = nets.at(net->udata); auto &nd = nets.at(net->udata);
auto &wd = flat_wires[wire]; auto &wd = flat_wires[wire];