synth_{ice40,ecp5}: more sensible pass label naming.

diff --git a/techlibs/ecp5/synth_ecp5.cc b/techlibs/ecp5/synth_ecp5.cc
index 9f409ca512c961245becbf96f137eb74c6229bed..3d189a9f1cc568ba3c8b1f6b30c01a80fe048dd3 100644 (file)
--- a/techlibs/ecp5/synth_ecp5.cc
+++ b/techlibs/ecp5/synth_ecp5.cc
@@ -231,23 +231,27 @@ struct SynthEcp5Pass : public ScriptPass
                        run("synth -run coarse");
                }
 
-               if (!nobram && check_label("bram", "(skip if -nobram)"))
+               if (!nobram && check_label("map_bram", "(skip if -nobram)"))
                {
                        run("memory_bram -rules +/ecp5/bram.txt");
                        run("techmap -map +/ecp5/brams_map.v");
                }
 
-               if (!nodram && check_label("dram", "(skip if -nodram)"))
+               if (!nodram && check_label("map_dram", "(skip if -nodram)"))
                {
                        run("memory_bram -rules +/ecp5/dram.txt");
                        run("techmap -map +/ecp5/drams_map.v");
                }
 
-               if (check_label("fine"))
+               if (check_label("map_ffram"))
                {
                        run("opt -fast -mux_undef -undriven -fine");
                        run("memory_map");
                        run("opt -undriven -fine");
+               }
+
+               if (check_label("map_gates"))
+               {
                        if (noccu2)
                                run("techmap");
                        else

diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index 0474e76e9273128c895157a686bcc1916df5d990..1a20f704923970a7490b6f9c247f9b875d6b9546 100644 (file)
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -275,14 +275,14 @@ struct SynthIce40Pass : public ScriptPass
                        run("opt_clean");
                }
 
-               if (!nobram && check_label("bram", "(skip if -nobram)"))
+               if (!nobram && check_label("map_bram", "(skip if -nobram)"))
                {
                        run("memory_bram -rules +/ice40/brams.txt");
                        run("techmap -map +/ice40/brams_map.v");
                        run("ice40_braminit");
                }
 
-               if (check_label("map"))
+               if (check_label("map_ffram"))
                {
                        run("opt -fast -mux_undef -undriven -fine");
                        run("memory_map");