Merge pull request #9091 from AcKoucher/mpl-partial-fixed-macros

mpl: cover cases in which a fixed macro is partially inside the core

Author: eder-matheus

src/mpl/src/hier_rtlmp.cpp

@@ -403,7 +403,7 @@ void HierRTLMP::calculateChildrenTilings(Cluster* parent)
   std::vector<SoftMacro> macros;
   for (auto& cluster : parent->getChildren()) {
     if (cluster->isFixedMacro()) {
-      considerFixedMacro(outline, macros, cluster.get());
+      macros.emplace_back(logger_, cluster->getHardMacros().front(), &outline);
       continue;
     }
 
@@ -1297,15 +1297,6 @@ void HierRTLMP::mergeNets(BundledNetList& nets)
   nets = std::move(merged_nets);
 }
 
-void HierRTLMP::considerFixedMacro(const odb::Rect& outline,
-                                   std::vector<SoftMacro>& sa_macros,
-                                   Cluster* fixed_macro_cluster) const
-{
-  const HardMacro* hard_macro = fixed_macro_cluster->getHardMacros().front();
-  odb::Point offset(-outline.xMin(), -outline.yMin());
-  sa_macros.emplace_back(logger_, hard_macro, &offset);
-}
-
 // Recommendation from the original implementation:
 // For single level, increase macro blockage weight to
 // half of the outline weight.
@@ -1405,7 +1396,7 @@ void HierRTLMP::placeChildren(Cluster* parent, bool ignore_std_cell_area)
     soft_macro_id_map[cluster->getName()] = macros.size();
 
     if (cluster->isFixedMacro()) {
-      considerFixedMacro(outline, macros, cluster.get());
+      macros.emplace_back(logger_, cluster->getHardMacros().front(), &outline);
       continue;
     }
 

src/mpl/src/hier_rtlmp.h

@@ -195,9 +195,6 @@ class HierRTLMP
                                   float offset_x,
                                   float offset_y);
   void mergeNets(BundledNetList& nets);
-  void considerFixedMacro(const odb::Rect& outline,
-                          std::vector<SoftMacro>& sa_macros,
-                          Cluster* fixed_macro_cluster) const;
 
   // Hierarchical Macro Placement 2nd stage: Macro Placement
   void placeMacros(Cluster* cluster);

src/mpl/src/object.cpp

@@ -890,7 +890,7 @@ SoftMacro::SoftMacro(const odb::Point& location,
 // Represent a fixed macro.
 SoftMacro::SoftMacro(utl::Logger* logger,
                      const HardMacro* hard_macro,
-                     const odb::Point* offset)
+                     const odb::Rect* outline)
 {
   if (!hard_macro->isFixed()) {
     logger->error(
@@ -902,17 +902,21 @@ SoftMacro::SoftMacro(utl::Logger* logger,
 
   name_ = hard_macro->getName();
 
-  x_ = hard_macro->getX();
-  y_ = hard_macro->getY();
+  odb::Rect shape;
+  odb::Rect hard_macro_bbox = hard_macro->getBBox();
 
-  if (offset) {
-    x_ += offset->x();
-    y_ += offset->y();
+  if (outline) {
+    shape = hard_macro_bbox.intersect(*outline);
+    shape.moveDelta(-outline->xMin(), -outline->yMin());
+  } else {
+    shape = hard_macro_bbox;
   }
 
-  width_ = hard_macro->getWidth();
-  height_ = hard_macro->getHeight();
-  area_ = width_ * static_cast<int64_t>(height_);
+  x_ = shape.xMin();
+  y_ = shape.yMin();
+  width_ = shape.dx();
+  height_ = shape.dy();
+  area_ = shape.area();
 
   cluster_ = hard_macro->getCluster();
   fixed_ = true;

src/mpl/src/object.h

@@ -384,7 +384,7 @@ class SoftMacro
             Cluster* cluster);
   SoftMacro(utl::Logger* logger,
             const HardMacro* hard_macro,
-            const odb::Point* offset = nullptr);
+            const odb::Rect* outline = nullptr);
 
   const std::string& getName() const;
 

src/mpl/test/BUILD

@@ -34,7 +34,8 @@ COMPULSORY_TESTS = [
     "centralization1",
     "clocked_macro",
     "keep_clustering_data",
-    "fixed_macros",
+    "fixed_macros1",
+    "fixed_macros2",
     "fixed_covers",
     "macros_without_pins1",
 ]
@@ -95,7 +96,8 @@ filegroup(
         "testcases/clocked_macro.lib",
         "testcases/clocked_macro.v",
         "testcases/fixed_ios1.def",
-        "testcases/fixed_macros.def",
+        "testcases/fixed_macros1.def",
+        "testcases/fixed_macros2.def",
         "testcases/guides1.def",
         "testcases/guides1.v",
         "testcases/io_constraints1.def",

src/mpl/test/CMakeLists.txt

@@ -27,7 +27,8 @@ or_integration_tests(
     centralization1
     clocked_macro
     keep_clustering_data
-    fixed_macros
+    fixed_macros1
+    fixed_macros2
     fixed_covers
     macros_without_pins1
 )

src/mpl/test/fixed_covers.tcl

@@ -5,7 +5,7 @@ read_lef "./Nangate45/Nangate45.lef"
 read_lef "./Nangate45_io/dummy_pads.lef"
 read_lef "./testcases/orientation_improve1.lef"
 
-read_def "./testcases/fixed_macros.def"
+read_def "./testcases/fixed_macros1.def"
 
 place_inst -cell DUMMY_BUMP -name "test_pad1" -orient R0 -status FIRM -loc "100 100"
 

src/mpl/test/fixed_macros.defok src/mpl/test/fixed_macros1.defoksrc/mpl/test/fixed_macros.defok renamed to src/mpl/test/fixed_macros1.defok

@@ -6,12 +6,12 @@ source "helpers.tcl"
 read_lef "./Nangate45/Nangate45.lef"
 read_lef "./testcases/orientation_improve1.lef"
 
-read_def "./testcases/fixed_macros.def"
+read_def "./testcases/fixed_macros1.def"
 
 set_thread_count 0
 rtl_macro_placer -report_directory [make_result_dir] -halo_width 0.3
 
-set def_file [make_result_file fixed_macros.def]
+set def_file [make_result_file fixed_macros1.def]
 write_def $def_file
 
-diff_files fixed_macros.defok $def_file
+diff_files fixed_macros1.defok $def_file