Preserve hierarchy through packing

Signed-off-by: David Shah <dave@ds0.me>

1 files changed, 7 insertions, 0 deletions

diff --git a/common/nextpnr.h b/common/nextpnr.h
index 7dfebd62..61e04415 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -544,6 +544,9 @@ struct HierarchicalCell
     IdString name, type, parent, fullpath;
     // Name inside cell instance -> global name
     std::unordered_map<IdString, IdString> leaf_cells, nets;
+    // Global name -> name inside cell instance
+    std::unordered_map<IdString, IdString> leaf_cells_by_gname, nets_by_gname;
+    // Cell port to net
     std::unordered_map<IdString, HierarchicalPort> ports;
     // Name inside cell instance -> global name
     std::unordered_map<IdString, IdString> hier_cells;
@@ -836,6 +839,10 @@ struct Context : Arch, DeterministicRNG
                              std::unordered_map<WireId, PipId> *route = nullptr, bool useEstimate = true);
 
     // --------------------------------------------------------------
+    // call after changing hierpath or adding/removing nets and cells
+    void fixupHierarchy();
+
+    // --------------------------------------------------------------
 
     // provided by sdf.cc
     void writeSDF(std::ostream &out, bool cvc_mode = false) const;