8 files changed, 5 insertions, 43 deletions
diff --git a/common/nextpnr.cc b/common/nextpnr.cc
index 09fff8d1..09d8349f 100644
--- a/common/nextpnr.cc
+++ b/common/nextpnr.cc
@@ -454,7 +454,7 @@ DecalXY BaseCtx::constructDecalXY(DecalId decal, float x, float y)
     return dxy;
 }
 
-void BaseCtx::commonInfoToAttributes()
+void BaseCtx::archInfoToAttributes()
 {
     for (auto &cell : cells) {
         auto ci = cell.second.get();
@@ -498,7 +498,7 @@ void BaseCtx::commonInfoToAttributes()
     }
 }
     
-void BaseCtx::attributesToCommonInfo()
+void BaseCtx::attributesToArchInfo()
 {
     for (auto &cell : cells) {
         auto ci = cell.second.get();
@@ -544,6 +544,7 @@ void BaseCtx::attributesToCommonInfo()
             }            
         }
     }
+    getCtx()->assignArchInfo();
 }
 
 NEXTPNR_NAMESPACE_END
diff --git a/common/nextpnr.h b/common/nextpnr.h
index f7f135fb..8e47dcda 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -682,8 +682,8 @@ struct BaseCtx
     // Workaround for lack of wrappable constructors
     DecalXY constructDecalXY(DecalId decal, float x, float y);
 
-    void commonInfoToAttributes();
-    void attributesToCommonInfo();
+    void archInfoToAttributes();
+    void attributesToArchInfo();
 };
 
 NEXTPNR_NAMESPACE_END
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 044ff4d9..e796c9db 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -989,17 +989,6 @@ WireId Arch::getBankECLK(int bank, int eclk)
     return getWireByLocAndBasename(Location(0, 0), "G_BANK" + std::to_string(bank) + "ECLK" + std::to_string(eclk));
 }
 
-void Arch::archInfoToAttributes()
-{
-    commonInfoToAttributes();
-}
-
-void Arch::attributesToArchInfo()
-{
-    attributesToCommonInfo();
-    assignArchInfo();
-}
-
 #ifdef WITH_HEAP
 const std::string Arch::defaultPlacer = "heap";
 #else
diff --git a/ecp5/arch.h b/ecp5/arch.h
index 23a264ec..3de06a42 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -994,8 +994,6 @@ struct Arch : BaseCtx
     bool slicesCompatible(const std::vector<const CellInfo *> &cells) const;
 
     void assignArchInfo();
-    void archInfoToAttributes();
-    void attributesToArchInfo();
 
     void permute_luts();
 
diff --git a/generic/arch.cc b/generic/arch.cc
index 674f7af7..5617fa63 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -604,17 +604,6 @@ void Arch::assignArchInfo()
     }
 }
 
-void Arch::archInfoToAttributes()
-{
-    commonInfoToAttributes();
-}
-
-void Arch::attributesToArchInfo()
-{
-    attributesToCommonInfo();
-    assignArchInfo();
-}
-
 bool Arch::cellsCompatible(const CellInfo **cells, int count) const
 {
     const NetInfo *clk = nullptr;
diff --git a/generic/arch.h b/generic/arch.h
index f553c613..e9d3593c 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -288,8 +288,6 @@ struct Arch : BaseCtx
     // Internal usage
     void assignArchInfo();
     bool cellsCompatible(const CellInfo **cells, int count) const;
-    void archInfoToAttributes();
-    void attributesToArchInfo();
 };
 
 NEXTPNR_NAMESPACE_END
diff --git a/ice40/arch.cc b/ice40/arch.cc
index 659717f8..b7207ca9 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -1234,17 +1234,6 @@ void Arch::assignCellInfo(CellInfo *cell)
     }
 }
 
-void Arch::archInfoToAttributes()
-{
-    commonInfoToAttributes();
-}
-
-void Arch::attributesToArchInfo()
-{
-    attributesToCommonInfo();
-    assignArchInfo();
-}
-
 const std::string Arch::defaultPlacer = "sa";
 
 const std::vector<std::string> Arch::availablePlacers = {"sa",
diff --git a/ice40/arch.h b/ice40/arch.h
index 8b6942cb..ea29f4f1 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -878,8 +878,6 @@ struct Arch : BaseCtx
     // netlist modifications, and validity checks
     void assignArchInfo();
     void assignCellInfo(CellInfo *cell);
-    void archInfoToAttributes();
-    void attributesToArchInfo();
 
     // -------------------------------------------------
     BelPin getIOBSharingPLLPin(BelId pll, IdString pll_pin) const