Merge pull request #8950 from The-OpenROAD-Project-staging/mpl-dbu

mpl: conversion from microns to dbu

Author: maliberty

src/mpl/include/mpl/rtl_mp.h

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "odb/db.h"
+#include "odb/geom.h"
 #include "utl/Logger.h"
 
 namespace odb {
@@ -30,7 +31,6 @@ namespace mpl {
 
 class HierRTLMP;
 class MplObserver;
-struct Rect;
 
 class MacroPlacer
 {
@@ -51,12 +51,9 @@ class MacroPlacer
              int max_num_level,
              float coarsening_ratio,
              int large_net_threshold,
-             float halo_width,
-             float halo_height,
-             float fence_lx,
-             float fence_ly,
-             float fence_ux,
-             float fence_uy,
+             int halo_width,
+             int halo_height,
+             odb::Rect global_fence,
              float area_weight,
              float outline_weight,
              float wirelength_weight,
@@ -80,7 +77,7 @@ class MacroPlacer
   std::vector<odb::dbInst*> findOverlappedMacros(odb::dbInst* macro);
 
   void setMacroPlacementFile(const std::string& file_name);
-  void addGuidanceRegion(odb::dbInst* macro, const Rect& region);
+  void addGuidanceRegion(odb::dbInst* macro, odb::Rect region);
 
   void setDebug(std::unique_ptr<MplObserver>& graphics);
   void setDebugShowBundledNets(bool show_bundled_nets);
@@ -94,7 +91,7 @@ class MacroPlacer
   utl::Logger* logger_ = nullptr;
   odb::dbDatabase* db_ = nullptr;
 
-  std::map<odb::dbInst*, Rect> guidance_regions_;
+  std::map<odb::dbInst*, odb::Rect> guidance_regions_;
 };
 
 }  // namespace mpl

src/mpl/src/MplObserver.h

@@ -37,11 +37,11 @@ class MplObserver
   virtual void finishedClustering(PhysicalHierarchy* tree) {}
 
   virtual void setMaxLevel(int max_level) {}
-  virtual void setMacroBlockages(const std::vector<mpl::Rect>& macro_blockages)
+  virtual void setMacroBlockages(const std::vector<odb::Rect>& macro_blockages)
   {
   }
   virtual void setPlacementBlockages(
-      const std::vector<mpl::Rect>& placement_blockages)
+      const std::vector<odb::Rect>& placement_blockages)
   {
   }
   virtual void setBundledNets(const std::vector<BundledNet>& bundled_nets) {}
@@ -54,8 +54,8 @@ class MplObserver
   virtual void setCurrentCluster(Cluster* current_cluster) {}
 
   virtual void setOutline(const odb::Rect& outline) {}
-  virtual void setGuides(const std::map<int, Rect>& guides) {}
-  virtual void setFences(const std::map<int, Rect>& fences) {}
+  virtual void setGuides(const std::map<int, odb::Rect>& guides) {}
+  virtual void setFences(const std::map<int, odb::Rect>& fences) {}
   virtual void setIOConstraintsMap(
       const ClusterToBoundaryRegionMap& io_cluster_to_constraint)
   {

src/mpl/src/SACoreHardMacro.cpp

@@ -12,6 +12,7 @@
 #include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
+#include "odb/geom.h"
 #include "utl/Logger.h"
 
 namespace mpl {
@@ -21,7 +22,7 @@ using utl::MPL;
 // Class SACoreHardMacro
 // constructors
 SACoreHardMacro::SACoreHardMacro(PhysicalHierarchy* tree,
-                                 const Rect& outline,
+                                 const odb::Rect& outline,
                                  const std::vector<HardMacro>& macros,
                                  const SACoreWeights& core_weights,
                                  // probability of each action
@@ -210,7 +211,7 @@ void SACoreHardMacro::initialize()
     // store current penalties
     width_list.push_back(width_);
     height_list.push_back(height_);
-    area_penalty_list.push_back(width_ * height_);
+    area_penalty_list.push_back(getAreaPenalty());
     outline_penalty_list.push_back(outline_penalty_);
     wirelength_list.push_back(wirelength_);
     guidance_penalty_list.push_back(guidance_penalty_);

src/mpl/src/SACoreHardMacro.h

@@ -11,6 +11,7 @@
 #include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
+#include "odb/geom.h"
 
 namespace utl {
 class Logger;
@@ -22,7 +23,7 @@ class SACoreHardMacro : public SimulatedAnnealingCore<HardMacro>
 {
  public:
   SACoreHardMacro(PhysicalHierarchy* tree,
-                  const Rect& outline,
+                  const odb::Rect& outline,
                   const std::vector<HardMacro>& macros,
                   const SACoreWeights& core_weights,
                   // probability of each action