luke
/
nextpnr
mirror of https://github.com/YosysHQ/nextpnr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

review fixes

This commit is contained in:
Lofty 2025-07-15 06:14:09 +01:00
parent 669901ef75
commit 715f13db51
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
himbaechel/uarch/gatemate/pack.cc
View File

@ -26,13 +26,13 @@
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
void GateMatePacker::flush_cells(bool unbind) void GateMatePacker::flush_cells()
{ {
for (auto pcell : packed_cells) { for (auto pcell : packed_cells) {
for (auto &port : ctx->cells[pcell]->ports) { for (auto &port : ctx->cells[pcell]->ports) {
ctx->cells[pcell]->disconnectPort(port.first); ctx->cells[pcell]->disconnectPort(port.first);
} }
if (unbind) if (ctx->cells[pcell]->bel != BelId())
ctx->unbindBel(ctx->cells[pcell]->bel); ctx->unbindBel(ctx->cells[pcell]->bel);
ctx->cells.erase(pcell); ctx->cells.erase(pcell);
} }
@ -127,10 +127,7 @@ void GateMatePacker::move_connections(NetInfo *from_net, NetInfo *to_net)
void GateMatePacker::count_cell(CellInfo &ci) void GateMatePacker::count_cell(CellInfo &ci)
{ {
packed_cells.insert(ci.name); packed_cells.insert(ci.name);
if (!count_per_type.count(ci.type)) count_per_type[ci.type]++;
count_per_type[ci.type] = 1;
else
count_per_type[ci.type]++;
count++; count++;
} }
@ -378,7 +375,7 @@ void GateMatePacker::repack()
packed_cells.insert(cell.second->name); packed_cells.insert(cell.second->name);
} }
} }
flush_cells(true); flush_cells();
} }
void GateMateImpl::pack() void GateMateImpl::pack()

2
himbaechel/uarch/gatemate/pack.h
View File

@ -101,7 +101,7 @@ struct GateMatePacker
// Cell creating // Cell creating
CellInfo *create_cell_ptr(IdString type, IdString name); CellInfo *create_cell_ptr(IdString type, IdString name);
void flush_cells(bool unbind = false); void flush_cells();
void pack_ram_cell(CellInfo &ci, CellInfo *cell, int num, bool is_split); void pack_ram_cell(CellInfo &ci, CellInfo *cell, int num, bool is_split);
void copy_constraint(NetInfo *in_net, NetInfo *out_net); void copy_constraint(NetInfo *in_net, NetInfo *out_net);