diff options
author | David Shah <dave@ds0.me> | 2020-03-10 13:50:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 13:50:59 +0000 |
commit | bb7358020928d0a26ab7becd123ccdc15b0206cb (patch) | |
tree | be364e21a28d1d292ecda9a57337ba9fe81fe7e0 /ice40/cells.cc | |
parent | 751f4556fde8a316030b36c3de53f08a548e3efa (diff) | |
parent | 9aa22433ff12d8e0d8edd7bba7d6fa27f097198f (diff) | |
download | nextpnr-bb7358020928d0a26ab7becd123ccdc15b0206cb.tar.gz nextpnr-bb7358020928d0a26ab7becd123ccdc15b0206cb.tar.bz2 nextpnr-bb7358020928d0a26ab7becd123ccdc15b0206cb.zip |
Merge pull request #400 from YosysHQ/dave/tri-fixes
Improve handling of unused inout port bits
Diffstat (limited to 'ice40/cells.cc')
-rw-r--r-- | ice40/cells.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/ice40/cells.cc b/ice40/cells.cc index f1901c43..d23b6c49 100644 --- a/ice40/cells.cc +++ b/ice40/cells.cc @@ -22,6 +22,7 @@ #include "cells.h" #include "design_utils.h" #include "log.h" +#include "util.h" NEXTPNR_NAMESPACE_BEGIN @@ -424,7 +425,14 @@ void nxio_to_sb(Context *ctx, CellInfo *nxio, CellInfo *sbio, std::unordered_set replace_port(nxio, ctx->id("I"), sbio, ctx->id("D_OUT_0")); } else if (nxio->type == ctx->id("$nextpnr_iobuf")) { // N.B. tristate will be dealt with below - sbio->params[ctx->id("PIN_TYPE")] = 25; + NetInfo *i = get_net_or_empty(nxio, ctx->id("I")); + if (i == nullptr || i->driver.cell == nullptr) + sbio->params[ctx->id("PIN_TYPE")] = 1; + else + sbio->params[ctx->id("PIN_TYPE")] = 25; + auto pu_attr = nxio->attrs.find(ctx->id("PULLUP")); + if (pu_attr != nxio->attrs.end()) + sbio->params[ctx->id("PULLUP")] = pu_attr->second; replace_port(nxio, ctx->id("I"), sbio, ctx->id("D_OUT_0")); replace_port(nxio, ctx->id("O"), sbio, ctx->id("D_IN_0")); } else { @@ -438,6 +446,15 @@ void nxio_to_sb(Context *ctx, CellInfo *nxio, CellInfo *sbio, std::unordered_set if (dinet != nullptr && dinet->name == nxio->name) rename_net(ctx, dinet, ctx->id(dinet->name.str(ctx) + "$SB_IO_IN")); + if (ctx->nets.count(nxio->name)) { + int i = 0; + IdString new_name; + do { + new_name = ctx->id(nxio->name.str(ctx) + "$rename$" + std::to_string(i++)); + } while (ctx->nets.count(new_name)); + rename_net(ctx, ctx->nets.at(nxio->name).get(), new_name); + } + // Create a new top port net for accurate IO timing analysis and simulation netlists if (ctx->ports.count(nxio->name)) { IdString tn_netname = nxio->name; |