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

working packer

Browse Source
This commit is contained in:
Pepijn de Vos 2020-12-02 16:51:22 +01:00
parent c89027ca5d
commit 919e91d99e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gowin/arch.cc
View File

@ -815,7 +815,7 @@ bool Arch::place()
bool have_iobuf_or_constr = false; bool have_iobuf_or_constr = false;
for (auto cell : sorted(cells)) { for (auto cell : sorted(cells)) {
CellInfo *ci = cell.second; CellInfo *ci = cell.second;
if (ci->type == id("GENERIC_IOB") || ci->bel != BelId() || ci->attrs.count(id("BEL"))) { if (ci->type == id("IOB") || ci->bel != BelId() || ci->attrs.count(id("BEL"))) {
have_iobuf_or_constr = true; have_iobuf_or_constr = true;
break; break;
} }
@ -827,7 +827,7 @@ bool Arch::place()
retVal = placer1(getCtx(), Placer1Cfg(getCtx())); retVal = placer1(getCtx(), Placer1Cfg(getCtx()));
} else { } else {
PlacerHeapCfg cfg(getCtx()); PlacerHeapCfg cfg(getCtx());
cfg.ioBufTypes.insert(id("GENERIC_IOB")); cfg.ioBufTypes.insert(id("IOB"));
retVal = placer_heap(getCtx(), cfg); retVal = placer_heap(getCtx(), cfg);
} }
getCtx()->settings[getCtx()->id("place")] = 1; getCtx()->settings[getCtx()->id("place")] = 1;
@ -962,7 +962,7 @@ void Arch::assignArchInfo()
{ {
for (auto &cell : getCtx()->cells) { for (auto &cell : getCtx()->cells) {
CellInfo *ci = cell.second.get(); CellInfo *ci = cell.second.get();
if (ci->type == id("GENERIC_SLICE")) { if (ci->type == id("SLICE")) {
ci->is_slice = true; ci->is_slice = true;
ci->slice_clk = get_net_or_empty(ci, id("CLK")); ci->slice_clk = get_net_or_empty(ci, id("CLK"));
} else { } else {

3
gowin/pack.cc
View File

@ -243,8 +243,9 @@ static void pack_io(Context *ctx)
if (iob != nullptr) { if (iob != nullptr) {
// delete the $nexpnr_[io]buf // delete the $nexpnr_[io]buf
for (auto &p : iob->ports) { for (auto &p : iob->ports) {
IdString netname = p.second.net->name;
disconnect_port(ctx, iob, p.first); disconnect_port(ctx, iob, p.first);
delete_nets.insert(p.second.net->name); delete_nets.insert(netname);
} }
packed_cells.insert(iob->name); packed_cells.insert(iob->name);
} }