From: whitequark <whitequark@whitequark.org>
Date: Thu, 2 Jan 2020 21:06:17 +0000 (+0000)
Subject: Merge pull request #1604 from whitequark/unify-ram-naming
X-Git-Tag: working-ls180~887
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8d5920a7e61f78873b7bf49dd7e8f3a83f7adf3;p=yosys.git

Merge pull request #1604 from whitequark/unify-ram-naming

Harmonize BRAM/LUTRAM descriptions across all of Yosys
---

f8d5920a7e61f78873b7bf49dd7e8f3a83f7adf3
diff --cc techlibs/anlogic/synth_anlogic.cc
index 57b8a2b26,3a1992588..aaa6bda4a
--- a/techlibs/anlogic/synth_anlogic.cc
+++ b/techlibs/anlogic/synth_anlogic.cc
@@@ -58,8 -58,11 +58,11 @@@ struct SynthAnlogicPass : public Script
  		log("        do not flatten design before synthesis\n");
  		log("\n");
  		log("    -retime\n");
 -		log("        run 'abc' with -dff option\n");
 +		log("        run 'abc' with '-dff -D 1' options\n");
  		log("\n");
+ 		log("    -nolutram\n");
+ 		log("        do not use EG_LOGIC_DRAM16X4 cells in output netlist\n");
+ 		log("\n");
  		log("\n");
  		log("The following commands are executed by this synthesis command:\n");
  		help_script();
@@@ -162,9 -170,13 +170,13 @@@
  			run("opt -fast -mux_undef -undriven -fine");
  			run("memory_map");
  			run("opt -undriven -fine");
+ 		}
+ 
+ 		if (check_label("map_gates"))
+ 		{
  			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 --cc techlibs/efinix/synth_efinix.cc
index 6fe0182ac,3e5274385..0efd91708
--- a/techlibs/efinix/synth_efinix.cc
+++ b/techlibs/efinix/synth_efinix.cc
@@@ -58,8 -58,11 +58,11 @@@ struct SynthEfinixPass : public ScriptP
  		log("        do not flatten design before synthesis\n");
  		log("\n");
  		log("    -retime\n");
 -		log("        run 'abc' with -dff option\n");
 +		log("        run 'abc' with '-dff -D 1' options\n");
  		log("\n");
+ 		log("    -nobram\n");
+ 		log("        do not use EFX_RAM_5K cells in output netlist\n");
+ 		log("\n");
  		log("\n");
  		log("The following commands are executed by this synthesis command:\n");
  		help_script();
@@@ -162,9 -170,13 +170,13 @@@
  			run("opt -fast -mux_undef -undriven -fine");
  			run("memory_map");
  			run("opt -undriven -fine");
+ 		}
+ 
+ 		if (check_label("map_gates"))
+ 		{
  			run("techmap -map +/techmap.v -map +/efinix/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"))