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

Fixes and cleanups in router1

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-11-10 14:00:36 +01:00
parent c780ce584a
commit 97070486f0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/router1.cc
View File

@ -132,6 +132,14 @@ struct Router1
arc_queue_insert(arc, src_wire, dst_wire); arc_queue_insert(arc, src_wire, dst_wire);
} }
arc_key arc_queue_pop()
{
arc_entry entry = arc_queue.top();
arc_queue.pop();
queued_arcs.erase(entry.arc);
return entry.arc;
}
void ripup_net(NetInfo *net) void ripup_net(NetInfo *net)
{ {
if (ctx->debug) if (ctx->debug)
@ -207,10 +215,10 @@ struct Router1
// ECP5 global nets currently appear part-unrouted due to arch database limitations // ECP5 global nets currently appear part-unrouted due to arch database limitations
// Don't touch them in the router // Don't touch them in the router
if (net_info->is_global) if (net_info->is_global)
return; continue;
#endif #endif
if (net_info->driver.cell == nullptr) if (net_info->driver.cell == nullptr)
return; continue;
auto src_wire = ctx->getNetinfoSourceWire(net_info); auto src_wire = ctx->getNetinfoSourceWire(net_info);
@ -256,14 +264,6 @@ struct Router1
} }
} }
arc_key arc_queue_pop()
{
arc_entry entry = arc_queue.top();
arc_queue.pop();
queued_arcs.erase(entry.arc);
return entry.arc;
}
bool route_arc(const arc_key &arc, bool ripup) bool route_arc(const arc_key &arc, bool ripup)
{ {