diff options
| author | gatecat <gatecat@ds0.me> | 2022-03-01 16:38:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 16:38:48 +0000 |
| commit | 0a70b9c992c06a7553725b3742052eb95abd5f20 (patch) | |
| tree | d1d8436576bad3424031c5ce435d76717fef196e /common/design_utils.h | |
| parent | d8bea3ccfc7b6e925a9fd63c9172748ea0420e88 (diff) | |
| parent | 86699b42f619960bfefd4d0b479dd44a90527ea4 (diff) | |
| download | nextpnr-0a70b9c992c06a7553725b3742052eb95abd5f20.tar.gz nextpnr-0a70b9c992c06a7553725b3742052eb95abd5f20.tar.bz2 nextpnr-0a70b9c992c06a7553725b3742052eb95abd5f20.zip | |
Merge pull request #925 from YosysHQ/gatecat/netlist-iv
Switch to potentially-sparse net users array
Diffstat (limited to 'common/design_utils.h')
| -rw-r--r-- | common/design_utils.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/common/design_utils.h b/common/design_utils.h index 63cb71d7..069600b5 100644 --- a/common/design_utils.h +++ b/common/design_utils.h @@ -47,14 +47,18 @@ CellInfo *net_only_drives(const Context *ctx, NetInfo *net, F1 cell_pred, IdStri return nullptr; if (exclusive) { if (exclude == nullptr) { - if (net->users.size() != 1) + if (net->users.entries() != 1) return nullptr; } else { - if (net->users.size() > 2) { + if (net->users.entries() > 2) { return nullptr; - } else if (net->users.size() == 2) { - if (std::find_if(net->users.begin(), net->users.end(), - [exclude](const PortRef &ref) { return ref.cell == exclude; }) == net->users.end()) + } else if (net->users.entries() == 2) { + bool found = false; + for (auto &usr : net->users) { + if (usr.cell == exclude) + found = true; + } + if (!found) return nullptr; } } |