Revert "Revert "synth_* with -retime option now calls abc with -D 1 as well""

This reverts commit 6008bb7002f874e5c748eaa2050e7b6c17b32745.

diff --git a/techlibs/achronix/synth_achronix.cc b/techlibs/achronix/synth_achronix.cc
index 626860d9c1782697f4214288fe00292220c3a4ec..3dbf209115995f70deaa1bf8efcd33d40d6a7c0d 100755 (executable)
--- a/techlibs/achronix/synth_achronix.cc
+++ b/techlibs/achronix/synth_achronix.cc
@@ -152,12 +152,12 @@ struct SynthAchronixPass : public ScriptPass {
         run("clean -purge");
         run("setundef -undriven -zero");
         if (retime || help_mode)
-          run("abc -markgroups -dff", "(only if -retime)");
+          run("abc -markgroups -dff -D 1", "(only if -retime)");
       }
 
     if (check_label("map_luts"))
       {
-        run("abc -lut 4" + string(retime ? " -dff" : ""));
+        run("abc -lut 4" + string(retime ? " -dff -D 1" : ""));
         run("clean");
       }
 

diff --git a/techlibs/anlogic/synth_anlogic.cc b/techlibs/anlogic/synth_anlogic.cc
index b87fc8566e2fa815ad4e90784e06686b38e54005..310c9c76c7788ea79e847b4de3ccf58de2d2d20c 100644 (file)
--- a/techlibs/anlogic/synth_anlogic.cc
+++ b/techlibs/anlogic/synth_anlogic.cc
@@ -164,7 +164,7 @@ struct SynthAnlogicPass : public ScriptPass
                        run("opt -undriven -fine");
                        run("techmap -map +/techmap.v -map +/anlogic/arith_map.v");
                        if (retime || help_mode)
-                               run("abc -dff", "(only if -retime)");
+                               run("abc -dff -D 1", "(only if -retime)");
                }
 
                if (check_label("map_ffs"))

diff --git a/techlibs/coolrunner2/synth_coolrunner2.cc b/techlibs/coolrunner2/synth_coolrunner2.cc
index 014c68622f1304081d7cf4f3ace4de37a5e4f4cc..d73241fa89cc0a974baffe01e8ced9816613fc55 100644 (file)
--- a/techlibs/coolrunner2/synth_coolrunner2.cc
+++ b/techlibs/coolrunner2/synth_coolrunner2.cc
@@ -161,7 +161,7 @@ struct SynthCoolrunner2Pass : public ScriptPass
 
                if (check_label("map_pla"))
                {
-                       run("abc -sop -I 40 -P 56");
+                       run("abc -sop -I 40 -P 56" + string(retime ? " -dff -D 1" : ""));
                        run("clean");
                }
 

diff --git a/techlibs/easic/synth_easic.cc b/techlibs/easic/synth_easic.cc
index dd9e3dab7e3eeb9fb28f66902fc892f1871800ce..7bacc78905e3ea0413f04edff068f154fc6f6d6e 100644 (file)
--- a/techlibs/easic/synth_easic.cc
+++ b/techlibs/easic/synth_easic.cc
@@ -158,7 +158,7 @@ struct SynthEasicPass : public ScriptPass
                        run("techmap");
                        run("opt -fast");
                        if (retime || help_mode) {
-                               run("abc -dff", " (only if -retime)");
+                               run("abc -dff -D 1", " (only if -retime)");
                                run("opt_clean", "(only if -retime)");
                        }
                }

diff --git a/techlibs/ecp5/synth_ecp5.cc b/techlibs/ecp5/synth_ecp5.cc
index a0ea6d1f98521bbfa0513470b26e16b3c4bcdeed..24e300fa899a172aeb86716922e2ccd2f780c232 100644 (file)
--- a/techlibs/ecp5/synth_ecp5.cc
+++ b/techlibs/ecp5/synth_ecp5.cc
@@ -290,7 +290,7 @@ struct SynthEcp5Pass : public ScriptPass
                        else
                                run("techmap -map +/techmap.v -map +/ecp5/arith_map.v");
                        if (retime || help_mode)
