diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-12-27 15:35:19 -0800 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-12-27 15:35:19 -0800 |
| commit | 36d79c80d05f93cd4cb565fe7a92d7cb88683852 (patch) | |
| tree | f1d3ea789871dc3087148f786ae34aebd834abed | |
| parent | b7afafde22c195f381168677407a2abc93c5fae0 (diff) | |
| download | yosys-36d79c80d05f93cd4cb565fe7a92d7cb88683852.tar.gz yosys-36d79c80d05f93cd4cb565fe7a92d7cb88683852.tar.bz2 yosys-36d79c80d05f93cd4cb565fe7a92d7cb88683852.zip | |
write_xaiger: simplify c{i,o}_bits
| -rw-r--r-- | backends/aiger/xaiger.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc index 96263f576..db38f2017 100644 --- a/backends/aiger/xaiger.cc +++ b/backends/aiger/xaiger.cc @@ -81,8 +81,7 @@ struct XAigerWriter pool<SigBit> input_bits, output_bits; dict<SigBit, SigBit> not_map, alias_map; dict<SigBit, pair<SigBit, SigBit>> and_map; - vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int>> ci_bits; - vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int,int>> co_bits; + vector<SigBit> ci_bits, co_bits; dict<SigBit, float> arrival_times; vector<pair<int, int>> aig_gates; @@ -376,7 +375,6 @@ struct XAigerWriter cell->setPort(port_name, rhs); } - int offset = 0; for (auto b : rhs.bits()) { SigBit I = sigmap(b); if (b == RTLIL::Sx) @@ -387,7 +385,7 @@ struct XAigerWriter else alias_map[b] = I; } - co_bits.emplace_back(b, cell, port_name, offset++, 0); + co_bits.emplace_back(b); unused_bits.erase(b); } } @@ -407,9 +405,8 @@ struct XAigerWriter cell->setPort(port_name, rhs); } - int offset = 0; for (const auto &b : rhs.bits()) { - ci_bits.emplace_back(b, cell, port_name, offset++); + ci_bits.emplace_back(b); SigBit O = sigmap(b); if (O != b) alias_map[O] = b; @@ -496,15 +493,13 @@ struct XAigerWriter aig_map[bit] = 2*aig_m; } - for (auto &c : ci_bits) { - RTLIL::SigBit bit = std::get<0>(c); + for (auto bit : ci_bits) { aig_m++, aig_i++; aig_map[bit] = 2*aig_m; } - for (auto &c : co_bits) { - RTLIL::SigBit bit = std::get<0>(c); - std::get<4>(c) = ordered_outputs[bit] = aig_o++; + for (auto bit : co_bits) { + ordered_outputs[bit] = aig_o++; aig_outputs.push_back(bit2aig(bit)); } @@ -517,7 +512,6 @@ struct XAigerWriter ordered_outputs[bit] = aig_o++; aig_outputs.push_back(bit2aig(bit)); } - } void write_aiger(std::ostream &f, bool ascii_mode) |