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

Fix router for routing to the same dest wire twice

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-15 20:54:57 +02:00 committed by David Shah
parent 432fe52274
commit 579455d1b0
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/route.cc
View File

@ -167,19 +167,18 @@ struct Router
visited[qw.wire] = qw; visited[qw.wire] = qw;
} }
while (!queue.empty()) { while (!queue.empty() && !visited.count(dst_wire)) {
visitCnt++;
QueuedWire qw = queue.top(); QueuedWire qw = queue.top();
queue.pop(); queue.pop();
for (auto pip : chip.getPipsDownhill(qw.wire)) { for (auto pip : chip.getPipsDownhill(qw.wire)) {
float next_delay = qw.delay; float next_delay = qw.delay;
visitCnt++;
if (!chip.checkPipAvail(pip)) { if (!chip.checkPipAvail(pip)) {
if (ripup) if (!ripup || net_name == chip.getPipNet(pip, true))
next_delay += ripup_pip_penalty;
else
continue; continue;
next_delay += ripup_pip_penalty;
} }
WireId next_wire = chip.getPipDstWire(pip); WireId next_wire = chip.getPipDstWire(pip);
@ -188,19 +187,21 @@ struct Router
if (visited.count(next_wire)) { if (visited.count(next_wire)) {
if (visited.at(next_wire).delay <= next_delay + 1e-3) if (visited.at(next_wire).delay <= next_delay + 1e-3)
continue; continue;
#if 0 // FIXME
if (verbose) if (verbose)
log("Found better route to %s. Old vs new delay " log("Found better route to %s. Old vs new delay "
"estimate: %.2f %.2f\n", "estimate: %.2f %.2f\n",
chip.getWireName(next_wire).c_str(), chip.getWireName(next_wire).c_str(),
visited.at(next_wire).delay, next_delay); visited.at(next_wire).delay, next_delay);
#endif
revisitCnt++; revisitCnt++;
} }
if (!chip.checkWireAvail(next_wire)) { if (!chip.checkWireAvail(next_wire)) {
if (ripup) if (!ripup ||
next_delay += ripup_wire_penalty; net_name == chip.getWireNet(next_wire, true))
else
continue; continue;
next_delay += ripup_wire_penalty;
} }
QueuedWire next_qw; QueuedWire next_qw;
@ -210,14 +211,6 @@ struct Router
next_qw.togo = chip.estimateDelay(next_wire, dst_wire); next_qw.togo = chip.estimateDelay(next_wire, dst_wire);
visited[next_qw.wire] = next_qw; visited[next_qw.wire] = next_qw;
queue.push(next_qw); queue.push(next_qw);
if (next_qw.wire == dst_wire) {
std::priority_queue<QueuedWire, std::vector<QueuedWire>,
QueuedWire::Greater>
empty_queue;
std::swap(queue, empty_queue);
break;
}
} }
} }
@ -393,9 +386,10 @@ void route_design(Design *design, bool verbose)
netsQueue.clear(); netsQueue.clear();
if (netCnt % 100 != 0)
log_info(" processed %d nets. (%d routed, %d failed)\n", netCnt, log_info(" processed %d nets. (%d routed, %d failed)\n", netCnt,
netCnt - int(ripupQueue.size()), int(ripupQueue.size())); netCnt - int(ripupQueue.size()), int(ripupQueue.size()));
log_info("routing pass visited %d wires (%.2f%% revisits).\n", visitCnt, log_info("routing pass visited %d PIPs (%.2f%% revisits).\n", visitCnt,
(100.0 * revisitCnt) / visitCnt); (100.0 * revisitCnt) / visitCnt);
if (!ripupQueue.empty()) { if (!ripupQueue.empty()) {
@ -431,8 +425,9 @@ void route_design(Design *design, bool verbose)
ripCnt); ripCnt);
} }
if (netCnt % 100 != 0)
log_info(" routed %d nets, ripped %d nets.\n", netCnt, ripCnt); log_info(" routed %d nets, ripped %d nets.\n", netCnt, ripCnt);
log_info("routing pass visited %d wires (%.2f%% revisits).\n", log_info("routing pass visited %d PIPs (%.2f%% revisits).\n",
visitCnt, (100.0 * revisitCnt) / visitCnt); visitCnt, (100.0 * revisitCnt) / visitCnt);
log_info("ripped up %d previously routed nets. continue routing.\n", log_info("ripped up %d previously routed nets. continue routing.\n",