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

opt_expr -fine to trim LSBs of $alu too

This commit is contained in:
Eddie Hung 2019-08-09 10:32:12 -07:00
parent 8350dfb809
commit 9f1b82f594
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
passes/opt/opt_expr.cc
View File

@ -642,26 +642,31 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
} }
} }
if (cell->type.in("$add", "$sub")) { if (cell->type.in("$add", "$sub", "$alu"))
{
RTLIL::SigSpec sig_a = assign_map(cell->getPort("\\A")); RTLIL::SigSpec sig_a = assign_map(cell->getPort("\\A"));
RTLIL::SigSpec sig_b = assign_map(cell->getPort("\\B")); RTLIL::SigSpec sig_b = assign_map(cell->getPort("\\B"));
RTLIL::SigSpec sig_y = cell->getPort("\\Y"); RTLIL::SigSpec sig_y = cell->getPort("\\Y");
bool sub = cell->type == "$sub"; bool ignore_a = cell->type == "$sub" || (cell->type == "$alu" && !cell->getPort("\\BI").is_fully_zero());
int i; int i;
for (i = 0; i < GetSize(sig_y); i++) { for (i = 0; i < GetSize(sig_y); i++) {
if (sig_b.at(i, State::Sx) == State::S0 && sig_a.at(i, State::Sx) != State::Sx) if (sig_b.at(i, State::Sx) == State::S0 && sig_a.at(i, State::Sx) != State::Sx)
module->connect(sig_y[i], sig_a[i]); module->connect(sig_y[i], sig_a[i]);
else if (!sub && sig_a.at(i, State::Sx) == State::S0 && sig_b.at(i, State::Sx) != State::Sx) else if (!ignore_a && sig_a.at(i, State::Sx) == State::S0 && sig_b.at(i, State::Sx) != State::Sx)
module->connect(sig_y[i], sig_b[i]); module->connect(sig_y[i], sig_b[i]);
else else
break; break;
} }
if (i > 0) { if (i > 0) {
cover_list("opt.opt_expr.fine", "$add", "$sub", cell->type.str()); cover_list("opt.opt_expr.fine", "$add", "$sub", "$alu", cell->type.str());
cell->setPort("\\A", sig_a.extract_end(i)); cell->setPort("\\A", sig_a.extract_end(i));
cell->setPort("\\B", sig_b.extract_end(i)); cell->setPort("\\B", sig_b.extract_end(i));
cell->setPort("\\Y", sig_y.extract_end(i)); cell->setPort("\\Y", sig_y.extract_end(i));
if (cell->type == "$alu") {
cell->setPort("\\X", cell->getPort("\\X").extract_end(i));
cell->setPort("\\CO", cell->getPort("\\CO").extract_end(i));
}
cell->fixup_parameters(); cell->fixup_parameters();
did_something = true; did_something = true;
} }