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

Cleanups in opt_clean 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-05-06 12:45:22 +02:00
parent 70d0f389ad
commit ba6ce21a74
1 changed files with 16 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
passes/opt/opt_clean.cc
View File

@ -276,7 +276,7 @@ void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
} }
} }
std::vector<RTLIL::Wire*> maybe_del_wires; pool<RTLIL::Wire*> del_wires_queue;
for (auto wire : module->wires()) for (auto wire : module->wires())
{ {
SigSpec s1 = SigSpec(wire), s2 = assign_map(s1); SigSpec s1 = SigSpec(wire), s2 = assign_map(s1);
@ -290,7 +290,7 @@ 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 maybe_del = false; bool delete_this_wire = false;
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
@ -298,13 +298,13 @@ void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
/* 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))
maybe_del = true; delete_this_wire = true;
if (!used_signals_nodrivers.check_any(s2)) if (!used_signals_nodrivers.check_any(s2))
maybe_del = true; delete_this_wire = true;
} }
if (maybe_del) { if (delete_this_wire) {
maybe_del_wires.push_back(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++)
@ -347,50 +347,19 @@ void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
} }
} }
int del_temp_wires_count = 0;
pool<RTLIL::Wire*> del_wires; for (auto wire : del_wires_queue) {
if (ys_debug() || (check_public_name(wire->name) && verbose))
int del_wires_count = 0;
for (auto wire : maybe_del_wires) {
SigSpec s1 = SigSpec(wire);
if (used_signals_nodrivers.check_any(s1)) {
SigSpec s2 = assign_map(s1);
Const initval;
if (wire->attributes.count("\\init"))
initval = wire->attributes.at("\\init");
if (GetSize(initval) != GetSize(wire))
initval.bits.resize(GetSize(wire), State::Sx);
RTLIL::SigSig new_conn;
for (int i = 0; i < GetSize(s1); i++)
if (s1[i] != s2[i]) {
if (s2[i] == State::Sx && (initval[i] == State::S0 || initval[i] == State::S1)) {
s2[i] = initval[i];
initval[i] = State::Sx;
}
new_conn.first.append_bit(s1[i]);
new_conn.second.append_bit(s2[i]);
}
if (new_conn.first.size() > 0) {
if (initval.is_fully_undef())
wire->attributes.erase("\\init");
else
wire->attributes.at("\\init") = initval;
module->connect(new_conn);
}
} else {
if (ys_debug() || (check_public_name(wire->name) && verbose)) {
log_debug(" removing unused non-port wire %s.\n", wire->name.c_str()); log_debug(" removing unused non-port wire %s.\n", wire->name.c_str());
} else
del_wires.insert(wire); del_temp_wires_count++;
del_wires_count++;
}
} }
module->remove(del_wires); module->remove(del_wires_queue);
count_rm_wires += del_wires.size(); count_rm_wires += GetSize(del_wires_queue);
if (verbose && del_wires_count > 0) if (verbose && del_temp_wires_count)
log_debug(" removed %d unused temporary wires.\n", del_wires_count); log_debug(" removed %d unused temporary wires.\n", del_temp_wires_count);
} }
bool rmunused_module_init(RTLIL::Module *module, bool purge_mode, bool verbose) bool rmunused_module_init(RTLIL::Module *module, bool purge_mode, bool verbose)