From d8b6b231de03428cd52062b993f0f0a1c7f1ec3a Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Thu, 29 Nov 2018 15:38:28 -0800
Subject: [PATCH] Move required attributes to pack

---
 xc7/pack.cc | 28 +++++++++++++++++++++++++++-
 xc7/xdl.cc  | 34 +++-------------------------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/xc7/pack.cc b/xc7/pack.cc
index d2130e72..63e68b48 100644
--- a/xc7/pack.cc
+++ b/xc7/pack.cc
@@ -631,7 +631,33 @@ static void pack_special(Context *ctx)
 
     for (auto cell : sorted(ctx->cells)) {
         CellInfo *ci = cell.second;
-        if (is_sb_lfosc(ctx, ci)) {
+        if (ci->type == id_BUFGCTRL) {
+            ci->params.emplace(ctx->id("PRESELECT_I0"), "FALSE");
+            ci->params.emplace(ctx->id("CE0INV"), "CE0");
+            ci->params.emplace(ctx->id("S0INV"), "S0");
+            ci->params.emplace(ctx->id("IGNORE0INV"), "IGNORE0");
+            ci->params.emplace(ctx->id("CE1INV"), "CE1");
+            ci->params.emplace(ctx->id("S1INV"), "S1");
+            ci->params.emplace(ctx->id("IGNORE1INV"), "IGNORE1");
+        } else if (ci->type == id_MMCME2_ADV) {
+            ci->params.emplace(ctx->id("CLKINSELINV"), "CLKINSEL");
+            ci->params.emplace(ctx->id("PSENINV"), "PSEN");
+            ci->params.emplace(ctx->id("PSINCDECINV"), "PSINCDEC");
+            ci->params.emplace(ctx->id("PWRDWNINV"), "PWRDWN");
+            ci->params.emplace(ctx->id("RSTINV"), "RST");
+            ci->params.emplace(ctx->id("CLKIN2_PERIOD"), "0");
+            for (const auto& i : { "CLKOUT1_DIVIDE", "CLKOUT2_DIVIDE", "CLKOUT3_DIVIDE", "CLKOUT4_DIVIDE", "CLKOUT5_DIVIDE", "CLKOUT6_DIVIDE" }) {
+                ci->params.emplace(ctx->id(i), "1");
+            }
+            for (const auto& i : { "CLKOUT1_PHASE", "CLKOUT2_PHASE", "CLKOUT3_PHASE", "CLKOUT4_PHASE", "CLKOUT5_PHASE", "CLKOUT6_PHASE" }) {
+                ci->params.emplace(ctx->id(i), "0.0");
+            }
+            for (const auto& i : { "CLKOUT1_DUTY_CYCLE", "CLKOUT2_DUTY_CYCLE", "CLKOUT3_DUTY_CYCLE", "CLKOUT4_DUTY_CYCLE", "CLKOUT5_DUTY_CYCLE", "CLKOUT6_DUTY_CYCLE" }) {
+                ci->params.emplace(ctx->id(i), "0.5");
+            }
+            ci->params.emplace(ctx->id("REF_JITTER2"), "0.5");
+            ci->params.emplace(ctx->id("SS_MOD_PERIOD"), "10000");
+        } else if (is_sb_lfosc(ctx, ci)) {
             std::unique_ptr<CellInfo> packed =
                     create_xc7_cell(ctx, ctx->id("ICESTORM_LFOSC"), ci->name.str(ctx) + "_OSC");
             packed_cells.insert(ci->name);
diff --git a/xc7/xdl.cc b/xc7/xdl.cc
index e6878ba1..1860942f 100644
--- a/xc7/xdl.cc
+++ b/xc7/xdl.cc
@@ -195,38 +195,10 @@ void write_xdl(const Context *ctx, std::ostream &out)
                 instPtr->setConfig("DRIVE", "", "12");
                 instPtr->setConfig("SLEW", "", "SLOW");
             }
-        } else if (cell.second->type == id_BUFGCTRL) {
-            auto it = cell.second->params.find(ctx->id("PRESELECT_I0"));
-            instPtr->setConfig("PRESELECT_I0", "", it != cell.second->params.end() ? it->second : "FALSE");
-            instPtr->setConfig("CE0INV", "", "CE0");
-            instPtr->setConfig("S0INV", "", "S0");
-            //instPtr->setConfig("IGNORE0INV", "", "IGNORE0");
-            //instPtr->setConfig("CE1INV", "", "CE1");
-            //instPtr->setConfig("S1INV", "", "S1");
-            //instPtr->setConfig("IGNORE1INV", "", "IGNORE1");
-        } else if (cell.second->type == id_PS7) {
-        } else if (cell.second->type == id_MMCME2_ADV) {
-            for (const auto& i : cell.second->params) {
+        } else if (cell.second->type == id_BUFGCTRL || cell.second->type == id_MMCME2_ADV) {
+            for (const auto& i : cell.second->params)
                 instPtr->setConfig(i.first.str(ctx), "", i.second);
-            }
-            if (!cell.second->params.count(ctx->id("CLKIN2_PERIOD")))
-                instPtr->setConfig("CLKIN2_PERIOD", "", "0");
-            for (const auto& i : { "CLKOUT1_DIVIDE", "CLKOUT2_DIVIDE", "CLKOUT3_DIVIDE", "CLKOUT4_DIVIDE", "CLKOUT5_DIVIDE", "CLKOUT6_DIVIDE" }) {
-                if (!cell.second->params.count(ctx->id(i)))
-                    instPtr->setConfig(i, "", "1");
-            }
-            for (const auto& i : { "CLKOUT1_PHASE", "CLKOUT2_PHASE", "CLKOUT3_PHASE", "CLKOUT4_PHASE", "CLKOUT5_PHASE", "CLKOUT6_PHASE" }) {
-                if (!cell.second->params.count(ctx->id(i)))
-                    instPtr->setConfig(i, "", "0.0");
-            }
-            for (const auto& i : { "CLKOUT1_DUTY_CYCLE", "CLKOUT2_DUTY_CYCLE", "CLKOUT3_DUTY_CYCLE", "CLKOUT4_DUTY_CYCLE", "CLKOUT5_DUTY_CYCLE", "CLKOUT6_DUTY_CYCLE" }) {
-                if (!cell.second->params.count(ctx->id(i)))
-                    instPtr->setConfig(i, "", "0.5");
-            }
-            if (!cell.second->params.count(ctx->id("REF_JITTER2")))
-                instPtr->setConfig("REF_JITTER2", "", "0.01");
-            if (!cell.second->params.count(ctx->id("SS_MOD_PERIOD")))
-                instPtr->setConfig("SS_MOD_PERIOD", "", "10000");
+        } else if (cell.second->type == id_PS7) {
         } else
             log_error("Unsupported cell type '%s'.\n", cell.second->type.c_str(ctx));
     }