mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-10-31 03:32:29 +00:00 
			
		
		
		
	Revert "synth_* with -retime option now calls abc with -D 1 as well"
This reverts commit 9a6da9a79a.
			
			
This commit is contained in:
		
							parent
							
								
									0642baabbc
								
							
						
					
					
						commit
						6008bb7002
					
				
					 11 changed files with 15 additions and 15 deletions
				
			
		|  | @ -152,12 +152,12 @@ struct SynthAchronixPass : public ScriptPass { | ||||||
|         run("clean -purge"); |         run("clean -purge"); | ||||||
|         run("setundef -undriven -zero"); |         run("setundef -undriven -zero"); | ||||||
|         if (retime || help_mode) |         if (retime || help_mode) | ||||||
|           run("abc -markgroups -dff -D 1", "(only if -retime)"); |           run("abc -markgroups -dff", "(only if -retime)"); | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|     if (check_label("map_luts")) |     if (check_label("map_luts")) | ||||||
|       { |       { | ||||||
|         run("abc -lut 4" + string(retime ? " -dff -D 1" : "")); |         run("abc -lut 4" + string(retime ? " -dff" : "")); | ||||||
|         run("clean"); |         run("clean"); | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -164,7 +164,7 @@ struct SynthAnlogicPass : public ScriptPass | ||||||
| 			run("opt -undriven -fine"); | 			run("opt -undriven -fine"); | ||||||
| 			run("techmap -map +/techmap.v -map +/anlogic/arith_map.v"); | 			run("techmap -map +/techmap.v -map +/anlogic/arith_map.v"); | ||||||
| 			if (retime || help_mode) | 			if (retime || help_mode) | ||||||
| 				run("abc -dff -D 1", "(only if -retime)"); | 				run("abc -dff", "(only if -retime)"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		if (check_label("map_ffs")) | 		if (check_label("map_ffs")) | ||||||
|  |  | ||||||
|  | @ -161,7 +161,7 @@ struct SynthCoolrunner2Pass : public ScriptPass | ||||||
| 
 | 
 | ||||||
| 		if (check_label("map_pla")) | 		if (check_label("map_pla")) | ||||||
| 		{ | 		{ | ||||||
| 			run("abc -sop -I 40 -P 56" + string(retime ? " -dff -D 1" : "")); | 			run("abc -sop -I 40 -P 56"); | ||||||
| 			run("clean"); | 			run("clean"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -158,7 +158,7 @@ struct SynthEasicPass : public ScriptPass | ||||||
| 			run("techmap"); | 			run("techmap"); | ||||||
| 			run("opt -fast"); | 			run("opt -fast"); | ||||||
| 			if (retime || help_mode) { | 			if (retime || help_mode) { | ||||||
| 				run("abc -dff -D 1", " (only if -retime)"); | 				run("abc -dff", " (only if -retime)"); | ||||||
| 				run("opt_clean", "(only if -retime)"); | 				run("opt_clean", "(only if -retime)"); | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
|  | @ -242,7 +242,7 @@ struct SynthEcp5Pass : public ScriptPass | ||||||
| 			else | 			else | ||||||
| 				run("techmap -map +/techmap.v -map +/ecp5/arith_map.v"); | 				run("techmap -map +/techmap.v -map +/ecp5/arith_map.v"); | ||||||
| 			if (retime || help_mode) | 			if (retime || help_mode) | ||||||
| 				run("abc -dff -D 1", "(only if -retime)"); | 				run("abc -dff", "(only if -retime)"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		if (check_label("map_ffs")) | 		if (check_label("map_ffs")) | ||||||
|  |  | ||||||
|  | @ -163,7 +163,7 @@ struct SynthGowinPass : public ScriptPass | ||||||
| 			run("splitnets -ports"); | 			run("splitnets -ports"); | ||||||
| 			run("setundef -undriven -zero"); | 			run("setundef -undriven -zero"); | ||||||
| 			if (retime || help_mode) | 			if (retime || help_mode) | ||||||
| 				run("abc -dff -D 1", "(only if -retime)"); | 				run("abc -dff", "(only if -retime)"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		if (check_label("map_luts")) | 		if (check_label("map_luts")) | ||||||
|  |  | ||||||
|  | @ -165,7 +165,7 @@ struct SynthGreenPAK4Pass : public ScriptPass | ||||||
| 			run("dfflibmap -prepare -liberty +/greenpak4/gp_dff.lib"); | 			run("dfflibmap -prepare -liberty +/greenpak4/gp_dff.lib"); | ||||||
| 			run("opt -fast"); | 			run("opt -fast"); | ||||||
| 			if (retime || help_mode) | 			if (retime || help_mode) | ||||||
| 				run("abc -dff -D 1", "(only if -retime)"); | 				run("abc -dff", "(only if -retime)"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		if (check_label("map_luts")) | 		if (check_label("map_luts")) | ||||||
|  |  | ||||||
|  | @ -274,7 +274,7 @@ struct SynthIce40Pass : public ScriptPass | ||||||
| 			else | 			else | ||||||
| 				run("techmap -map +/techmap.v -map +/ice40/arith_map.v"); | 				run("techmap -map +/techmap.v -map +/ice40/arith_map.v"); | ||||||
| 			if (retime || help_mode) | 			if (retime || help_mode) | ||||||
| 				run("abc -dff -D 1", "(only if -retime)"); | 				run("abc -dff", "(only if -retime)"); | ||||||
| 			run("ice40_opt"); | 			run("ice40_opt"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -210,15 +210,15 @@ struct SynthIntelPass : public ScriptPass { | ||||||
|         run("clean -purge"); |         run("clean -purge"); | ||||||
|         run("setundef -undriven -zero"); |         run("setundef -undriven -zero"); | ||||||
|         if (retime || help_mode) |         if (retime || help_mode) | ||||||
|           run("abc -markgroups -dff -D 1", "(only if -retime)"); |           run("abc -markgroups -dff", "(only if -retime)"); | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|     if (check_label("map_luts")) |     if (check_label("map_luts")) | ||||||
|       { |       { | ||||||
|         if(family_opt=="a10gx" || family_opt=="cyclonev") |         if(family_opt=="a10gx" || family_opt=="cyclonev") | ||||||
|           run("abc -luts 2:2,3,6:5" + string(retime ? " -dff -D 1" : "")); |           run("abc -luts 2:2,3,6:5" + string(retime ? " -dff" : "")); | ||||||
|         else |         else | ||||||
|           run("abc -lut 4" + string(retime ? " -dff -D 1" : "")); |           run("abc -lut 4" + string(retime ? " -dff" : "")); | ||||||
|         run("clean"); |         run("clean"); | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -181,7 +181,7 @@ struct SynthSf2Pass : public ScriptPass | ||||||
| 			run("opt -undriven -fine"); | 			run("opt -undriven -fine"); | ||||||
| 			run("techmap -map +/techmap.v -map +/sf2/arith_map.v"); | 			run("techmap -map +/techmap.v -map +/sf2/arith_map.v"); | ||||||
| 			if (retime || help_mode) | 			if (retime || help_mode) | ||||||
| 				run("abc -dff -D 1", "(only if -retime)"); | 				run("abc -dff", "(only if -retime)"); | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		if (check_label("map_ffs")) | 		if (check_label("map_ffs")) | ||||||
|  |  | ||||||
|  | @ -115,7 +115,7 @@ struct SynthXilinxPass : public Pass | ||||||
| 		log("\n"); | 		log("\n"); | ||||||
| 		log("    map_luts:\n"); | 		log("    map_luts:\n"); | ||||||
| 		log("        techmap -map +/techmap.v -map +/xilinx/ff_map.v t:$_DFF_?N?\n"); | 		log("        techmap -map +/techmap.v -map +/xilinx/ff_map.v t:$_DFF_?N?\n"); | ||||||
| 		log("        abc -luts 2:2,3,6:5,10,20 [-dff -D 1]\n"); | 		log("        abc -luts 2:2,3,6:5,10,20 [-dff]\n"); | ||||||
| 		log("        clean\n"); | 		log("        clean\n"); | ||||||
| 		log("        techmap -map +/xilinx/lut_map.v -map +/xilinx/ff_map.v"); | 		log("        techmap -map +/xilinx/lut_map.v -map +/xilinx/ff_map.v"); | ||||||
| 		log("\n"); | 		log("\n"); | ||||||
|  | @ -269,7 +269,7 @@ struct SynthXilinxPass : public Pass | ||||||
| 		if (check_label(active, run_from, run_to, "map_luts")) | 		if (check_label(active, run_from, run_to, "map_luts")) | ||||||
| 		{ | 		{ | ||||||
| 			Pass::call(design, "techmap -map +/techmap.v -map +/xilinx/ff_map.v t:$_DFF_?N?"); | 			Pass::call(design, "techmap -map +/techmap.v -map +/xilinx/ff_map.v t:$_DFF_?N?"); | ||||||
| 			Pass::call(design, "abc -luts 2:2,3,6:5,10,20" + string(retime ? " -dff -D 1" : "")); | 			Pass::call(design, "abc -luts 2:2,3,6:5,10,20" + string(retime ? " -dff" : "")); | ||||||
| 			Pass::call(design, "clean"); | 			Pass::call(design, "clean"); | ||||||
| 			Pass::call(design, "techmap -map +/xilinx/lut_map.v -map +/xilinx/ff_map.v"); | 			Pass::call(design, "techmap -map +/xilinx/lut_map.v -map +/xilinx/ff_map.v"); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue