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

Revert "Do not add VCC if not used, loading json works"

Browse Source 
This reverts commit f1b3a14bc2.
This commit is contained in:
Miodrag Milanovic 2019-06-02 08:51:32 +02:00
parent bab6c9a09f
commit eff1a1341a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ice40/pack.cc
View File

@ -352,7 +352,6 @@ static void pack_constants(Context *ctx)
std::vector<IdString> dead_nets; std::vector<IdString> dead_nets;
bool gnd_used = false; bool gnd_used = false;
bool vcc_used = false;
for (auto net : sorted(ctx->nets)) { for (auto net : sorted(ctx->nets)) {
NetInfo *ni = net.second; NetInfo *ni = net.second;
@ -365,7 +364,6 @@ static void pack_constants(Context *ctx)
} else if (ni->driver.cell != nullptr && ni->driver.cell->type == ctx->id("VCC")) { } else if (ni->driver.cell != nullptr && ni->driver.cell->type == ctx->id("VCC")) {
IdString drv_cell = ni->driver.cell->name; IdString drv_cell = ni->driver.cell->name;
set_net_constant(ctx, ni, vcc_net.get(), true); set_net_constant(ctx, ni, vcc_net.get(), true);
vcc_used = true;
dead_nets.push_back(net.first); dead_nets.push_back(net.first);
ctx->cells.erase(drv_cell); ctx->cells.erase(drv_cell);
} }
@ -375,10 +373,11 @@ static void pack_constants(Context *ctx)
ctx->cells[gnd_cell->name] = std::move(gnd_cell); ctx->cells[gnd_cell->name] = std::move(gnd_cell);
ctx->nets[gnd_net->name] = std::move(gnd_net); ctx->nets[gnd_net->name] = std::move(gnd_net);
} }
if (vcc_used) { // Vcc cell always inserted for now, as it may be needed during carry legalisation (TODO: trim later if actually
ctx->cells[vcc_cell->name] = std::move(vcc_cell); // never used?)
ctx->nets[vcc_net->name] = std::move(vcc_net); ctx->cells[vcc_cell->name] = std::move(vcc_cell);
} ctx->nets[vcc_net->name] = std::move(vcc_net);
for (auto dn : dead_nets) { for (auto dn : dead_nets) {
ctx->nets.erase(dn); ctx->nets.erase(dn);
} }