-                               run("abc -dff", "(only if -retime)");
+                               run("abc -dff -D 1", "(only if -retime)");
                }
 
                if (check_label("map_ffs"))

diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 6cf058f292a8ea0f22b06fc6c55e7f113e96d241..5acc096a33cae5d8ff77e6bbbdfb3a8ad1021377 100644 (file)
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -209,7 +209,7 @@ struct SynthGowinPass : public ScriptPass
                        run("techmap -map +/techmap.v -map +/gowin/arith_map.v");
                        run("techmap -map +/techmap.v");
                        if (retime || help_mode)
-                               run("abc -dff", "(only if -retime)");
+                               run("abc -dff -D 1", "(only if -retime)");
                        run("splitnets");
                }
 

diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc
index eeb001b4640740cfb05a22d9dcfe2f6953611886..3222be2e3de3864db7d0e40182fd56b768434b14 100644 (file)
--- a/techlibs/greenpak4/synth_greenpak4.cc
+++ b/techlibs/greenpak4/synth_greenpak4.cc
@@ -165,7 +165,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
                        run("dfflibmap -prepare -liberty +/greenpak4/gp_dff.lib");
                        run("opt -fast");
                        if (retime || help_mode)
-                               run("abc -dff", "(only if -retime)");
+                               run("abc -dff -D 1", "(only if -retime)");
                }
 
                if (check_label("map_luts"))

diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index ed7a16c088d3751230e2c1ff3b00b2f262b52b3e..fe12281651d653fbc3e69c9cb805b4c4a1db96fb 100644 (file)
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -316,7 +316,7 @@ struct SynthIce40Pass : public ScriptPass
                                run("techmap -map +/techmap.v -map +/ice40/arith_map.v");
                        }
                        if (retime || help_mode)
-                               run(abc + " -dff", "(only if -retime)");
+                               run(abc + " -dff -D 1", "(only if -retime)");
                        run("ice40_opt");
                }
 

diff --git a/techlibs/intel/synth_intel.cc b/techlibs/intel/synth_intel.cc
index c8c690e45a930433b3241779afdaa779f754e420..f033f3acceb69fcf5941c9cf32e620ae1fae4ab7 100644 (file)
--- a/techlibs/intel/synth_intel.cc
+++ b/techlibs/intel/synth_intel.cc
@@ -210,7 +210,7 @@ struct SynthIntelPass : public ScriptPass {
                        run("clean -purge");
                        run("setundef -undriven -zero");
                        if (retime || help_mode)
-                               run("abc -markgroups -dff", "(only if -retime)");
+                               run("abc -markgroups -dff -D 1", "(only if -retime)");
                }
 
                if (check_label("map_luts")) {

diff --git a/techlibs/sf2/synth_sf2.cc b/techlibs/sf2/synth_sf2.cc
index 0924df7a67780d78f1d96ec50319302a43df78c9..3c5a58b4c76c3f4c5f4f6d13f44f8ee69c11e502 100644 (file)
--- a/techlibs/sf2/synth_sf2.cc
+++ b/techlibs/sf2/synth_sf2.cc
@@ -181,7 +181,7 @@ struct SynthSf2Pass : public ScriptPass
                        run("opt -undriven -fine");
                        run("techmap -map +/techmap.v -map +/sf2/arith_map.v");
                        if (retime || help_mode)
-                               run("abc -dff", "(only if -retime)");
+                               run("abc -dff -D 1", "(only if -retime)");
                }
 
                if (check_label("map_ffs"))

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index a1904691198f6227b120d6ad7646be1e33c08c0f..afe4d483b88c6f842d78a0275f1a9dfb1f1c7dd2 100644 (file)
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -555,9 +555,9 @@ struct SynthXilinxPass : public ScriptPass
                        }
                        else {
                                if (nowidelut)
-                                       run("abc -luts 2:2,3,6:5" + string(retime ? " -dff" : ""));
+                                       run("abc -luts 2:2,3,6:5" + string(retime ? " -dff -D 1" : ""));
                                else
-                                       run("abc -luts 2:2,3,6:5,10,20" + string(retime ? " -dff" : ""));
+                                       run("abc -luts 2:2,3,6:5,10,20" + string(retime ? " -dff -D 1" : ""));
                        }
                        run("clean");