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

Merge pull request #328 from YosysHQ/dave/timing_iobuf

Browse Source 
Move clock constraints across buffers in more cases
This commit is contained in:
David Shah 2019-09-13 18:24:38 +01:00 committed by GitHub
commit 3975424ff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ecp5/pack.cc
View File

@ -377,6 +377,13 @@ class Ecp5Packer
log_error("Pin B of %s '%s' connected to more than a single top level IO.\n",
trio->type.c_str(ctx), trio->name.c_str(ctx));
if (net != nullptr) {
if (net->clkconstr != nullptr && trio->ports.count(ctx->id("O"))) {
NetInfo *onet = trio->ports.at(ctx->id("O")).net;
if (onet != nullptr && !onet->clkconstr) {
// Move clock constraint from IO pad to input buffer output
std::swap(net->clkconstr, onet->clkconstr);
}
}
ctx->nets.erase(net->name);
trio->ports.at(ctx->id("B")).net = nullptr;
}
@ -2361,6 +2368,8 @@ class Ecp5Packer
copy_constraint(ci, id_CLKI, id_CDIVX, ratio);
} else if (ci->type == id_ECLKSYNCB || ci->type == id_TRELLIS_ECLKBUF) {
copy_constraint(ci, id_ECLKI, id_ECLKO, 1);
} else if (ci->type == id_DCCA) {
copy_constraint(ci, id_CLKI, id_CLKO, 1);
} else if (ci->type == id_EHXPLLL) {
delay_t period_in;
if (!get_period(ci, id_CLKI, period_in))

20
ice40/pack.cc
View File

@ -490,6 +490,26 @@ static void pack_io(Context *ctx)
sb->type.c_str(ctx), sb->name.c_str(ctx));
if (net != nullptr) {
if (net->clkconstr != nullptr) {
if (sb->ports.count(id_D_IN_0)) {
NetInfo *din0_net = sb->ports.at(id_D_IN_0).net;
if (din0_net != nullptr && !din0_net->clkconstr) {
// Copy clock constraint from IO pad to input buffer output
din0_net->clkconstr =
std::unique_ptr<ClockConstraint>(new ClockConstraint(*net->clkconstr));
}
}
if (is_sb_gb_io(ctx, sb) && sb->ports.count(id_GLOBAL_BUFFER_OUTPUT)) {
NetInfo *gb_net = sb->ports.at(id_GLOBAL_BUFFER_OUTPUT).net;
if (gb_net != nullptr && !gb_net->clkconstr) {
// Copy clock constraint from IO pad to global buffer output
gb_net->clkconstr =
std::unique_ptr<ClockConstraint>(new ClockConstraint(*net->clkconstr));
}
}
}
delete_nets.insert(net->name);
sb->ports.at(ctx->id("PACKAGE_PIN")).net = nullptr;
}