diff options
| author | Jim Lawson <ucbjrl@berkeley.edu> | 2019-05-01 16:13:11 -0700 |
|---|---|---|
| committer | Jim Lawson <ucbjrl@berkeley.edu> | 2019-05-01 16:13:11 -0700 |
| commit | 6c361bb19877db8d2a0b6ef79fb1a747276e7b68 (patch) | |
| tree | 55321f6576c1a7316f0836d54cf25c1f227100d1 /passes | |
| parent | 58650ffe876d1caedd8ffc9b0207f5cf75eef97b (diff) | |
| parent | 7a0af004a0a4dc3831997f0845d40fc3ea514281 (diff) | |
| download | yosys-6c361bb19877db8d2a0b6ef79fb1a747276e7b68.tar.gz yosys-6c361bb19877db8d2a0b6ef79fb1a747276e7b68.tar.bz2 yosys-6c361bb19877db8d2a0b6ef79fb1a747276e7b68.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/cmds/qwp.cc | 2 | ||||
| -rw-r--r-- | passes/opt/wreduce.cc | 2 | ||||
| -rw-r--r-- | passes/sat/sat.cc | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/passes/cmds/qwp.cc b/passes/cmds/qwp.cc index 1c64a7b77..adbe89e31 100644 --- a/passes/cmds/qwp.cc +++ b/passes/cmds/qwp.cc @@ -291,7 +291,7 @@ struct QwpWorker // gaussian elimination for (int i = 0; i < N; i++) { - if (config.verbose && ((i+1) % (N/15)) == 0) + if (config.verbose && N > 15 && ((i+1) % (N/15)) == 0) log("> Solved %d%%: %d/%d\n", (100*(i+1))/N, i+1, N); // find best row diff --git a/passes/opt/wreduce.cc b/passes/opt/wreduce.cc index 68e077cf9..41de8aad1 100644 --- a/passes/opt/wreduce.cc +++ b/passes/opt/wreduce.cc @@ -180,6 +180,8 @@ struct WreduceWorker } auto info = mi.query(sig_q[i]); + if (info == nullptr) + return; if (!info->is_output && GetSize(info->ports) == 1 && !keep_bits.count(mi.sigmap(sig_q[i]))) { remove_init_bits.insert(sig_q[i]); sig_d.remove(i); diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc index 695a03e15..cbba738f0 100644 --- a/passes/sat/sat.cc +++ b/passes/sat/sat.cc @@ -1169,6 +1169,7 @@ struct SatPass : public Pass { if (args[argidx] == "-tempinduct-def") { tempinduct = true; tempinduct_def = true; + enable_undef = true; continue; } if (args[argidx] == "-tempinduct-baseonly") { |