port ecp5 split slice to machxo2
This commit is contained in:
Lofty
myrtle
parent
b033b915a6
commit
235a575267
@ -95,6 +95,20 @@ Arch::Arch(ArchArgs args) : args(args)
|
||||
if (!package_info)
|
||||
log_error("Unsupported package '%s' for '%s'.\n", package_name, getChipName().c_str());
|
||||
|
||||
tile_status.resize(chip_info->num_tiles);
|
||||
for (int i = 0; i < chip_info->num_tiles; i++) {
|
||||
auto &ts = tile_status.at(i);
|
||||
auto &tile_data = chip_info->tile_info[i];
|
||||
ts.boundcells.resize(chip_info->tiles[i].bel_data.size(), nullptr);
|
||||
for (auto &name : tile_data.tile_names) {
|
||||
if (strcmp(chip_info->tiletype_names[name.type_idx].get(), "PLC2") == 0) {
|
||||
// Is a logic tile
|
||||
ts.lts = new LogicTileStatus();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BaseArch::init_cell_types();
|
||||
BaseArch::init_bel_buckets();
|
||||
|
||||
@ -470,12 +484,6 @@ DecalXY Arch::getPipDecal(PipId pip) const
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
bool Arch::isBelLocationValid(BelId bel, bool explain_invalid) const
|
||||
{
|
||||
// FIXME: Same deal as isValidBelForCell.
|
||||
return true;
|
||||
}
|
||||
|
||||
const std::string Arch::defaultPlacer = "heap";
|
||||
|
||||
const std::vector<std::string> Arch::availablePlacers = {"sa", "heap"};
|
||||
|
||||
@ -381,6 +381,38 @@ struct Arch : BaseArch<ArchRanges>
|
||||
// inverse of the above for name->object mapping
|
||||
dict<IdString, int> id_to_x, id_to_y;
|
||||
|
||||
enum LogicBELType
|
||||
{
|
||||
BEL_COMB = 0,
|
||||
BEL_FF = 1,
|
||||
BEL_RAMW = 2
|
||||
};
|
||||
static const int lc_idx_shift = 2;
|
||||
|
||||
struct LogicTileStatus
|
||||
{
|
||||
// Per-SLICE valid and dirty bits
|
||||
struct SliceStatus
|
||||
{
|
||||
bool valid = true, dirty = true;
|
||||
} slices[4];
|
||||
// Per-tile legality check for control set legality
|
||||
bool tile_valid = true;
|
||||
bool tile_dirty = true;
|
||||
// Fast index from z-pos to cell
|
||||
std::array<CellInfo *, 8 * (1 << lc_idx_shift)> cells;
|
||||
};
|
||||
|
||||
struct TileStatus
|
||||
{
|
||||
std::vector<CellInfo *> boundcells;
|
||||
LogicTileStatus *lts = nullptr;
|
||||
// TODO: use similar mechanism for DSP legality checking
|
||||
~TileStatus() { delete lts; }
|
||||
};
|
||||
|
||||
mutable std::vector<TileStatus> tile_status;
|
||||
|
||||
// Helpers
|
||||
template <typename Id> const TileTypePOD *tile_info(Id &id) const
|
||||
{
|
||||
@ -392,6 +424,11 @@ struct Arch : BaseArch<ArchRanges>
|
||||
return (bel.location.y * chip_info->width + bel.location.x) * max_loc_bels + bel.index;
|
||||
}
|
||||
|
||||
template <typename Id> inline int tile_index(Id id) const
|
||||
{
|
||||
return id.location.y * chip_info->width + id.location.x;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
// Common Arch API. Every arch must provide the following methods.
|
||||
|
||||
@ -624,6 +661,12 @@ struct Arch : BaseArch<ArchRanges>
|
||||
// Placer
|
||||
bool isBelLocationValid(BelId bel, bool explain_invalid = false) const override;
|
||||
|
||||
// Helper function for above
|
||||
bool slices_compatible(LogicTileStatus *lts) const;
|
||||
|
||||
void assign_arch_info_for_cell(CellInfo *ci);
|
||||
void assignArchInfo() override;
|
||||
|
||||
static const std::string defaultPlacer;
|
||||
static const std::vector<std::string> availablePlacers;
|
||||
static const std::string defaultRouter;
|
||||
|
||||
@ -143,6 +143,57 @@ struct NetInfo;
|
||||
|
||||
struct ArchCellInfo : BaseClusterInfo
|
||||
{
|
||||
enum CombFlags : uint8_t
|
||||
{
|
||||
COMB_NONE = 0x00,
|
||||
COMB_CARRY = 0x01,
|
||||
COMB_LUTRAM = 0x02,
|
||||
COMB_MUX5 = 0x04,
|
||||
COMB_MUX6 = 0x08,
|
||||
COMB_RAM_WCKINV = 0x10,
|
||||
COMB_RAM_WREINV = 0x20,
|
||||
COMB_RAMW_BLOCK = 0x40,
|
||||
};
|
||||
|
||||
enum FFFlags : uint8_t
|
||||
{
|
||||
FF_NONE = 0x00,
|
||||
FF_CLKINV = 0x01,
|
||||
FF_CEINV = 0x02,
|
||||
FF_CECONST = 0x04,
|
||||
FF_LSRINV = 0x08,
|
||||
FF_GSREN = 0x10,
|
||||
FF_ASYNC = 0x20,
|
||||
FF_M_USED = 0x40,
|
||||
};
|
||||
|
||||
struct
|
||||
{
|
||||
uint8_t flags;
|
||||
IdString ram_wck, ram_wre;
|
||||
CellInfo *mux_fxad;
|
||||
} combInfo;
|
||||
struct
|
||||
{
|
||||
uint8_t flags;
|
||||
IdString clk_sig, lsr_sig, ce_sig, di_sig;
|
||||
} ffInfo;
|
||||
struct
|
||||
{
|
||||
bool is_pdp;
|
||||
// Are the outputs from a DP16KD registered (OUTREG)
|
||||
// or non-registered (NOREG)
|
||||
bool is_output_a_registered;
|
||||
bool is_output_b_registered;
|
||||
// Which timing information to use for a DP16KD. Depends on registering
|
||||
// configuration.
|
||||
IdString regmode_timing_id;
|
||||
} ramInfo;
|
||||
struct
|
||||
{
|
||||
bool is_clocked;
|
||||
IdString timing_id;
|
||||
} multInfo;
|
||||
};
|
||||
|
||||
NEXTPNR_NAMESPACE_END
|
||||
|
||||
349
machxo2/cells.cc
349
machxo2/cells.cc
@ -32,24 +32,73 @@ std::unique_ptr<CellInfo> create_machxo2_cell(Context *ctx, IdString type, std::
|
||||
name.empty() ? ctx->id("$nextpnr_" + type.str(ctx) + "_" + std::to_string(auto_idx++)) : ctx->id(name);
|
||||
auto new_cell = std::make_unique<CellInfo>(ctx, name_id, type);
|
||||
|
||||
if (type == id_TRELLIS_SLICE) {
|
||||
if (type == id_TRELLIS_COMB) {
|
||||
new_cell->params[id_MODE] = std::string("LOGIC");
|
||||
new_cell->params[id_GSR] = std::string("ENABLED");
|
||||
new_cell->params[id_SRMODE] = std::string("LSR_OVER_CE");
|
||||
new_cell->params[id_CEMUX] = std::string("1");
|
||||
new_cell->params[id_CLKMUX] = std::string("0");
|
||||
new_cell->params[id_LSRMUX] = std::string("LSR");
|
||||
new_cell->params[id_LSRONMUX] = std::string("LSRMUX");
|
||||
new_cell->params[id_LUT0_INITVAL] = Property(0xFFFF, 16);
|
||||
new_cell->params[id_LUT1_INITVAL] = Property(0xFFFF, 16);
|
||||
new_cell->params[id_REGMODE] = std::string("FF");
|
||||
new_cell->params[id_REG0_SD] = std::string("1");
|
||||
new_cell->params[id_REG1_SD] = std::string("1");
|
||||
new_cell->params[id_REG0_REGSET] = std::string("SET");
|
||||
new_cell->params[id_REG1_REGSET] = std::string("SET");
|
||||
new_cell->params[id_CCU2_INJECT1_0] = std::string("YES");
|
||||
new_cell->params[id_CCU2_INJECT1_1] = std::string("YES");
|
||||
new_cell->params[id_WREMUX] = std::string("INV");
|
||||
new_cell->params[id_INITVAL] = Property(0, 16);
|
||||
new_cell->params[id_CCU2_INJECT1] = std::string("NO");
|
||||
new_cell->params[id_WREMUX] = std::string("WRE");
|
||||
|
||||
new_cell->addInput(id_A);
|
||||
new_cell->addInput(id_B);
|
||||
new_cell->addInput(id_C);
|
||||
new_cell->addInput(id_D);
|
||||
|
||||
new_cell->addInput(id_M);
|
||||
|
||||
new_cell->addInput(id_F1);
|
||||
new_cell->addInput(id_FCI);
|
||||
new_cell->addInput(id_FXA);
|
||||
new_cell->addInput(id_FXB);
|
||||
|
||||
new_cell->addInput(id_DI0);
|
||||
new_cell->addInput(id_DI1);
|
||||
|
||||
new_cell->addInput(id_WD);
|
||||
new_cell->addInput(id_WAD0);
|
||||
new_cell->addInput(id_WAD1);
|
||||
new_cell->addInput(id_WAD2);
|
||||
new_cell->addInput(id_WAD3);
|
||||
new_cell->addInput(id_WRE);
|
||||
new_cell->addInput(id_WCK);
|
||||
|
||||
new_cell->addOutput(id_F);
|
||||
|
||||
new_cell->addOutput(id_FCO);
|
||||
new_cell->addOutput(id_OFX);
|
||||
} else if (type == id_TRELLIS_RAMW) {
|
||||
for (auto i : {id_A0, id_B0, id_C0, id_D0, id_A1, id_B1, id_C1, id_D1})
|
||||
new_cell->addInput(i);
|
||||
for (auto o : {id_WDO0, id_WDO1, id_WDO2, id_WDO3, id_WADO0, id_WADO1, id_WADO2, id_WADO3})
|
||||
new_cell->addOutput(o);
|
||||
} else if (type == id_TRELLIS_IO) {
|
||||
new_cell->params[id_DIR] = std::string("INPUT");
|
||||
new_cell->attrs[id_IO_TYPE] = std::string("LVCMOS33");
|
||||
new_cell->params[id_DATAMUX_ODDR] = std::string("PADDO");
|
||||
new_cell->params[id_DATAMUX_MDDR] = std::string("PADDO");
|
||||
|
||||
new_cell->addInout(id_B);
|
||||
new_cell->addInput(id_I);
|
||||
new_cell->addInput(id_T);
|
||||
new_cell->addOutput(id_O);
|
||||
|
||||
new_cell->addInput(id_IOLDO);
|
||||
new_cell->addInput(id_IOLTO);
|
||||
|
||||
} else if (type == id_LUT4) {
|
||||
new_cell->params[id_INIT] = Property(0, 16);
|
||||
|
||||
new_cell->addInput(id_A);
|
||||
new_cell->addInput(id_B);
|
||||
new_cell->addInput(id_C);
|
||||
new_cell->addInput(id_D);
|
||||
new_cell->addOutput(id_Z);
|
||||
} else if (type == id_CCU2C) {
|
||||
new_cell->params[id_INIT0] = Property(0, 16);
|
||||
new_cell->params[id_INIT1] = Property(0, 16);
|
||||
new_cell->params[id_INJECT1_0] = std::string("YES");
|
||||
new_cell->params[id_INJECT1_1] = std::string("YES");
|
||||
|
||||
new_cell->addInput(id_CIN);
|
||||
|
||||
new_cell->addInput(id_A0);
|
||||
new_cell->addInput(id_B0);
|
||||
@ -61,62 +110,9 @@ std::unique_ptr<CellInfo> create_machxo2_cell(Context *ctx, IdString type, std::
|
||||
new_cell->addInput(id_C1);
|
||||
new_cell->addInput(id_D1);
|
||||
|
||||
new_cell->addInput(id_M0);
|
||||
new_cell->addInput(id_M1);
|
||||
|
||||
new_cell->addInput(id_FCI);
|
||||
new_cell->addInput(id_FXA);
|
||||
new_cell->addInput(id_FXB);
|
||||
|
||||
new_cell->addInput(id_CLK);
|
||||
new_cell->addInput(id_LSR);
|
||||
new_cell->addInput(id_CE);
|
||||
|
||||
new_cell->addInput(id_DI0);
|
||||
new_cell->addInput(id_DI1);
|
||||
|
||||
new_cell->addInput(id_WD0);
|
||||
new_cell->addInput(id_WD1);
|
||||
new_cell->addInput(id_WAD0);
|
||||
new_cell->addInput(id_WAD1);
|
||||
new_cell->addInput(id_WAD2);
|
||||
new_cell->addInput(id_WAD3);
|
||||
new_cell->addInput(id_WRE);
|
||||
new_cell->addInput(id_WCK);
|
||||
|
||||
new_cell->addOutput(id_F0);
|
||||
new_cell->addOutput(id_Q0);
|
||||
new_cell->addOutput(id_F1);
|
||||
new_cell->addOutput(id_Q1);
|
||||
|
||||
new_cell->addOutput(id_FCO);
|
||||
new_cell->addOutput(id_OFX0);
|
||||
new_cell->addOutput(id_OFX1);
|
||||
|
||||
new_cell->addOutput(id_WDO0);
|
||||
new_cell->addOutput(id_WDO1);
|
||||
new_cell->addOutput(id_WDO2);
|
||||
new_cell->addOutput(id_WDO3);
|
||||
new_cell->addOutput(id_WADO0);
|
||||
new_cell->addOutput(id_WADO1);
|
||||
new_cell->addOutput(id_WADO2);
|
||||
new_cell->addOutput(id_WADO3);
|
||||
} else if (type == id_TRELLIS_IO) {
|
||||
new_cell->params[id_DIR] = std::string("INPUT");
|
||||
new_cell->attrs[id_IO_TYPE] = std::string("LVCMOS33");
|
||||
|
||||
new_cell->addInout(id_B);
|
||||
new_cell->addInput(id_I);
|
||||
new_cell->addInput(id_EN);
|
||||
new_cell->addOutput(id_O);
|
||||
} else if (type == id_LUT4) {
|
||||
new_cell->params[id_INIT] = Property(0, 16);
|
||||
|
||||
new_cell->addInput(id_A);
|
||||
new_cell->addInput(id_B);
|
||||
new_cell->addInput(id_C);
|
||||
new_cell->addInput(id_D);
|
||||
new_cell->addOutput(id_Z);
|
||||
new_cell->addOutput(id_S0);
|
||||
new_cell->addOutput(id_S1);
|
||||
new_cell->addOutput(id_COUT);
|
||||
} else {
|
||||
log_error("unable to create MachXO2 cell of type %s", type.c_str(ctx));
|
||||
}
|
||||
@ -124,6 +120,135 @@ std::unique_ptr<CellInfo> create_machxo2_cell(Context *ctx, IdString type, std::
|
||||
return new_cell;
|
||||
}
|
||||
|
||||
static unsigned get_dram_init(const Context *ctx, const CellInfo *ram, int bit)
|
||||
{
|
||||
auto init_prop = get_or_default(ram->params, id_INITVAL, Property(0, 64));
|
||||
NPNR_ASSERT(!init_prop.is_string);
|
||||
const std::string &idata = init_prop.str;
|
||||
NPNR_ASSERT(idata.length() == 64);
|
||||
unsigned value = 0;
|
||||
for (int i = 0; i < 16; i++) {
|
||||
char c = idata.at(4 * i + bit);
|
||||
if (c == '1')
|
||||
value |= (1 << i);
|
||||
else
|
||||
NPNR_ASSERT(c == '0' || c == 'x');
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
void lut_to_comb(Context *ctx, CellInfo *lut)
|
||||
{
|
||||
lut->type = id_TRELLIS_COMB;
|
||||
lut->params[id_INITVAL] = get_or_default(lut->params, id_INIT, Property(0, 16));
|
||||
lut->params.erase(id_INIT);
|
||||
lut->renamePort(id_Z, id_F);
|
||||
}
|
||||
|
||||
void dram_to_ramw_split(Context *ctx, CellInfo *ram, CellInfo *ramw)
|
||||
{
|
||||
if (ramw->hierpath == IdString())
|
||||
ramw->hierpath = ramw->hierpath;
|
||||
ram->movePortTo(ctx->id("WAD[0]"), ramw, id_D0);
|
||||
ram->movePortTo(ctx->id("WAD[1]"), ramw, id_B0);
|
||||
ram->movePortTo(ctx->id("WAD[2]"), ramw, id_C0);
|
||||
ram->movePortTo(ctx->id("WAD[3]"), ramw, id_A0);
|
||||
|
||||
ram->movePortTo(ctx->id("DI[0]"), ramw, id_C1);
|
||||
ram->movePortTo(ctx->id("DI[1]"), ramw, id_A1);
|
||||
ram->movePortTo(ctx->id("DI[2]"), ramw, id_D1);
|
||||
ram->movePortTo(ctx->id("DI[3]"), ramw, id_B1);
|
||||
}
|
||||
|
||||
void ccu2_to_comb(Context *ctx, CellInfo *ccu, CellInfo *comb, NetInfo *internal_carry, int i)
|
||||
{
|
||||
std::string ii = std::to_string(i);
|
||||
if (comb->hierpath == IdString())
|
||||
comb->hierpath = ccu->hierpath;
|
||||
|
||||
comb->params[id_MODE] = std::string("CCU2");
|
||||
comb->params[id_INITVAL] = get_or_default(ccu->params, ctx->id("INIT" + ii), Property(0, 16));
|
||||
comb->params[id_CCU2_INJECT1] = str_or_default(ccu->params, ctx->id("INJECT1_" + ii), "YES");
|
||||
|
||||
ccu->movePortTo(ctx->id("A" + ii), comb, id_A);
|
||||
ccu->movePortTo(ctx->id("B" + ii), comb, id_B);
|
||||
ccu->movePortTo(ctx->id("C" + ii), comb, id_C);
|
||||
ccu->movePortTo(ctx->id("D" + ii), comb, id_D);
|
||||
|
||||
ccu->movePortTo(ctx->id("S" + ii), comb, id_F);
|
||||
|
||||
if (i == 0) {
|
||||
ccu->movePortTo(id_CIN, comb, id_FCI);
|
||||
comb->connectPort(id_FCO, internal_carry);
|
||||
} else if (i == 1) {
|
||||
comb->connectPort(id_FCI, internal_carry);
|
||||
ccu->movePortTo(id_COUT, comb, id_FCO);
|
||||
} else {
|
||||
NPNR_ASSERT_FALSE("bad carry index!");
|
||||
}
|
||||
|
||||
for (auto &attr : ccu->attrs)
|
||||
comb->attrs[attr.first] = attr.second;
|
||||
}
|
||||
|
||||
void dram_to_comb(Context *ctx, CellInfo *ram, CellInfo *comb, CellInfo *ramw, int index)
|
||||
{
|
||||
if (comb->hierpath == IdString())
|
||||
comb->hierpath = ram->hierpath;
|
||||
comb->params[id_MODE] = std::string("DPRAM");
|
||||
comb->params[id_WREMUX] = str_or_default(ram->params, id_WREMUX, "WRE");
|
||||
comb->params[id_WCKMUX] = str_or_default(ram->params, id_WCKMUX, "WCK");
|
||||
|
||||
unsigned permuted_init = 0;
|
||||
unsigned init = get_dram_init(ctx, ram, index);
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
int permuted_addr = 0;
|
||||
if (i & 1)
|
||||
permuted_addr |= 8;
|
||||
if (i & 2)
|
||||
permuted_addr |= 2;
|
||||
if (i & 4)
|
||||
permuted_addr |= 4;
|
||||
if (i & 8)
|
||||
permuted_addr |= 1;
|
||||
if (init & (1 << permuted_addr))
|
||||
permuted_init |= (1 << i);
|
||||
}
|
||||
|
||||
comb->params[ctx->id("INITVAL")] = Property(permuted_init, 16);
|
||||
|
||||
if (ram->ports.count(ctx->id("RAD[0]")))
|
||||
comb->connectPort(id_D, ram->ports.at(ctx->id("RAD[0]")).net);
|
||||
|
||||
if (ram->ports.count(ctx->id("RAD[1]")))
|
||||
comb->connectPort(id_B, ram->ports.at(ctx->id("RAD[1]")).net);
|
||||
|
||||
if (ram->ports.count(ctx->id("RAD[2]")))
|
||||
comb->connectPort(id_C, ram->ports.at(ctx->id("RAD[2]")).net);
|
||||
|
||||
if (ram->ports.count(ctx->id("RAD[3]")))
|
||||
comb->connectPort(id_A, ram->ports.at(ctx->id("RAD[3]")).net);
|
||||
|
||||
if (ram->ports.count(id_WRE))
|
||||
comb->connectPort(id_WRE, ram->ports.at(id_WRE).net);
|
||||
if (ram->ports.count(id_WCK))
|
||||
comb->connectPort(id_WCK, ram->ports.at(id_WCK).net);
|
||||
|
||||
ramw->connectPorts(id_WADO0, comb, id_WAD0);
|
||||
ramw->connectPorts(id_WADO1, comb, id_WAD1);
|
||||
ramw->connectPorts(id_WADO2, comb, id_WAD2);
|
||||
ramw->connectPorts(id_WADO3, comb, id_WAD3);
|
||||
|
||||
NPNR_ASSERT(index < 4);
|
||||
std::string ii = std::to_string(index);
|
||||
ramw->connectPorts(ctx->id("WDO" + ii), comb, id_WD);
|
||||
ram->movePortTo(ctx->id("DO[" + ii + "]"), comb, id_F);
|
||||
|
||||
for (auto &attr : ram->attrs)
|
||||
comb->attrs[attr.first] = attr.second;
|
||||
}
|
||||
|
||||
void lut_to_lc(const Context *ctx, CellInfo *lut, CellInfo *lc, bool no_dff)
|
||||
{
|
||||
lc->params[id_LUT0_INITVAL] = lut->params[id_INIT];
|
||||
@ -165,6 +290,82 @@ void dff_to_lc(Context *ctx, CellInfo *dff, CellInfo *lc, LutType lut_type)
|
||||
}
|
||||
}
|
||||
|
||||
void nxio_to_iob(Context *ctx, CellInfo *nxio, CellInfo *iob, pool<IdString> &todelete_cells) {}
|
||||
void nxio_to_tr(Context *ctx, CellInfo *nxio, CellInfo *trio, std::vector<std::unique_ptr<CellInfo>> &created_cells,
|
||||
pool<IdString> &todelete_cells)
|
||||
{
|
||||
if (nxio->type == ctx->id("$nextpnr_ibuf")) {
|
||||
trio->params[id_DIR] = std::string("INPUT");
|
||||
nxio->movePortTo(id_O, trio, id_O);
|
||||
} else if (nxio->type == ctx->id("$nextpnr_obuf")) {
|
||||
trio->params[id_DIR] = std::string("OUTPUT");
|
||||
nxio->movePortTo(id_I, trio, id_I);
|
||||
} else if (nxio->type == ctx->id("$nextpnr_iobuf")) {
|
||||
// N.B. tristate will be dealt with below
|
||||
NetInfo *i = nxio->getPort(id_I);
|
||||
if (i == nullptr || i->driver.cell == nullptr)
|
||||
trio->params[id_DIR] = std::string("INPUT");
|
||||
else {
|
||||
log_info("%s: %s.%s\n", ctx->nameOf(i), ctx->nameOf(i->driver.cell), ctx->nameOf(i->driver.port));
|
||||
trio->params[id_DIR] = std::string("BIDIR");
|
||||
}
|
||||
nxio->movePortTo(id_I, trio, id_I);
|
||||
nxio->movePortTo(id_O, trio, id_O);
|
||||
} else {
|
||||
NPNR_ASSERT(false);
|
||||
}
|
||||
NetInfo *donet = trio->ports.at(id_I).net, *dinet = trio->ports.at(id_O).net;
|
||||
|
||||
// Rename I/O nets to avoid conflicts
|
||||
if (donet != nullptr && donet->name == nxio->name)
|
||||
if (donet)
|
||||
ctx->renameNet(donet->name, ctx->id(donet->name.str(ctx) + "$TRELLIS_IO_OUT"));
|
||||
if (dinet != nullptr && dinet->name == nxio->name)
|
||||
if (dinet)
|
||||
ctx->renameNet(dinet->name, ctx->id(dinet->name.str(ctx) + "$TRELLIS_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));
|
||||
if (ctx->nets.at(nxio->name).get())
|
||||
ctx->renameNet(ctx->nets.at(nxio->name).get()->name, 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;
|
||||
NPNR_ASSERT(!ctx->nets.count(tn_netname));
|
||||
ctx->net_aliases.erase(tn_netname);
|
||||
NetInfo *toplevel_net = ctx->createNet(tn_netname);
|
||||
toplevel_net->name = tn_netname;
|
||||
trio->connectPort(id_B, toplevel_net);
|
||||
ctx->ports[nxio->name].net = toplevel_net;
|
||||
}
|
||||
|
||||
CellInfo *tbuf = net_driven_by(
|
||||
ctx, donet, [](const Context *ctx, const CellInfo *cell) { return cell->type == ctx->id("$_TBUF_"); },
|
||||
id_Y);
|
||||
if (tbuf) {
|
||||
tbuf->movePortTo(id_A, trio, id_I);
|
||||
// Need to invert E to form T
|
||||
std::unique_ptr<CellInfo> inv_lut = create_machxo2_cell(ctx, id_LUT4, trio->name.str(ctx) + "$invert_T");
|
||||
tbuf->movePortTo(id_E, inv_lut.get(), id_A);
|
||||
inv_lut->params[id_INIT] = Property(21845, 16);
|
||||
inv_lut->connectPorts(id_Z, trio, id_T);
|
||||
created_cells.push_back(std::move(inv_lut));
|
||||
|
||||
if (donet->users.entries() > 1) {
|
||||
for (auto user : donet->users)
|
||||
log_info(" remaining tristate user: %s.%s\n", user.cell->name.c_str(ctx), user.port.c_str(ctx));
|
||||
log_error("unsupported tristate IO pattern for IO buffer '%s', "
|
||||
"instantiate SB_IO manually to ensure correct behaviour\n",
|
||||
nxio->name.c_str(ctx));
|
||||
}
|
||||
ctx->nets.erase(donet->name);
|
||||
todelete_cells.insert(tbuf->name);
|
||||
}
|
||||
}
|
||||
|
||||
NEXTPNR_NAMESPACE_END
|
||||
|
||||
@ -41,12 +41,13 @@ std::unique_ptr<CellInfo> create_machxo2_cell(Context *ctx, IdString type, std::
|
||||
|
||||
// Return true if a cell is a LUT
|
||||
inline bool is_lut(const BaseCtx *ctx, const CellInfo *cell) { return cell->type == id_LUT4; }
|
||||
inline bool is_carry(const BaseCtx *ctx, const CellInfo *cell) { return cell->type == id_CCU2C; }
|
||||
inline bool is_dpram(const BaseCtx *ctx, const CellInfo *cell) { return cell->type == id_TRELLIS_DPR16X4; }
|
||||
inline bool is_trellis_io(const BaseCtx *ctx, const CellInfo *cell) { return cell->type == id_TRELLIS_IO; }
|
||||
|
||||
// Return true if a cell is a flipflop
|
||||
inline bool is_ff(const BaseCtx *ctx, const CellInfo *cell) { return cell->type == id_TRELLIS_FF; }
|
||||
|
||||
inline bool is_lc(const BaseCtx *ctx, const CellInfo *cell) { return cell->type == id_TRELLIS_SLICE; }
|
||||
|
||||
// Convert a LUT primitive to (part of) an GENERIC_SLICE, swapping ports
|
||||
// as needed. Set no_dff if a DFF is not being used, so that the output
|
||||
// can be reconnected
|
||||
@ -58,8 +59,15 @@ void lut_to_lc(const Context *ctx, CellInfo *lut, CellInfo *lc, bool no_dff = tr
|
||||
// ignored
|
||||
void dff_to_lc(Context *ctx, CellInfo *dff, CellInfo *lc, LutType lut_type = LutType::Normal);
|
||||
|
||||
// Convert a nextpnr IO buffer to a GENERIC_IOB
|
||||
void nxio_to_iob(Context *ctx, CellInfo *nxio, CellInfo *sbio, pool<IdString> &todelete_cells);
|
||||
// Convert a nextpnr IO buffer to a TRELLIS_IO
|
||||
void nxio_to_tr(Context *ctx, CellInfo *nxio, CellInfo *trio, std::vector<std::unique_ptr<CellInfo>> &created_cells,
|
||||
pool<IdString> &todelete_cells);
|
||||
|
||||
void lut_to_comb(Context *ctx, CellInfo *lut);
|
||||
void dram_to_ramw_split(Context *ctx, CellInfo *ram, CellInfo *ramw);
|
||||
void ccu2_to_comb(Context *ctx, CellInfo *ccu, CellInfo *comb, NetInfo *internal_carry, int i);
|
||||
void dram_to_comb(Context *ctx, CellInfo *ram, CellInfo *comb, CellInfo *ramw, int index);
|
||||
|
||||
|
||||
NEXTPNR_NAMESPACE_END
|
||||
|
||||
|
||||
@ -15,6 +15,8 @@ X(FXB)
|
||||
X(CLK)
|
||||
X(LSR)
|
||||
X(CE)
|
||||
X(CEA)
|
||||
X(CEW)
|
||||
X(DI0)
|
||||
X(DI1)
|
||||
X(WD0)
|
||||
@ -131,3 +133,32 @@ X(place)
|
||||
X(placer)
|
||||
X(route)
|
||||
X(router)
|
||||
|
||||
|
||||
X(TRELLIS_COMB)
|
||||
X(TRELLIS_RAMW)
|
||||
X(WD)
|
||||
X(OFX)
|
||||
X(F)
|
||||
X(M)
|
||||
|
||||
X(CCU2C)
|
||||
X(CCU2_INJECT1)
|
||||
X(INJECT1_0)
|
||||
X(INJECT1_1)
|
||||
X(TRELLIS_DPR16X4)
|
||||
X(INITVAL)
|
||||
X(INIT0)
|
||||
X(INIT1)
|
||||
|
||||
X(DATAMUX_ODDR)
|
||||
X(DATAMUX_MDDR)
|
||||
X(CIN)
|
||||
X(S0)
|
||||
X(S1)
|
||||
X(COUT)
|
||||
|
||||
X(E)
|
||||
X(Y)
|
||||
|
||||
X(WCKMUX)
|
||||
@ -481,7 +481,7 @@ def main():
|
||||
constids["PIO"] = constids["TRELLIS_IO"]
|
||||
|
||||
chip = pytrellis.Chip(dev_names[args.device])
|
||||
rg = pytrellis.make_optimized_chipdb(chip, split_slice_mode=False)
|
||||
rg = pytrellis.make_optimized_chipdb(chip, split_slice_mode=True)
|
||||
max_row = chip.get_max_row()
|
||||
max_col = chip.get_max_col()
|
||||
process_pio_db(rg, args.device)
|
||||
|
||||
1384
machxo2/pack.cc
1384
machxo2/pack.cc
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user