mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-15 13:28:59 +00:00
Code Activity

More opt_clean cleanups

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-05-07 14:41:58 +02:00
parent 752553d8e9
commit a76189e7ad
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
passes/opt/opt_clean.cc
View file

@ -320,22 +320,32 @@ void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
if (initval.is_fully_undef()) if (initval.is_fully_undef())
wire->attributes.erase("\\init"); wire->attributes.erase("\\init");
bool delete_this_wire = false; if (GetSize(wire) == 0) {
// delete zero-width wires
goto delete_this_wire;
} else
if (wire->port_id != 0 || wire->get_bool_attribute("\\keep") || !initval.is_fully_undef()) { if (wire->port_id != 0 || wire->get_bool_attribute("\\keep") || !initval.is_fully_undef()) {
/* do not delete anything with "keep" or module ports or initialized wires */ // do not delete anything with "keep" or module ports or initialized wires
} else } else
if (!purge_mode && check_public_name(wire->name)) { if (!purge_mode && check_public_name(wire->name)) {
/* do not get rid of public names unless in purge mode */ // do not get rid of public names unless in purge mode
} else { } else
if (!raw_used_signals_noaliases.check_any(s1)) if (!raw_used_signals_noaliases.check_any(s1)) {
delete_this_wire = true; // delete wires that aren't used by anything directly
if (!used_signals_nodrivers.check_any(s2)) goto delete_this_wire;
delete_this_wire = true; } else
if (!used_signals_nodrivers.check_any(s2)) {
// delete wires that aren't used by anything indirectly, even though other wires may alias it
goto delete_this_wire;
} }
if (delete_this_wire) { if (0)
{
delete_this_wire:
del_wires_queue.insert(wire); del_wires_queue.insert(wire);
} else { }
else
{
RTLIL::SigSig new_conn; RTLIL::SigSig new_conn;
for (int i = 0; i < GetSize(s1); i++) for (int i = 0; i < GetSize(s1); i++)
if (s1[i] != s2[i]) { if (s1[i] != s2[i]) {
@ -355,25 +365,25 @@ void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
used_signals.add(new_conn.second); used_signals.add(new_conn.second);
module->connect(new_conn); module->connect(new_conn);
} }
}
if (!used_signals_nodrivers.check_all(s2)) { if (!used_signals_nodrivers.check_all(s2)) {
std::string unused_bits; std::string unused_bits;
for (int i = 0; i < GetSize(s2); i++) { for (int i = 0; i < GetSize(s2); i++) {
if (s2[i].wire == NULL) if (s2[i].wire == NULL)
continue; continue;
if (!used_signals_nodrivers.check(s2[i])) { if (!used_signals_nodrivers.check(s2[i])) {
if (!unused_bits.empty()) if (!unused_bits.empty())
unused_bits += " "; unused_bits += " ";
unused_bits += stringf("%d", i); unused_bits += stringf("%d", i);
}
} }
} if (unused_bits.empty() || wire->port_id != 0)
if (unused_bits.empty() || wire->port_id != 0) wire->attributes.erase("\\unused_bits");
else
wire->attributes["\\unused_bits"] = RTLIL::Const(unused_bits);
} else {
wire->attributes.erase("\\unused_bits"); wire->attributes.erase("\\unused_bits");
else }
wire->attributes["\\unused_bits"] = RTLIL::Const(unused_bits);
} else {
wire->attributes.erase("\\unused_bits");
} }
} }