caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gowin-packages

Browse Source
This commit is contained in:
YRabbit 2021-11-06 22:17:31 +10:00
commit 19911ae3a7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/cells.h
View File

@ -21,6 +21,7 @@
#define ECP5_CELLS_H
#include "nextpnr.h"
#include "util.h"
NEXTPNR_NAMESPACE_BEGIN
@ -49,12 +50,17 @@ inline bool is_l6mux(const BaseCtx *ctx, const CellInfo *cell) { return cell->ty
inline bool is_iologic_input_cell(const BaseCtx *ctx, const CellInfo *cell)
{
return cell->type == ctx->id("IDDRX1F") || cell->type == ctx->id("IDDRX2F") || cell->type == ctx->id("IDDR71B") ||
cell->type == ctx->id("IDDRX2DQA");
cell->type == ctx->id("IDDRX2DQA") ||
(cell->type == ctx->id("TRELLIS_FF") && bool_or_default(cell->attrs, ctx->id("syn_useioff")) &&
(str_or_default(cell->attrs, ctx->id("ioff_dir"), "") != "output"));
}
inline bool is_iologic_output_cell(const BaseCtx *ctx, const CellInfo *cell)
{
return cell->type == ctx->id("ODDRX1F") || cell->type == ctx->id("ODDRX2F") || cell->type == ctx->id("ODDR71B") ||
cell->type == ctx->id("ODDRX2DQA") || cell->type == ctx->id("ODDRX2DQSB") || cell->type == ctx->id("OSHX2A");
cell->type == ctx->id("ODDRX2DQA") || cell->type == ctx->id("ODDRX2DQSB") ||
cell->type == ctx->id("OSHX2A") ||
(cell->type == ctx->id("TRELLIS_FF") && bool_or_default(cell->attrs, ctx->id("syn_useioff")) &&
(str_or_default(cell->attrs, ctx->id("ioff_dir"), "") != "input"));
}
void ff_to_slice(Context *ctx, CellInfo *ff, CellInfo *lc, int index, bool driven_by_lut);

4
ecp5/pack.cc
View File

@ -2316,7 +2316,9 @@ class Ecp5Packer
set_iologic_mode(iol, "IREG_OREG");
bool drives_iologic = false;
for (auto user : ci->ports.at(ctx->id("Z")).net->users)
if (is_iologic_input_cell(ctx, user.cell) && user.port == ctx->id("D"))
if (is_iologic_input_cell(ctx, user.cell) &&
(user.port == ctx->id("D") ||
(user.cell->type == ctx->id("TRELLIS_FF") && user.port == ctx->id("DI"))))
drives_iologic = true;
if (drives_iologic) {
// Reconnect to PIO which the packer expects later on