From 377f56c1510bc7da66aa43eb06dc7579fef9b403 Mon Sep 17 00:00:00 2001 From: gatecat Date: Mon, 14 Jun 2021 10:58:42 +0100 Subject: interchange: Cope with undriven nets in more places Signed-off-by: gatecat --- fpga_interchange/site_arch.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fpga_interchange/site_arch.cc') diff --git a/fpga_interchange/site_arch.cc b/fpga_interchange/site_arch.cc index 6398d858..ac644465 100644 --- a/fpga_interchange/site_arch.cc +++ b/fpga_interchange/site_arch.cc @@ -154,7 +154,8 @@ SiteArch::SiteArch(const SiteInformation *site_info) : ctx(site_info->ctx), site SiteNetInfo &net_info = net_pair.second; // All nets require drivers - NPNR_ASSERT(net->driver.cell != nullptr); + if (net->driver.cell == nullptr) + continue; bool net_driven_out_of_site = false; if (net->driver.cell->bel == BelId()) { @@ -259,6 +260,8 @@ SiteArch::SiteArch(const SiteInformation *site_info) : ctx(site_info->ctx), site } for (auto &net_pair : nets) { + if (net_pair.first->driver.cell == nullptr) + continue; SiteNetInfo *net_info = &net_pair.second; auto result = wire_to_nets.emplace(net_info->driver, SiteNetMap{net_info, 1}); // By this point, trivial congestion at sources should already by -- cgit v1.2.3