diff options
author | David Shah <dave@ds0.me> | 2019-11-18 14:28:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-18 14:28:40 +0000 |
commit | d08e2ade889b709af124d4332a60c6b504a120a2 (patch) | |
tree | e30b28b2d5f6a1925d8912c80badbcc34d291bba /ecp5/pack.cc | |
parent | e270fcd1dbc0e7d81a6775aca3472689ef39e7ef (diff) | |
parent | f2b9cc6d2311c437d740873111e806e9e5078736 (diff) | |
download | nextpnr-d08e2ade889b709af124d4332a60c6b504a120a2.tar.gz nextpnr-d08e2ade889b709af124d4332a60c6b504a120a2.tar.bz2 nextpnr-d08e2ade889b709af124d4332a60c6b504a120a2.zip |
Merge pull request #345 from YosysHQ/dave/sdf
Improve handling of top level IO and add SDF support
Diffstat (limited to 'ecp5/pack.cc')
-rw-r--r-- | ecp5/pack.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 166ed180..c498d20a 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -362,8 +362,7 @@ class Ecp5Packer for (auto &port : ci->ports) disconnect_port(ctx, ci, port.first); } else if (trio != nullptr) { - // Trivial case, TRELLIS_IO used. Just destroy the net and the - // iobuf + // Trivial case, TRELLIS_IO used. Just remove the IOBUF log_info("%s feeds TRELLIS_IO %s, removing %s %s.\n", ci->name.c_str(ctx), trio->name.c_str(ctx), ci->type.c_str(ctx), ci->name.c_str(ctx)); @@ -384,14 +383,6 @@ class Ecp5Packer std::swap(net->clkconstr, onet->clkconstr); } } - ctx->nets.erase(net->name); - trio->ports.at(ctx->id("B")).net = nullptr; - } - if (ci->type == ctx->id("$nextpnr_iobuf")) { - NetInfo *net2 = ci->ports.at(ctx->id("I")).net; - if (net2 != nullptr) { - ctx->nets.erase(net2->name); - } } } else if (drives_top_port(ionet, tp)) { log_info("%s feeds %s %s.%s, removing %s %s.\n", ci->name.c_str(ctx), tp.cell->type.c_str(ctx), @@ -414,7 +405,8 @@ class Ecp5Packer new_cells.push_back(std::move(tr_cell)); trio = new_cells.back().get(); } - + for (auto port : ci->ports) + disconnect_port(ctx, ci, port.first); packed_cells.insert(ci->name); if (trio != nullptr) { for (const auto &attr : ci->attrs) |