Merge pull request #10332 from The-OpenROAD-Project-staging/mpl-pusher-overlap-bugfix

mpl: check Pusher moves overlaps correctly

Author: AcKoucher

src/mpl/src/pusher.cpp

@@ -179,16 +179,15 @@ void Pusher::pushMacroClusterToCoreBoundaries(
   }
 
   std::vector<HardMacro*> hard_macros = macro_cluster->getHardMacros();
+  // Check based on the shape of the macro cluster to avoid iterating each
+  // of its HardMacros.
+  odb::Rect cluster_box = macro_cluster->getBBox();
 
   for (const auto& [boundary, distance] : boundaries_distance) {
     if (distance == 0) {
       continue;
     }
 
-    // Check based on the shape of the macro cluster to avoid iterating each
-    // of its HardMacros.
-    odb::Rect cluster_box = macro_cluster->getBBox();
-
     moveMacroClusterBox(cluster_box, boundary, distance);
 
     debugPrint(logger_,

src/mpl/test/cpp/TestPusher.cpp

@@ -296,9 +296,7 @@ TEST_F(TestPusher, PushRevertedVertical)
 
 // When pushing a macro cluster toward its closest boundaries would cause an
 // overlap with a macro diagonal to the pushed macro, push the macro the bottom
-// The Pusher is biased by the Boundary enum ordering of boundaries (B > L > T >
-// R), the current behaviour results in overlapping macros.
-// TODO: update the overlap code
+// The Pusher is biased by the Boundary enum ordering (B > L > T > R).
 TEST_F(TestPusher, PushRevertedBiased)
 {
   auto root = makeRootWithStdCells();
@@ -316,7 +314,7 @@ TEST_F(TestPusher, PushRevertedBiased)
   pusher.pushMacrosToCoreBoundaries();
 
   // Last push (left) is reverted, bottom push is kept
-  EXPECT_EQ(raw_hard_macro_1->getX(), 0);
+  EXPECT_EQ(raw_hard_macro_1->getX(), 10000);
   EXPECT_EQ(raw_hard_macro_1->getY(), 0);
 }