Use flags for each step

7 files changed, 9 insertions, 11 deletions

diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 2061bf4a..02f73ca2 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -524,7 +524,7 @@ bool Arch::place()
     }
 
     permute_luts();
-    getCtx()->attrs[getCtx()->id("step")] = "place";
+    getCtx()->settings[getCtx()->id("place")] = "1";
     archInfoToAttributes();
     return true;
 }
@@ -561,7 +561,7 @@ bool Arch::route()
     log_info("       base %d adder %d\n", speed_grade->pip_classes[locInfo(slowest_pip)->pip_data[slowest_pip.index].timing_class].max_base_delay,
              speed_grade->pip_classes[locInfo(slowest_pip)->pip_data[slowest_pip.index].timing_class].max_fanout_adder);
 #endif
-    getCtx()->attrs[getCtx()->id("step")] = "route";
+    getCtx()->settings[getCtx()->id("route")] = "1";
     archInfoToAttributes();
     return result;
 }
diff --git a/ecp5/pack.cc b/ecp5/pack.cc
index 4077bfed..9e2bc326 100644
--- a/ecp5/pack.cc
+++ b/ecp5/pack.cc
@@ -2429,7 +2429,7 @@ bool Arch::pack()
         Ecp5Packer(ctx).pack();
         log_info("Checksum: 0x%08x\n", ctx->checksum());
         assignArchInfo();
-        ctx->attrs[ctx->id("step")] = "pack";
+        ctx->settings[ctx->id("pack")] = "1";
         archInfoToAttributes();
         return true;
     } catch (log_execution_error_exception) {
diff --git a/generic/arch.cc b/generic/arch.cc
index f6f7ff87..2db9e547 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -497,7 +497,7 @@ bool Arch::place()
     // FIXME: No HeAP because it needs a list of IO buffers
     if (placer == "sa") {
         bool retVal = placer1(getCtx(), Placer1Cfg(getCtx()));
-        getCtx()->attrs[getCtx()->id("step")] = "place";
+        getCtx()->settings[getCtx()->id("place")] = "1";
         archInfoToAttributes();
         return retVal;
     } else {
@@ -507,7 +507,7 @@ bool Arch::place()
 
 bool Arch::route() { 
     bool retVal = router1(getCtx(), Router1Cfg(getCtx()));
-    getCtx()->attrs[getCtx()->id("step")] = "route";
+    getCtx()->settings[getCtx()->id("route")] = "1";
     archInfoToAttributes();
     return retVal;
 }
diff --git a/generic/pack.cc b/generic/pack.cc
index 0d47ea19..558eca7c 100644
--- a/generic/pack.cc
+++ b/generic/pack.cc
@@ -282,7 +282,7 @@ bool Arch::pack()
         pack_io(ctx);
         pack_lut_lutffs(ctx);
         pack_nonlut_ffs(ctx);
-        ctx->attrs[ctx->id("step")] = "pack";
+        ctx->settings[ctx->id("pack")] = "1";
         ctx->assignArchInfo();
         log_info("Checksum: 0x%08x\n", ctx->checksum());
         return true;
diff --git a/ice40/arch.cc b/ice40/arch.cc
index 4945f5b3..a0c64bb8 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -689,14 +689,14 @@ bool Arch::place()
         tocfg.cellTypes.insert(id_ICESTORM_LC);
         retVal = timing_opt(getCtx(), tocfg);
     }
-    getCtx()->attrs[getCtx()->id("step")] = "place";
+    getCtx()->settings[getCtx()->id("place")] = "1";
     archInfoToAttributes();
     return retVal;
 }
 
 bool Arch::route() { 
     bool retVal = router1(getCtx(), Router1Cfg(getCtx())); 
-    getCtx()->attrs[getCtx()->id("step")] = "route";
+    getCtx()->settings[getCtx()->id("route")] = "1";
     archInfoToAttributes();
     return retVal;
 }
diff --git a/ice40/pack.cc b/ice40/pack.cc
index ce39c903..a8f8c76e 100644
--- a/ice40/pack.cc
+++ b/ice40/pack.cc
@@ -1421,7 +1421,7 @@ bool Arch::pack()
         ctx->assignArchInfo();
         constrain_chains(ctx);
         ctx->assignArchInfo();
-        ctx->attrs[ctx->id("step")] = "pack";
+        ctx->settings[ctx->id("pack")] = "1";
         archInfoToAttributes();
         log_info("Checksum: 0x%08x\n", ctx->checksum());
         return true;
diff --git a/json/jsonparse.cc b/json/jsonparse.cc
index a6b45282..b2597828 100644
--- a/json/jsonparse.cc
+++ b/json/jsonparse.cc
@@ -740,8 +740,6 @@ void json_import(Context *ctx, string modname, JsonNode *node)
     for (int attrid = 0; attrid < GetSize(attr_node->data_dict_keys); attrid++) {
         json_import_top_attrib(ctx, modname, attr_node, &ctx->attrs, attrid);
     }
-    if (ctx->attrs.find(ctx->id("step")) == ctx->attrs.end())   
-        ctx->attrs[ctx->id("step")] = "synth";
     
     JsonNode *ports_parent = nullptr;
     if (node->data_dict.count("ports") > 0)