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

IOB -> IOB33; preserve FF init as DFF_INIT, use BUFGCTRL with PRESELECT_I0 in blinky

Browse Source
This commit is contained in:
Eddie Hung 2018-08-21 22:18:00 -07:00
parent 5b6255abf1
commit b658a39d73
6 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xc7/arch.cc
View File

@ -68,7 +68,7 @@ std::vector<IdString> TorcInfo::construct_site_index_to_type(Arch* ctx, const Si
if (type == "SLICEL" || type == "SLICEM") if (type == "SLICEL" || type == "SLICEM")
site_index_to_type[i] = id_SLICE_LUT6; site_index_to_type[i] = id_SLICE_LUT6;
else if (type == "IOB33S" || type == "IOB33M") else if (type == "IOB33S" || type == "IOB33M")
site_index_to_type[i] = id_IOB; site_index_to_type[i] = id_IOB33;
else else
site_index_to_type[i] = ctx->id(type); site_index_to_type[i] = ctx->id(type);
} }
@ -790,7 +790,7 @@ TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, Id
// TODO // TODO
//if (port == id_OMUX) //if (port == id_OMUX)
} }
else if (cell->type == id_IOB) { else if (cell->type == id_IOB33) {
if (port == id_I) if (port == id_I)
return TMG_STARTPOINT; return TMG_STARTPOINT;
else if (port == id_O) else if (port == id_O)

2
xc7/blinky.v
View File

@ -7,7 +7,7 @@ module blinky (
output led5 output led5
); );
BUFGCTRL clk_gb ( BUFGCTRL #(.PRESELECT_I0("TRUE")) clk_gb (
.I0(clki), .I0(clki),
.O(clk) .O(clk)
); );

8
xc7/cells.cc
View File

@ -70,7 +70,7 @@ std::unique_ptr<CellInfo> create_xc7_cell(Context *ctx, IdString type, std::stri
add_port(ctx, new_cell.get(), "OMUX", PORT_OUT); add_port(ctx, new_cell.get(), "OMUX", PORT_OUT);
add_port(ctx, new_cell.get(), "COUT", PORT_OUT); add_port(ctx, new_cell.get(), "COUT", PORT_OUT);
} else if (type == ctx->id("IOBUF")) { } else if (type == ctx->id("IOBUF")) {
new_cell->type = id_IOB; new_cell->type = id_IOB33;
new_cell->params[ctx->id("PIN_TYPE")] = "0"; new_cell->params[ctx->id("PIN_TYPE")] = "0";
new_cell->params[ctx->id("PULLUP")] = "0"; new_cell->params[ctx->id("PULLUP")] = "0";
new_cell->params[ctx->id("NEG_TRIGGER")] = "0"; new_cell->params[ctx->id("NEG_TRIGGER")] = "0";
@ -130,7 +130,7 @@ std::unique_ptr<CellInfo> create_xc7_cell(Context *ctx, IdString type, std::stri
// add_port(ctx, new_cell.get(), "CLKHF_FABRIC", PORT_OUT); // add_port(ctx, new_cell.get(), "CLKHF_FABRIC", PORT_OUT);
// for (int i = 0; i < 10; i++) // for (int i = 0; i < 10; i++)
// add_port(ctx, new_cell.get(), "TRIM" + std::to_string(i), PORT_IN); // add_port(ctx, new_cell.get(), "TRIM" + std::to_string(i), PORT_IN);
} else if (type == ctx->id("BUFGCTRL")) { } else if (type == id_BUFGCTRL) {
add_port(ctx, new_cell.get(), "I0", PORT_IN); add_port(ctx, new_cell.get(), "I0", PORT_IN);
add_port(ctx, new_cell.get(), "O", PORT_OUT); add_port(ctx, new_cell.get(), "O", PORT_OUT);
// } else if (type == ctx->id("ICESTORM_SPRAM")) { // } else if (type == ctx->id("ICESTORM_SPRAM")) {
@ -322,6 +322,10 @@ void dff_to_lc(const Context *ctx, CellInfo *dff, CellInfo *lc, bool pass_thru_l
} }
replace_port(dff, ctx->id("Q"), lc, id_OQ); replace_port(dff, ctx->id("Q"), lc, id_OQ);
auto it = dff->params.find(ctx->id("INIT"));
if (it != dff->params.end())
lc->params[ctx->id("DFF_INIT")] = it->second;
} }
void nxio_to_sb(Context *ctx, CellInfo *nxio, CellInfo *sbio) void nxio_to_sb(Context *ctx, CellInfo *nxio, CellInfo *sbio)

2
xc7/constids.inc
View File

@ -456,4 +456,4 @@ X(FDPE)
X(BUFGCTRL) X(BUFGCTRL)
X(SLICE_LUT6) X(SLICE_LUT6)
X(IOB) X(IOB33)

1
xc7/pack.cc
View File

