From 2476f116bb2709cb1c01efd358b6c2b2edfda0c8 Mon Sep 17 00:00:00 2001 From: gatecat Date: Tue, 29 Jun 2021 14:48:47 +0100 Subject: interchange: Track the macros that cells have been expanded from Signed-off-by: gatecat --- fpga_interchange/macros.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'fpga_interchange/macros.cc') diff --git a/fpga_interchange/macros.cc b/fpga_interchange/macros.cc index 8339829f..42c8e1ba 100644 --- a/fpga_interchange/macros.cc +++ b/fpga_interchange/macros.cc @@ -66,6 +66,8 @@ void Arch::expand_macros() const MacroPOD *macro = lookup_macro(chip_info, exp ? IdString(exp->macro_name) : cell->type); if (macro == nullptr) continue; + // Get the ultimate root of this macro expansion + IdString parent = (cell->macro_parent == IdString()) ? cell->name : cell->macro_parent; // Create child instances for (const auto &inst : macro->cell_insts) { CellInfo *inst_cell = @@ -73,6 +75,7 @@ void Arch::expand_macros() for (const auto ¶m : inst.parameters) { inst_cell->params[IdString(param.key)] = IdString(param.value).str(ctx); } + inst_cell->macro_parent = parent; next_cells.push_back(inst_cell); } // Create and connect nets @@ -156,6 +159,9 @@ void Arch::expand_macros() std::swap(next_cells, cells); next_cells.clear(); } while (!cells.empty()); + // Do this at the end, otherwise we might add cells that are later destroyed + for (auto &cell : ctx->cells) + macro_to_cells[cell.second->macro_parent].push_back(cell.second.get()); } NEXTPNR_NAMESPACE_END -- cgit v1.2.3