Add check before flatten in synth_*.

techlibs/achronix/synth_achronix.cc

@@ -129,6 +129,7 @@ struct SynthAchronixPass : public ScriptPass {
     if (flatten && check_label("flatten", "(unless -noflatten)"))
       {
         run("proc");
+        run("check");
         run("flatten");
         run("tribuf -logic");
         run("deminout");

techlibs/analogdevices/synth_analogdevices.cc

@@ -277,8 +277,10 @@ struct SynthAnalogDevicesPass : public ScriptPass
 
 		if (check_label("prepare")) {
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(with '-flatten')");
+			}
 			if (active_design)
 				active_design->scratchpad_unset("tribuf.added_something");
 			run("tribuf -logic");
@@ -447,8 +449,10 @@ struct SynthAnalogDevicesPass : public ScriptPass
 
 		if (check_label("map_luts")) {
 			run("opt_expr -mux_undef -noclkinv");
-			if (flatten_before_abc)
+			if (flatten_before_abc) {
+				run("check");
 				run("flatten");
+			}
 			if (help_mode)
 				run("abc -luts 2:2,3,6:5[,10,20] [-dff] [-D 1]", "(option for '-nowidelut', '-dff', '-retime')");
 			else if (abc9) {

techlibs/anlogic/synth_anlogic.cc

@@ -156,6 +156,7 @@ struct SynthAnlogicPass : public ScriptPass
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
 		{
 			run("proc");
+			run("check");
 			run("flatten");
 			run("tribuf -logic");
 			run("deminout");

techlibs/common/synth.cc

@@ -277,9 +277,10 @@ struct SynthPass : public ScriptPass {
 
 		if (check_label("coarse")) {
 			run("proc");
-			run("check");
+			if (flatten || help_mode) {
-			if (flatten || help_mode)
+				run("check");
 				run("flatten", "  (if -flatten)");
+			}
 			run("opt_expr");
 			run("opt_clean");
 			run("check");

techlibs/coolrunner2/synth_coolrunner2.cc

@@ -132,6 +132,7 @@ struct SynthCoolrunner2Pass : public ScriptPass
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
 		{
 			run("proc");
+			run("check");
 			run("flatten");
 			run("tribuf -logic");
 		}

techlibs/easic/synth_easic.cc

@@ -142,6 +142,7 @@ struct SynthEasicPass : public ScriptPass
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
 		{
 			run("proc");
+			run("check");
 			run("flatten");
 		}
 

techlibs/efinix/synth_efinix.cc

@@ -148,6 +148,7 @@ struct SynthEfinixPass : public ScriptPass
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
 		{
 			run("proc");
+			run("check");
 			run("flatten");
 			run("tribuf -logic");
 			run("deminout");

techlibs/fabulous/synth_fabulous.cc

@@ -286,6 +286,7 @@ struct SynthPass : public ScriptPass
 		if (check_label("flatten", "(unless -noflatten)"))
 		{
 			if (flatten) {
+				run("check");
 				run("flatten");
 				run("tribuf -logic");
 				run("deminout");

techlibs/gatemate/synth_gatemate.cc

@@ -210,6 +210,7 @@ struct SynthGateMatePass : public ScriptPass
 		{
 			run("proc");
 			if (!noflatten) {
+				run("check");
 				run("flatten");
 			}
 			run("tribuf -logic");

techlibs/gowin/synth_gowin.cc

@@ -265,8 +265,10 @@ struct SynthGowinPass : public ScriptPass
 		if (check_label("coarse"))
 		{
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(unless -noflatten)");
+			}
 			run("tribuf -logic");
 			run("deminout");
 			run("opt_expr");

techlibs/greenpak4/synth_greenpak4.cc

@@ -144,6 +144,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
 		{
 			run("proc");
+			run("check");
 			run("flatten");
 			run("tribuf -logic");
 		}

techlibs/ice40/synth_ice40.cc

@@ -309,6 +309,7 @@ struct SynthIce40Pass : public ScriptPass
 		if (check_label("flatten", "(unless -noflatten)"))
 		{
 			if (flatten) {
+				run("check");
 				run("flatten");
 				run("tribuf -logic");
 				run("deminout");

techlibs/intel/synth_intel.cc

@@ -198,9 +198,11 @@ struct SynthIntelPass : public ScriptPass {
 
 		if (check_label("coarse")) {
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(skip if -noflatten)");
-                        run("tribuf -logic");
+			}
+			run("tribuf -logic");
 			run("deminout");
 			run("opt_expr");
 			run("opt_clean");

techlibs/intel_alm/synth_intel_alm.cc

@@ -184,8 +184,10 @@ struct SynthIntelALMPass : public ScriptPass {
 
 		if (check_label("coarse")) {
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(skip if -noflatten)");
+			}
 			run("tribuf -logic");
 			run("deminout");
 			run("opt_expr");

techlibs/lattice/synth_lattice.cc

@@ -402,8 +402,10 @@ struct SynthLatticePass : public ScriptPass
 		if (check_label("coarse"))
 		{
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten");
+			}
 			run("tribuf -logic");
 			run("deminout");
 			run("opt_expr");

techlibs/microchip/synth_microchip.cc

@@ -267,8 +267,10 @@ struct SynthMicrochipPass : public ScriptPass {
 
 		if (check_label("prepare")) {
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(with '-flatten')");
+			}
 			if (active_design)
 				active_design->scratchpad_unset("tribuf.added_something");
 			run("tribuf -logic");

techlibs/nanoxplore/synth_nanoxplore.cc

@@ -250,8 +250,10 @@ struct SynthNanoXplorePass : public ScriptPass
 		if (check_label("coarse"))
 		{
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(skip if -noflatten)");
+			}
 			run("tribuf -logic");
 			run("deminout");
 			run("opt_expr");

techlibs/quicklogic/synth_quicklogic.cc

@@ -212,8 +212,10 @@ struct SynthQuickLogicPass : public ScriptPass {
 
 		if (check_label("prepare")) {
 			run("proc");
-			if (flatten)
+			if (flatten) {
+				run("check");
 				run("flatten", "(unless -noflatten)");
+			}
 			if (help_mode || family == "pp3") {
 				run("tribuf -logic", "                   (for pp3)");
 			}

techlibs/sf2/synth_sf2.cc

@@ -172,6 +172,7 @@ struct SynthSf2Pass : public ScriptPass
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
 		{
 			run("proc");
+			run("check");
 			run("flatten");
 			run("tribuf -logic");
 			run("deminout");

techlibs/xilinx/synth_xilinx.cc

@@ -355,8 +355,10 @@ struct SynthXilinxPass : public ScriptPass
 
 		if (check_label("prepare")) {
 			run("proc");
-			if (flatten || help_mode)
+			if (flatten || help_mode) {
+				run("check");
 				run("flatten", "(with '-flatten')");
+			}
 			if (active_design)
 				active_design->scratchpad_unset("tribuf.added_something");
 			run("tribuf -logic");
@@ -637,8 +639,10 @@ struct SynthXilinxPass : public ScriptPass
 
 		if (check_label("map_luts")) {
 			run("opt_expr -mux_undef -noclkinv");
-			if (flatten_before_abc)
+			if (flatten_before_abc) {
+				run("check");
 				run("flatten");
+			}
 			if (help_mode)
 				run("abc -luts 2:2,3,6:5[,10,20] [-dff] [-D 1]", "(option for '-nowidelut', '-dff', '-retime')");
 			else if (abc9) {