xilinx/ice40/ecp5: zinit requires selected wires, so select them all

diff --git a/techlibs/ecp5/synth_ecp5.cc b/techlibs/ecp5/synth_ecp5.cc
index 3e475baaba80275fd6c51d9455f908d73e9b51c0..0e49ef01a1e6822d20ab72d6dee8df540b8c8f49 100644 (file)
--- a/techlibs/ecp5/synth_ecp5.cc
+++ b/techlibs/ecp5/synth_ecp5.cc
@@ -316,7 +316,7 @@ struct SynthEcp5Pass : public ScriptPass
                        if (!nodffe)
                                run("dff2dffe -direct-match $_DFF_* -direct-match $__DFFS_*");
                        if ((abc9 && dff) || help_mode)
-                               run("zinit -all t:$_DFF_?_ t:$_DFFE_??_ t:$__DFFS*", "(only if -abc9 and -dff");
+                               run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$__DFFS*", "(only if -abc9 and -dff");
                        run(stringf("techmap -D NO_LUT %s -map +/ecp5/cells_map.v", help_mode ? "[-D ASYNC_PRLD]" : (asyncprld ? "-D ASYNC_PRLD" : "")));
                        run("opt_expr -undriven -mux_undef");
                        run("simplemap");

diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index f2270dbca60e91b419e9b1cc048e0ff5220fc3e1..27850b075221b7696032f2fcaf1324fdfd023a77 100644 (file)
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -362,7 +362,7 @@ struct SynthIce40Pass : public ScriptPass
                                run("simplemap t:$dff");
                        }
                        if ((abc9 && dff) || help_mode)
-                               run("zinit -all t:$_DFF_?_ t:$_DFFE_??_ t:$__DFFS*", "(only if -abc9 and -dff");
+                               run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$__DFFS*", "(only if -abc9 and -dff");
                        run("techmap -map +/ice40/ff_map.v");
                        run("opt_expr -mux_undef");
                        run("simplemap");

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index d05715ec22d11aa6cf962446e74d3204ee4d40bf..d0de73f8335f855c7b9aef39e6627391ad11a818 100644 (file)
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -598,7 +598,7 @@ struct SynthXilinxPass : public ScriptPass
                if (check_label("map_ffs", "('-abc9' only)")) {
                        if (abc9 || help_mode) {
                                if (dff || help_mode)
-                                       run("zinit -all t:$_DFF_?_ t:$_DFFE_??_ t:$__DFFS*", "('-dff' only)");
+                                       run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$__DFFS*", "('-dff' only)");
                                run("techmap -map " + ff_map_file);
                        }
                }
@@ -608,7 +608,7 @@ struct SynthXilinxPass : public ScriptPass
                        if (flatten_before_abc)
                                run("flatten");
                        if (help_mode)
-                               run("abc -luts 2:2,3,6:5[,10,20] [-dff] [-D 1]", "(option for 'nowidelut', '-dff', '-retime')");
+                               run("abc -luts 2:2,3,6:5[,10,20] [-dff] [-D 1]", "(option for '-nowidelut', '-dff', '-retime')");
                        else if (abc9) {
                                if (lut_size != 6)
                                        log_error("'synth_xilinx -abc9' not currently supported for LUT4-based devices.\n");