riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abc9_ops: Don't leave unused derived modules lying around 

These later become accidentally used for techmap replacements for
blackboxes that we don't actually want.

Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2022-05-01 09:24:17 +01:00 committed by Lofty
parent 0b1a1a576b
commit 166a175983
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
passes/techmap/abc9_ops.cc
View File

@ -155,6 +155,9 @@ void prep_hier(RTLIL::Design *design, bool dff_mode)
r.first->second = new Design;
Design *unmap_design = r.first->second;
// Keep track of derived versions of modules that we haven't used, to prevent these being used for unwanted techmaps later on.
pool<IdString> unused_derived;
for (auto module : design->selected_modules())
for (auto cell : module->cells()) {
auto inst_module = design->module(cell->type);
@ -169,6 +172,7 @@ void prep_hier(RTLIL::Design *design, bool dff_mode)
else {
derived_type = inst_module->derive(design, cell->parameters);
derived_module = design->module(derived_type);
unused_derived.insert(derived_type);
}
if (derived_module->get_bool_attribute(ID::abc9_flop)) {
@ -192,6 +196,7 @@ void prep_hier(RTLIL::Design *design, bool dff_mode)
// as a compatible type, yet will be safely unmapped later
cell->type = derived_type;
cell->parameters.clear();
unused_derived.erase(derived_type);
}
continue;
}
@ -250,7 +255,11 @@ void prep_hier(RTLIL::Design *design, bool dff_mode)
cell->type = derived_type;
cell->parameters.clear();
unused_derived.erase(derived_type);
}
for (auto unused : unused_derived) {
design->remove(design->module(unused));
}
}
void prep_bypass(RTLIL::Design *design)