@ -451,7 +451,6 @@ static bool is_logic_port(BaseCtx *ctx, const PortRef &port)
static void insert_global(Context *ctx, NetInfo *net, bool is_reset, bool is_cen, bool is_logic) static void insert_global(Context *ctx, NetInfo *net, bool is_reset, bool is_cen, bool is_logic)
{ {
asm("int3");
std::string glb_name = net->name.str(ctx) + std::string("_$glb_") + (is_reset ? "sr" : (is_cen ? "ce" : "clk")); std::string glb_name = net->name.str(ctx) + std::string("_$glb_") + (is_reset ? "sr" : (is_cen ? "ce" : "clk"));
std::unique_ptr<CellInfo> gb = create_xc7_cell(ctx, id_BUFGCTRL, "$bufg_" + glb_name); std::unique_ptr<CellInfo> gb = create_xc7_cell(ctx, id_BUFGCTRL, "$bufg_" + glb_name);
gb->ports[ctx->id("I0")].net = net; gb->ports[ctx->id("I0")].net = net;

28
xc7/xdl.cc
View File

@ -54,13 +54,7 @@ void write_xdl(const Context *ctx, std::ostream &out)
for (const auto& cell : ctx->cells) { for (const auto& cell : ctx->cells) {
const char* type; const char* type;
if (cell.second->type == id_SLICE_LUT6) type = "SLICEL"; if (cell.second->type == id_SLICE_LUT6) type = "SLICEL";
else if (cell.second->type == id_IOB) { else if (cell.second->type == id_IOB33 || cell.second->type == id_BUFGCTRL) type = cell.second->type.c_str(ctx);
auto site_index = torc_info->bel_to_site_index[cell.second->bel.index];
const auto &site = torc_info->sites.getSite(site_index);
auto prim_def = site.getPrimitiveDefPtr();
type = prim_def->getName().c_str();
}
else if (cell.second->type == id_BUFGCTRL) type = "BUFGCTRL";
else log_error("Unsupported cell type '%s'.\n", cell.second->type.c_str(ctx)); else log_error("Unsupported cell type '%s'.\n", cell.second->type.c_str(ctx));
auto site_index = torc_info->bel_to_site_index[cell.second->bel.index]; auto site_index = torc_info->bel_to_site_index[cell.second->bel.index];
@ -132,8 +126,10 @@ void write_xdl(const Context *ctx, std::ostream &out)
} }
auto O = get_net_or_empty(cell.second.get(), id_O); auto O = get_net_or_empty(cell.second.get(), id_O);
if (O) if (O) {
name = O->name.str(ctx); name = O->name.str(ctx);
instPtr->setConfig(lut + "USED", "", "0");
}
else else
name = cell.second->name.str(ctx); name = cell.second->name.str(ctx);
boost::replace_all(name, ":", "\\:"); boost::replace_all(name, ":", "\\:");
@ -146,22 +142,30 @@ void write_xdl(const Context *ctx, std::ostream &out)
name = OQ->name.str(ctx); name = OQ->name.str(ctx);
boost::replace_all(name, ":", "\\:"); boost::replace_all(name, ":", "\\:");
instPtr->setConfig(setting, name, "#FF"); instPtr->setConfig(setting, name, "#FF");
instPtr->setConfig(setting + "MUX", "", "O6");
instPtr->setConfig(setting + "INIT", "", "INIT" + cell.second->params.at(ctx->id("DFF_INIT")));
} }
} }
else if (cell.second->type == id_IOB) { else if (cell.second->type == id_IOB33) {
if (get_net_or_empty(cell.second.get(), id_I)) { if (get_net_or_empty(cell.second.get(), id_I)) {
instPtr->setConfig("IUSED", "", "0"); instPtr->setConfig("IUSED", "", "0");
instPtr->setConfig("IBUF_LOW_PWR", "", "TRUE"); instPtr->setConfig("IBUF_LOW_PWR", "", "TRUE");
instPtr->setConfig("ISTANDARD", "", "LVCMOS25"); instPtr->setConfig("ISTANDARD", "", "LVCMOS33");
} }
else { else {
//instPtr->setConfig("OUSED", "", "0"); instPtr->setConfig("OUSED", "", "0");
instPtr->setConfig("OSTANDARD", "", "LVCMOS25"); instPtr->setConfig("OSTANDARD", "", "LVCMOS33");
instPtr->setConfig("DRIVE", "", "12"); instPtr->setConfig("DRIVE", "", "12");
instPtr->setConfig("SLEW", "", "SLOW"); instPtr->setConfig("SLEW", "", "SLOW");
} }
} }
else if (cell.second->type == id_BUFGCTRL) { else if (cell.second->type == id_BUFGCTRL) {
static const char* params_whitelist[] = { "PRESELECT_I0", "PRESELECT_I1" };
for (auto w : params_whitelist) {
auto it = cell.second->params.find(ctx->id(w));
if (it != cell.second->params.end())
instPtr->setConfig(it->first.c_str(ctx), "", it->second.c_str());
}
} }
else log_error("Unsupported cell type '%s'.\n", cell.second->type.c_str(ctx)); else log_error("Unsupported cell type '%s'.\n", cell.second->type.c_str(ctx));
} }