diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-10-02 18:07:38 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-10-02 18:07:38 -0700 |
| commit | c6a55d948aebc8993cc3e33372b9c403b0b90554 (patch) | |
| tree | 9806b6ff139a604e8c89ea5b8972a755f15e0fb2 /passes | |
| parent | f6fabc8fda1eb00b0227f1a91d85b837a0609728 (diff) | |
| parent | f46ac1df9f8847dac9d9851f2f948d93a1064ff1 (diff) | |
| download | yosys-c6a55d948aebc8993cc3e33372b9c403b0b90554.tar.gz yosys-c6a55d948aebc8993cc3e33372b9c403b0b90554.tar.bz2 yosys-c6a55d948aebc8993cc3e33372b9c403b0b90554.zip | |
Merge branch 'eddie/fix_sat_init' into eddie/fix1427
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/sat/sat.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc index 430bba1e8..93a4f225e 100644 --- a/passes/sat/sat.cc +++ b/passes/sat/sat.cc @@ -265,15 +265,18 @@ struct SatHelper RTLIL::SigSpec rhs = it.second->attributes.at("\\init"); log_assert(lhs.size() == rhs.size()); + dict<RTLIL::SigBit,SigBit> seen_init; RTLIL::SigSpec removed_bits; for (int i = 0; i < lhs.size(); i++) { RTLIL::SigSpec bit = lhs.extract(i, 1); - if (rhs[i] == State::Sx || !satgen.initial_state.check_all(bit)) { + if (rhs[i] == State::Sx || !satgen.initial_state.check_all(bit) || seen_init.at(bit, rhs[i]) != rhs[i]) { removed_bits.append(bit); lhs.remove(i, 1); rhs.remove(i, 1); i--; } + else + seen_init[bit] = rhs[i]; } if (removed_bits.size()) |