diff options
| author | myrtle <gatecat@ds0.me> | 2022-12-22 21:19:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-22 21:19:21 +0100 |
| commit | 76fea8268ca7c3f9a9f4f610951f9ea84993e974 (patch) | |
| tree | 65d9723eb70a6ba44ade5eda186a0993bf3fb664 /ecp5 | |
| parent | a80d63b26810e2e5dab8d3d626f9b3052f734c95 (diff) | |
| parent | 64f7306b24ac26bf05a3009b2f4b54489739ab28 (diff) | |
| download | nextpnr-76fea8268ca7c3f9a9f4f610951f9ea84993e974.tar.gz nextpnr-76fea8268ca7c3f9a9f4f610951f9ea84993e974.tar.bz2 nextpnr-76fea8268ca7c3f9a9f4f610951f9ea84993e974.zip | |
Merge pull request #1068 from YosysHQ/cleanup_and_sync
Cleanup and sync
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/pack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 4c8ceee8..f542934d 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -219,7 +219,7 @@ class Ecp5Packer for (auto &cell : ctx->cells) { CellInfo *ci = cell.second.get(); if (is_ff(ctx, ci)) { - NetInfo *di = get_net_or_empty(ci, id_DI); + NetInfo *di = ci->getPort(id_DI); if (di->driver.cell != nullptr && di->driver.cell->type == id_TRELLIS_COMB && di->driver.port == id_F) { CellInfo *comb = di->driver.cell; if (comb->cluster != ClusterId()) { @@ -306,7 +306,7 @@ class Ecp5Packer // Gets the "COMB1" side of a LUT5, where we pack a LUT[67] into auto get_comb1_from_lut5 = [&](CellInfo *lut5) { - NetInfo *f1 = get_net_or_empty(lut5, id_F1); + NetInfo *f1 = lut5->getPort(id_F1); NPNR_ASSERT(f1 != nullptr); NPNR_ASSERT(f1->driver.cell != nullptr); return f1->driver.cell; @@ -2806,7 +2806,7 @@ bool Arch::pack() void Arch::assign_arch_info_for_cell(CellInfo *ci) { auto get_port_net = [&](CellInfo *ci, IdString p) { - NetInfo *n = get_net_or_empty(ci, p); + NetInfo *n = ci->getPort(p); return n ? n->name : IdString(); }; if (ci->type == id_TRELLIS_COMB) { |