diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-06-12 09:01:15 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-06-12 09:01:15 -0700 |
| commit | 86efe9a616b70ffa64bb344d83aa42956e5fd470 (patch) | |
| tree | b58c28f69afa9ea10c0d251282286b9beb1e61d7 /passes/opt | |
| parent | 513c962a71b7ff08c037e8590d26b9b09603dfb4 (diff) | |
| download | yosys-86efe9a616b70ffa64bb344d83aa42956e5fd470.tar.gz yosys-86efe9a616b70ffa64bb344d83aa42956e5fd470.tar.bz2 yosys-86efe9a616b70ffa64bb344d83aa42956e5fd470.zip | |
Revert "Merge remote-tracking branch 'origin/eddie/muxpack' into xc7mux"
This reverts commit 2223ca91b0cc559bb876e8e97372a8f77da1603e, reversing
changes made to eaee250a6e63e58dfef63fa30c4120db78223e24.
Diffstat (limited to 'passes/opt')
| -rw-r--r-- | passes/opt/muxpack.cc | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/passes/opt/muxpack.cc b/passes/opt/muxpack.cc index 8c4db4e4d..f9e5c8f09 100644 --- a/passes/opt/muxpack.cc +++ b/passes/opt/muxpack.cc @@ -94,27 +94,23 @@ struct MuxpackWorker { log_debug("Considering %s (%s)\n", log_id(cell), log_id(cell->type)); - SigSpec a_sig = cell->getPort("\\A"); - if (cell->type == "$mux") { - SigSpec b_sig = cell->getPort("\\B"); - if (sig_chain_prev.count(a_sig) + sig_chain_prev.count(b_sig) != 1) - goto start_cell; - - if (!sig_chain_prev.count(a_sig)) - a_sig = b_sig; - } - else if (cell->type == "$pmux") { - if (!sig_chain_prev.count(a_sig)) + SigSpec next_sig = cell->getPort("\\A"); + if (sig_chain_prev.count(next_sig) == 0) { + if (cell->type == "$mux") { + next_sig = cell->getPort("\\B"); + if (sig_chain_prev.count(next_sig) == 0) + goto start_cell; + } + else goto start_cell; } - else log_abort(); { - for (auto bit : a_sig.bits()) + for (auto bit : next_sig.bits()) if (sigbit_with_non_chain_users.count(bit)) goto start_cell; - Cell *c1 = sig_chain_prev.at(a_sig); + Cell *c1 = sig_chain_prev.at(next_sig); Cell *c2 = cell; if (c1->getParam("\\WIDTH") != c2->getParam("\\WIDTH")) |