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

Another router1 bugfix

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-11-11 17:50:42 +01:00
parent f93129634b
commit f9a5126338
2 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/router1.cc
View File

@ -459,10 +459,10 @@ struct Router1
WireId conflictWireWire = WireId(), conflictPipWire = WireId(); WireId conflictWireWire = WireId(), conflictPipWire = WireId();
NetInfo *conflictWireNet = nullptr, *conflictPipNet = nullptr; NetInfo *conflictWireNet = nullptr, *conflictPipNet = nullptr;
bool wire_reuse = net_info->wires.count(next_wire); if (net_info->wires.count(next_wire) && net_info->wires.at(next_wire).pip == pip) {
bool pip_reuse = wire_reuse && net_info->wires.at(next_wire).pip == pip; next_bonus += cfg.reuseBonus;
} else {
if (!ctx->checkWireAvail(next_wire) && !wire_reuse) { if (!ctx->checkWireAvail(next_wire)) {
if (!ripup) if (!ripup)
continue; continue;
conflictWireWire = ctx->getConflictingWireWire(next_wire); conflictWireWire = ctx->getConflictingWireWire(next_wire);
@ -473,7 +473,7 @@ struct Router1
} }
} }
if (!ctx->checkPipAvail(pip) && !pip_reuse) { if (!ctx->checkPipAvail(pip)) {
if (!ripup) if (!ripup)
continue; continue;
conflictPipWire = ctx->getConflictingPipWire(pip); conflictPipWire = ctx->getConflictingPipWire(pip);
@ -496,12 +496,6 @@ struct Router1
if (conflictWireNet == conflictPipNet) if (conflictWireNet == conflictPipNet)
conflictWireNet = nullptr; conflictWireNet = nullptr;
if (wire_reuse)
next_bonus += cfg.wireReuseBonus;
if (pip_reuse)
next_bonus += cfg.pipReuseBonus;
if (conflictWireWire != WireId()) { if (conflictWireWire != WireId()) {
auto scores_it = wireScores.find(conflictWireWire); auto scores_it = wireScores.find(conflictWireWire);
if (scores_it != wireScores.end()) if (scores_it != wireScores.end())
@ -531,6 +525,7 @@ struct Router1
next_penalty += cfg.netRipupPenalty; next_penalty += cfg.netRipupPenalty;
next_penalty += conflictPipNet->wires.size() * cfg.wireRipupPenalty; next_penalty += conflictPipNet->wires.size() * cfg.wireRipupPenalty;
} }
}
delay_t next_score = next_delay + next_penalty; delay_t next_score = next_delay + next_penalty;
NPNR_ASSERT(next_score >= 0); NPNR_ASSERT(next_score >= 0);
@ -676,9 +671,7 @@ Router1Cfg::Router1Cfg(Context *ctx) : Settings(ctx)
wireRipupPenalty = ctx->getRipupDelayPenalty(); wireRipupPenalty = ctx->getRipupDelayPenalty();
netRipupPenalty = 10*ctx->getRipupDelayPenalty(); netRipupPenalty = 10*ctx->getRipupDelayPenalty();
reuseBonus = wireRipupPenalty/2;
wireReuseBonus = wireRipupPenalty/8;
pipReuseBonus = wireRipupPenalty/2;
estimatePrecision = 100 * ctx->getRipupDelayPenalty(); estimatePrecision = 100 * ctx->getRipupDelayPenalty();
} }

3
common/router1.h
View File

@ -35,8 +35,7 @@ struct Router1Cfg : Settings
bool useEstimate; bool useEstimate;
delay_t wireRipupPenalty; delay_t wireRipupPenalty;
delay_t netRipupPenalty; delay_t netRipupPenalty;
delay_t wireReuseBonus; delay_t reuseBonus;
delay_t pipReuseBonus;
delay_t estimatePrecision; delay_t estimatePrecision;
}; };