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

ice40: Only create padin gbuf for PLLs if global output actually used

Browse Source 
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2019-04-17 06:51:11 +02:00
parent 9dd68aa0e2
commit 6387a3d33e
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ice40/pack.cc
View File

@ -868,16 +868,26 @@ static void place_plls(Context *ctx)
BelId gb_bel = ctx->getBelByName(ctx->id(gb_ci->attrs[ctx->id("BEL")])); BelId gb_bel = ctx->getBelByName(ctx->id(gb_ci->attrs[ctx->id("BEL")]));
for (auto placed_pll : pll_used_bels) { for (auto placed_pll : pll_used_bels) {
CellInfo *ci = placed_pll.second;
// Used global connections
bool gb_a_used = ci->ports.count(id_PLLOUT_A_GLOBAL) && (ci->ports[id_PLLOUT_A_GLOBAL].net != nullptr) &&
(ci->ports[id_PLLOUT_A_GLOBAL].net->users.size() > 0);
bool gb_b_used = is_sb_pll40_dual(ctx, ci) && ci->ports.count(id_PLLOUT_B_GLOBAL) &&
(ci->ports[id_PLLOUT_B_GLOBAL].net != nullptr) &&
(ci->ports[id_PLLOUT_B_GLOBAL].net->users.size() > 0);
// Check for conflict
BelPin pll_io_a, pll_io_b; BelPin pll_io_a, pll_io_b;
BelId gb_a, gb_b; BelId gb_a, gb_b;
std::tie(pll_io_a, gb_a, pll_io_b, gb_b) = pll_all_bels[placed_pll.first]; std::tie(pll_io_a, gb_a, pll_io_b, gb_b) = pll_all_bels[placed_pll.first];
if (gb_bel == gb_a) { if (gb_a_used && (gb_bel == gb_a)) {
log_error("PLL '%s' A output conflict with SB_GB '%s'\n", placed_pll.second->name.c_str(ctx), log_error("PLL '%s' A output conflict with SB_GB '%s'\n", placed_pll.second->name.c_str(ctx),
gb_cell.second->name.c_str(ctx)); gb_cell.second->name.c_str(ctx));
} else if (gb_bel == gb_b) { }
if (is_sb_pll40_dual(ctx, placed_pll.second)) if (gb_b_used && (gb_bel == gb_b)) {
log_error("PLL '%s' B output conflicts with SB_GB '%s'\n", placed_pll.second->name.c_str(ctx), log_error("PLL '%s' B output conflicts with SB_GB '%s'\n", placed_pll.second->name.c_str(ctx),
gb_cell.second->name.c_str(ctx)); gb_cell.second->name.c_str(ctx));
} }
} }
@ -903,6 +913,13 @@ static void place_plls(Context *ctx)
log_error("PLL '%s' is of CORE type but doesn't have a valid REFERENCECLK connection\n", log_error("PLL '%s' is of CORE type but doesn't have a valid REFERENCECLK connection\n",
ci->name.c_str(ctx)); ci->name.c_str(ctx));
// Used global connections
bool gb_a_used = ci->ports.count(id_PLLOUT_A_GLOBAL) && (ci->ports[id_PLLOUT_A_GLOBAL].net != nullptr) &&
(ci->ports[id_PLLOUT_A_GLOBAL].net->users.size() > 0);
bool gb_b_used = is_sb_pll40_dual(ctx, ci) && ci->ports.count(id_PLLOUT_B_GLOBAL) &&
(ci->ports[id_PLLOUT_B_GLOBAL].net != nullptr) &&
(ci->ports[id_PLLOUT_B_GLOBAL].net->users.size() > 0);
// Could this be a PAD PLL ? // Could this be a PAD PLL ?
bool could_be_pad = false; bool could_be_pad = false;
BelId pad_bel; BelId pad_bel;
@ -924,9 +941,9 @@ static void place_plls(Context *ctx)
} }
if (bel2io.count(pll_io_b.bel) && is_sb_pll40_dual(ctx, ci)) if (bel2io.count(pll_io_b.bel) && is_sb_pll40_dual(ctx, ci))
continue; continue;
if (bel2gb.count(gb_a)) if (gb_a_used && bel2gb.count(gb_a))
continue; continue;
if (bel2gb.count(gb_b) && is_sb_pll40_dual(ctx, ci)) if (gb_b_used && bel2gb.count(gb_b))
continue; continue;
found_bel = bel_pll.first; found_bel = bel_pll.first;
break; break;
@ -1337,10 +1354,20 @@ static void pack_special(Context *ctx)
else else
continue; continue;
std::unique_ptr<CellInfo> gb = // Only if there is actually a net ...
create_padin_gbuf(ctx, packed.get(), pi.name, if (pi.net != nullptr) {
"$gbuf_" + ci->name.str(ctx) + "_pllout_" + (is_b_port ? "b" : "a")); // ... and it's used
new_cells.push_back(std::move(gb)); if (pi.net->users.size() > 0) {
std::unique_ptr<CellInfo> gb =
create_padin_gbuf(ctx, packed.get(), pi.name,
"$gbuf_" + ci->name.str(ctx) + "_pllout_" + (is_b_port ? "b" : "a"));
new_cells.push_back(std::move(gb));
} else {
// If not, remove it to avoid routing issues
ctx->nets.erase(pi.net->name);
packed->ports[pi.name].net = nullptr;
}
}
} }
new_cells.push_back(std::move(packed)); new_cells.push_back(std::move(packed));