commit 8ad8d06f9e4965a991523a4466f01eeba4cc7e16
author Maciej Kurc <mkurc@antmicro.com> Tue Jun 07 11:43:12 2022 +0200
committer Maciej Kurc <mkurc@antmicro.com> Wed Jun 22 12:45:11 2022 +0200
tree e02a4d9baa3d10eaceb32b137937aa9ed6a696aa
parent aa99327787882c45b146598b5b6152bc50423475

Enabled inference of sync. reset DFFs in Yosys flow

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

ql-qlf-plugin/synth_quicklogic.cc

diff --git a/ql-qlf-plugin/synth_quicklogic.cc b/ql-qlf-plugin/synth_quicklogic.cc
index 9829ebc..4c9e6fc 100644
--- a/ql-qlf-plugin/synth_quicklogic.cc
+++ b/ql-qlf-plugin/synth_quicklogic.cc
@@ -121,17 +121,18 @@
 
         size_t argidx;
         for (argidx = 1; argidx < args.size(); argidx++) {
-			if (args[argidx] == "-run" && argidx+1 < args.size()) {
-				size_t pos = args[argidx+1].find(':');
-				if (pos == std::string::npos) {
-					run_from = args[++argidx];
-					run_to = args[argidx];
-				} else {
-					run_from = args[++argidx].substr(0, pos);
-					run_to = args[argidx].substr(pos+1);
-				}
-				continue;
-			}            if (args[argidx] == "-top" && argidx + 1 < args.size()) {
+            if (args[argidx] == "-run" && argidx + 1 < args.size()) {
+                size_t pos = args[argidx + 1].find(':');
+                if (pos == std::string::npos) {
+                    run_from = args[++argidx];
+                    run_to = args[argidx];
+                } else {
+                    run_from = args[++argidx].substr(0, pos);
+                    run_to = args[argidx].substr(pos + 1);
+                }
+                continue;
+            }
+            if (args[argidx] == "-top" && argidx + 1 < args.size()) {
                 top_opt = "-top " + args[++argidx];
                 continue;
             }
@@ -231,10 +232,7 @@
         std::string noDFFArgs;
         if (family == "qlf_k4n8") {
             noDFFArgs = " -nodffe -nosdff";
-        } else if (family == "qlf_k6n10f") {
-            noDFFArgs = " -nosdff";
         }
-
         if (check_label("coarse")) {
             run("check");
             run("opt -nodffe -nosdff");
@@ -365,8 +363,7 @@
                 //    $_DLATCH_SRPPP_ 0");
             } else if (family == "qlf_k6n10f") {
                 run("shregmap -minlen 8 -maxlen 20");
-                run("dfflegalize -cell $_DFF_?_ 0 -cell $_DFF_???_ 0 -cell $_DFFE_????_ 0 -cell $_DFFSR_???_ 0 -cell $_DFFSRE_????_ 0 -cell "
-                    "$_DLATCHSR_PPP_ 0");
+                run("dfflegalize -cell $_DFF_?_ 0 -cell $_DFFSRE_?NNP_ 0 -cell $_SDFFE_?N?P_ 0 -cell $_DLATCH_?_ 0 -cell $_DLATCHSR_?NN_ 0");
             } else if (family == "pp3") {
                 run("dfflegalize -cell $_DFFSRE_PPPP_ 0 -cell $_DLATCH_?_ x");
                 run("techmap -map +/quicklogic/" + family + "/cells_map.v");