diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-06-10 07:16:30 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-06-10 07:16:30 +0200 |
| commit | 85287295b27dc3d51d2958dccb4f9098984b794a (patch) | |
| tree | 03d1517947ed1dc553e3cb1a765b785dc0014645 /passes | |
| parent | 66f9ee412ae94fa305660bdc33fa0c00fedd5500 (diff) | |
| download | yosys-85287295b27dc3d51d2958dccb4f9098984b794a.tar.gz yosys-85287295b27dc3d51d2958dccb4f9098984b794a.tar.bz2 yosys-85287295b27dc3d51d2958dccb4f9098984b794a.zip | |
Fixed cellaigs port extending
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/techmap/aig.cc | 5 | ||||
| -rw-r--r-- | passes/tests/test_cell.cc | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/passes/techmap/aig.cc b/passes/techmap/aig.cc index 0c0f0b130..3bd078537 100644 --- a/passes/techmap/aig.cc +++ b/passes/techmap/aig.cc @@ -90,12 +90,13 @@ struct AigPass : public Pass { bit = cell->getPort(node.portname)[node.portbit]; } else if (node.left_parent < 0 && node.right_parent < 0) { bit = node.inverter ? State::S0 : State::S1; + goto skip_inverter; } else { SigBit A = sigs.at(node.left_parent); SigBit B = sigs.at(node.right_parent); if (nand_mode && node.inverter) { bit = module->NandGate(NEW_ID, A, B); - goto nand_inverter; + goto skip_inverter; } else { pair<int, int> key(node.left_parent, node.right_parent); if (and_cache.count(key)) @@ -108,7 +109,7 @@ struct AigPass : public Pass { if (node.inverter) bit = module->NotGate(NEW_ID, bit); - nand_inverter: + skip_inverter: for (auto &op : node.outports) module->connect(cell->getPort(op.first)[op.second], bit); diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc index 268f25598..9a7934f55 100644 --- a/passes/tests/test_cell.cc +++ b/passes/tests/test_cell.cc @@ -536,6 +536,9 @@ struct TestCellPass : public Pass { log(" -simlib\n"); log(" use \"techmap -map +/simlib.v -max_iter 2 -autoproc\"\n"); log("\n"); + log(" -aig\n"); + log(" instead of calling \"techmap\", call \"aig\"\n"); + log("\n"); log(" -muxdiv\n"); log(" when creating test benches with dividers, create an additional mux\n"); log(" to mask out the division-by-zero case\n"); @@ -600,6 +603,10 @@ struct TestCellPass : public Pass { techmap_cmd = "techmap -map +/simlib.v -max_iter 2 -autoproc"; continue; } + if (args[argidx] == "-aig") { + techmap_cmd = "aig"; + continue; + } if (args[argidx] == "-muxdiv") { muxdiv = true; continue; |