aboutsummaryrefslogtreecommitdiffstats
path: root/fpga_interchange/dedicated_interconnect.cc
diff options
context:
space:
mode:
authorgatecat <gatecat@ds0.me>2021-06-14 11:57:56 +0100
committerGitHub <noreply@github.com>2021-06-14 11:57:56 +0100
commitf4bfc2af5b5fac1151a4f582b139d5add4467d9a (patch)
tree5ca6af38c003648ff686155f8f6c2f704de3a4cf /fpga_interchange/dedicated_interconnect.cc
parentee65e6f32d669cabd1d8a00534410da423348ac4 (diff)
parent377f56c1510bc7da66aa43eb06dc7579fef9b403 (diff)
downloadnextpnr-f4bfc2af5b5fac1151a4f582b139d5add4467d9a.tar.gz
nextpnr-f4bfc2af5b5fac1151a4f582b139d5add4467d9a.tar.bz2
nextpnr-f4bfc2af5b5fac1151a4f582b139d5add4467d9a.zip
Merge pull request #727 from YosysHQ/gatecat/ic-undriven
interchange: Cope with undriven nets in more places
Diffstat (limited to 'fpga_interchange/dedicated_interconnect.cc')
-rw-r--r--fpga_interchange/dedicated_interconnect.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/fpga_interchange/dedicated_interconnect.cc b/fpga_interchange/dedicated_interconnect.cc
index 2f6fbcd3..f3c25aff 100644
--- a/fpga_interchange/dedicated_interconnect.cc
+++ b/fpga_interchange/dedicated_interconnect.cc
@@ -356,13 +356,10 @@ bool DedicatedInterconnect::isBelLocationValid(BelId bel, const CellInfo *cell)
for (const auto &port_pair : cell->ports) {
IdString port_name = port_pair.first;
NetInfo *net = port_pair.second.net;
- if (net == nullptr) {
+ if (net == nullptr || net->driver.cell == nullptr) {
continue;
}
- // This net doesn't have a driver, probably not valid?
- NPNR_ASSERT(net->driver.cell != nullptr);
-
// Only check sink BELs.
if (net->driver.cell == cell && net->driver.port == port_name) {
if (!is_driver_on_net_valid(bel, cell, port_name, net)) {