mpl2: improve name and avoid clusters to be pushed toward blocked bou…

…ndaries Signed-off-by: Arthur Koucher <[email protected]>
The-OpenROAD-Project · Sep 27, 2024 · 8543487 · 8543487
1 parent ede06cd
commit 8543487
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/mpl2/src/SimulatedAnnealingCore.cpp b/src/mpl2/src/SimulatedAnnealingCore.cpp
@@ -364,11 +364,12 @@ void SimulatedAnnealingCore<T>::addBoundaryDistToWirelength(
         += net_weight
            * std::min(
                {dist_to_left, dist_to_right, dist_to_bottom, dist_to_top});
-  } else if (constraint_boundary == Boundary::L
-             || constraint_boundary == Boundary::R) {
+  } else if (constraint_boundary == Boundary::L && !left_is_blocked_
+             || constraint_boundary == Boundary::R && !right_is_blocked_) {
     const float x2 = io.getPinX();
     wirelength_ += net_weight * std::abs(x2 - x1);
-  } else {  // Top or Bottom
+  } else if (constraint_boundary == Boundary::T && !top_is_blocked_
+             || constraint_boundary == Boundary::B && !bottom_is_blocked_) {
     const float y2 = io.getPinY();
     wirelength_ += net_weight * std::abs(y2 - y1);
   }

diff --git a/src/mpl2/src/clusterEngine.cpp b/src/mpl2/src/clusterEngine.cpp
@@ -417,7 +417,8 @@ void ClusteringEngine::createIOCluster(
 void ClusteringEngine::setBlockedBoundariesForIOs()
 {
   const float blocked_boundary_threshold = 0.7;
-  std::map<Boundary, float> blockage_extension_map = getBlockageExtensionMap();
+  std::map<Boundary, float> blockage_extension_map
+      = computeBlockageExtensionMap();
 
   for (const auto [boundary, blockage_extension] : blockage_extension_map) {
     if (blockage_extension >= blocked_boundary_threshold) {
@@ -428,7 +429,7 @@ void ClusteringEngine::setBlockedBoundariesForIOs()
 
 // Computes how much blocked each boundary is for IOs base on PPL exclude
 // contraints.
-std::map<Boundary, float> ClusteringEngine::getBlockageExtensionMap()
+std::map<Boundary, float> ClusteringEngine::computeBlockageExtensionMap()
 {
   std::map<Boundary, float> blockage_extension_map;
 

diff --git a/src/mpl2/src/clusterEngine.h b/src/mpl2/src/clusterEngine.h
@@ -184,7 +184,7 @@ class ClusteringEngine
   void setBaseThresholds();
   void createIOClusters();
   void setBlockedBoundariesForIOs();
-  std::map<Boundary, float> getBlockageExtensionMap();
+  std::map<Boundary, float> computeBlockageExtensionMap();
   Boundary getConstraintBoundary(const odb::Rect& die,
                                  const odb::Rect& constraint_region);
   void createIOCluster(const odb::Rect& die,