mpl: clean up and remove unused code

Signed-off-by: Arthur Koucher <[email protected]>

Author: AcKoucher

src/mpl/src/object.cpp

@@ -931,19 +931,6 @@ odb::dbOrientType HardMacro::getOrientation() const
   return orientation_;
 }
 
-// We do not allow rotation of macros
-// This may violate the direction of metal layers
-void HardMacro::flip(bool flip_horizontal)
-{
-  if (flip_horizontal) {
-    orientation_ = orientation_.flipX();
-    pin_y_ = height_ - pin_y_;
-  } else {
-    orientation_ = orientation_.flipY();
-    pin_x_ = width_ - pin_x_;
-  }
-}
-
 // Interfaces with OpenDB
 odb::dbInst* HardMacro::getInst() const
 {

src/mpl/src/object.h

@@ -119,21 +119,15 @@ class Metrics
   float macro_area_ = 0.0;
 };
 
-// In this hierarchical autoclustering part,
-// we convert the original gate-level netlist into a cluster-level netlist
 class Cluster
 {
  public:
-  // constructors
-  Cluster(int cluster_id, utl::Logger* logger);  // cluster name can be updated
+  Cluster(int cluster_id, utl::Logger* logger);
   Cluster(int cluster_id, const std::string& cluster_name, utl::Logger* logger);
 
-  // cluster id can not be changed
   int getId() const;
-  // cluster name can be updated
   const std::string& getName() const;
   void setName(const std::string& name);
-  // cluster type (default type = MixedCluster)
   void setClusterType(const ClusterType& cluster_type);
   ClusterType getClusterType() const;
   std::string getClusterTypeString() const;
@@ -155,7 +149,7 @@ class Cluster
   void clearLeafStdCells();
   void clearLeafMacros();
   void clearHardMacros();
-  void copyInstances(const Cluster& cluster);  // only based on cluster type
+  void copyInstances(const Cluster& cluster);
 
   bool isIOCluster() const;
   bool isClusterOfUnconstrainedIOPins() const;
@@ -208,7 +202,7 @@ class Cluster
   Cluster* getParent() const;
   const UniqueClusterVector& getChildren() const;
 
-  bool isLeaf() const;  // if the cluster is a leaf cluster
+  bool isLeaf() const;
   std::string getIsLeafString() const;
   bool attemptMerge(Cluster* incomer, bool& incomer_deleted);
 
@@ -220,10 +214,6 @@ class Cluster
   std::map<int, float> getConnection() const;
   bool isSameConnSignature(const Cluster& cluster, float net_threshold);
   bool hasMacroConnectionWith(const Cluster& cluster, float net_threshold);
-  // Get closely-connected cluster if such cluster exists
-  // For example, if a small cluster A is closely connected to a
-  // well-formed cluster B, (there are also other well-formed clusters
-  // C, D), A is only connected to B and A has no connection with C, D
   int getCloseCluster(const std::vector<int>& candidate_clusters,
                       float net_threshold);
 
@@ -243,57 +233,31 @@ class Cluster
   const TilingList& getTilings() const;
 
  private:
-  // Private Variables
-  int id_ = -1;       // cluster id (a valid cluster id should be nonnegative)
-  std::string name_;  // cluster name
-  ClusterType type_ = MixedCluster;  // cluster type
-
-  // Instances in the cluster
-  // the logical module included in the cluster
-  // dbModule is a object representing logical module in the OpenDB
+  int id_{-1};
+  std::string name_;
+  ClusterType type_{MixedCluster};
+  Metrics metrics_;
   std::vector<odb::dbModule*> db_modules_;
-  // the std cell instances in the cluster (leaf std cell instances)
   std::vector<odb::dbInst*> leaf_std_cells_;
-  // the macros in the cluster (leaf macros)
   std::vector<odb::dbInst*> leaf_macros_;
-  // all the macros in the cluster
   std::vector<HardMacro*> hard_macros_;
 
   bool is_cluster_of_unplaced_io_pins_{false};
   bool is_cluster_of_unconstrained_io_pins_{false};
   bool is_io_pad_cluster_{false};
   bool is_io_bundle_{false};
-
   bool is_array_of_interconnected_macros_ = false;
   bool is_fixed_macro_{false};
 
-  // Each cluster uses metrics to store its statistics
-  Metrics metrics_;
-
-  // Each cluster cooresponding to a SoftMacro in the placement engine
-  // which will concludes the information about real pos, width, height, area
   std::unique_ptr<SoftMacro> soft_macro_;
-
-  // Each cluster is a node in the physical hierarchy tree
-  // Thus we need to define related to parent and children pointers
-  Cluster* parent_ = nullptr;  // parent of current cluster
-  UniqueClusterVector children_;
-
   TilingList tilings_;
 
-  // To support grouping small clusters based connection signature,
-  // we define connection_map_
-  // Here we do not differentiate the input and output connections
-  std::map<int, float> connection_map_;  // cluster_id, number of connections
+  Cluster* parent_{nullptr};
+  UniqueClusterVector children_;
 
-  // store the virtual connection between children
-  // the virtual connection is used to tie the std cell part and the
-  // corresponding macro part together
-  std::vector<std::pair<int, int>> virtual_connections_;
+  std::map<int, float> connection_map_;  // id -> connection weight
+  std::vector<std::pair<int, int>> virtual_connections_;  // id -> id
 
-  // pin access for each bundled connection
-  std::map<int, std::pair<Boundary, float>> pin_access_map_;
-  std::map<Boundary, std::map<Boundary, float>> boundary_connection_map_;
   utl::Logger* logger_;
 };
 
@@ -360,10 +324,6 @@ class HardMacro
 
   // Orientation support
   odb::dbOrientType getOrientation() const;
-  // We do not allow rotation of macros
-  // This may violate the direction of metal layers
-  // flip about X or Y axis
-  void flip(bool flip_horizontal);
 
   // Interfaces with OpenDB
   odb::dbInst* getInst() const;