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

Some cleanups in opt_rmdff

This commit is contained in:
Clifford Wolf 2015-07-25 12:01:25 +02:00
parent badc5f7eb9
commit 2a613b1b66
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
passes/opt/opt_rmdff.cc
View File

@ -130,38 +130,31 @@ bool handle_dff(RTLIL::Module *mod, RTLIL::Cell *dff)
if (sig_c.is_fully_const() && (!sig_r.size() || !has_init || val_init == val_rv)) { if (sig_c.is_fully_const() && (!sig_r.size() || !has_init || val_init == val_rv)) {
if (val_rv.bits.size() == 0) if (val_rv.bits.size() == 0)
val_rv = val_init; val_rv = val_init;
RTLIL::SigSig conn(sig_q, val_rv); mod->connect(sig_q, val_rv);
mod->connect(conn);
goto delete_dff; goto delete_dff;
} }
if (sig_d.is_fully_undef() && sig_r.size() && (!has_init || val_init == val_rv)) { if (sig_d.is_fully_undef() && sig_r.size() && (!has_init || val_init == val_rv)) {
RTLIL::SigSig conn(sig_q, val_rv); mod->connect(sig_q, val_rv);
mod->connect(conn);
goto delete_dff; goto delete_dff;
} }
if (sig_d.is_fully_undef() && !sig_r.size() && has_init) { if (sig_d.is_fully_undef() && !sig_r.size() && has_init) {
RTLIL::SigSig conn(sig_q, val_init); mod->connect(sig_q, val_init);
mod->connect(conn);
goto delete_dff; goto delete_dff;
} }
if (sig_d.is_fully_const() && (!sig_r.size() || val_rv == sig_d.as_const()) && (!has_init || val_init == sig_d.as_const())) { if (sig_d.is_fully_const() && (!sig_r.size() || val_rv == sig_d.as_const()) && (!has_init || val_init == sig_d.as_const())) {
RTLIL::SigSig conn(sig_q, sig_d); log_dump(sig_q, sig_d);
mod->connect(conn); mod->connect(sig_q, sig_d);
goto delete_dff; goto delete_dff;
} }
if (sig_d == sig_q && (!sig_r.size() || !has_init || val_init == val_rv)) { if (sig_d == sig_q && (!sig_r.size() || !has_init || val_init == val_rv)) {
if (sig_r.size()) { if (sig_r.size())
RTLIL::SigSig conn(sig_q, val_rv); mod->connect(sig_q, val_rv);
mod->connect(conn); if (has_init)
} mod->connect(sig_q, val_init);
if (has_init) {
RTLIL::SigSig conn(sig_q, val_init);
mod->connect(conn);
}
goto delete_dff; goto delete_dff;
} }