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

opt_lut: use a worklist, and revisit cells affected by elimination.

This commit is contained in:
whitequark 2019-01-02 09:36:32 +00:00
parent f7363ac508
commit 06143ab33f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
passes/opt/opt_lut.cc
View File

@ -189,7 +189,8 @@ struct OptLutWorker
log("\n");
log("Eliminating LUTs.\n");
for (auto lut : luts)
pool<RTLIL::Cell*> worklist = luts;
while (worklist.size())
{
if (limit == 0)
{
@ -197,6 +198,7 @@ struct OptLutWorker
break;
}
auto lut = worklist.pop();
SigSpec lut_input = sigmap(lut->getPort("\\A"));
pool<int> &lut_dlogic_inputs = luts_dlogic_inputs[lut];
@ -262,8 +264,13 @@ struct OptLutWorker
else
{
SigSpec lut_output = lut->getPort("\\Y");
module->connect(lut_output, value);
for (auto &port : index.query_ports(lut_output))
{
if (port.cell != lut && luts.count(port.cell))
worklist.insert(port.cell);
}
module->connect(lut_output, value);
module->remove(lut);
luts.erase(lut);
luts_arity.erase(lut);
@ -280,7 +287,7 @@ struct OptLutWorker
log("\n");
log("Combining LUTs.\n");
pool<RTLIL::Cell*> worklist = luts;
worklist = luts;
while (worklist.size())
{
if (limit == 0)