Merge pull request #7472 from AcKoucher/mpl-dataflow-macro-placement

mpl: consider data flow connections during macro placement

Author: eder-matheus

src/mpl/src/clusterEngine.cpp

@@ -860,7 +860,7 @@ void ClusteringEngine::dataFlowDFSMacroPin(
   }
 }
 
-void ClusteringEngine::updateDataFlow()
+void ClusteringEngine::buildDataFlowConnections()
 {
   if (data_connections_.is_empty) {
     return;
@@ -1542,7 +1542,8 @@ void ClusteringEngine::mergeChildrenBelowThresholds(
 
   int num_small_children = static_cast<int>(small_children.size());
   while (true) {
-    updateConnections();  // update the connections between clusters
+    clearConnections();
+    buildNetListConnections();
 
     std::vector<int> cluster_class(num_small_children, -1);  // merge flag
     std::vector<int> small_children_ids;                     // store cluster id
@@ -1690,12 +1691,22 @@ bool ClusteringEngine::attemptMerge(Cluster* receiver, Cluster* incomer)
   return false;
 }
 
-void ClusteringEngine::updateConnections()
+void ClusteringEngine::rebuildConnections()
+{
+  clearConnections();
+  buildNetListConnections();
+  buildDataFlowConnections();
+}
+
+void ClusteringEngine::clearConnections()
 {
   for (auto& [cluster_id, cluster] : tree_->maps.id_to_cluster) {
     cluster->initConnection();
   }
+}
 
+void ClusteringEngine::buildNetListConnections()
+{
   for (odb::dbNet* net : block_->getNets()) {
     if (!isValidNet(net)) {
       continue;
@@ -1826,7 +1837,8 @@ void ClusteringEngine::breakMixedLeaf(Cluster* mixed_leaf)
   std::vector<Cluster*> macro_clusters;
   createOneClusterForEachMacro(parent, hard_macros, macro_clusters);
 
-  updateConnections();
+  clearConnections();
+  buildNetListConnections();
 
   const int number_of_macros = static_cast<int>(hard_macros.size());
   std::vector<int> size_class(number_of_macros, -1);

src/mpl/src/clusterEngine.h

@@ -142,8 +142,7 @@ class ClusteringEngine
 
   // Methods to update the tree as the hierarchical
   // macro placement runs.
-  void updateConnections();
-  void updateDataFlow();
+  void rebuildConnections();
   void updateInstancesAssociation(Cluster* cluster);
   void updateInstancesAssociation(odb::dbModule* module,
                                   int cluster_id,
@@ -225,6 +224,10 @@ class ClusteringEngine
   void replaceByStdCellCluster(Cluster* mixed_leaf,
                                std::vector<int>& virtual_conn_clusters);
 
+  void clearConnections();
+  void buildNetListConnections();
+  void buildDataFlowConnections();
+
   // Methods for data flow
   void createDataFlow();
   bool stdCellsHaveLiberty();

src/mpl/src/hier_rtlmp.cpp

@@ -1387,8 +1387,7 @@ void HierRTLMP::placeChildren(Cluster* parent)
 
   createFixedTerminals(parent, soft_macro_id_map, macros);
 
-  clustering_engine_->updateConnections();
-  clustering_engine_->updateDataFlow();
+  clustering_engine_->rebuildConnections();
 
   // add the virtual connections (the weight related to IOs and macros belong to
   // the same cluster)
@@ -1790,8 +1789,7 @@ void HierRTLMP::placeChildrenUsingMinimumTargetUtil(Cluster* parent)
 
   createFixedTerminals(parent, soft_macro_id_map, macros);
 
-  clustering_engine_->updateConnections();
-  clustering_engine_->updateDataFlow();
+  clustering_engine_->rebuildConnections();
 
   // add the virtual connections (the weight related to IOs and macros belong to
   // the same cluster)
@@ -2383,7 +2381,7 @@ void HierRTLMP::placeMacros(Cluster* cluster)
     graphics_->setFences(fences);
   }
 
-  clustering_engine_->updateConnections();
+  clustering_engine_->rebuildConnections();
 
   createFixedTerminals(outline, macro_clusters, cluster_to_macro, sa_macros);
 

src/mpl/test/guides2.defok

@@ -339,16 +339,16 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
 TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
 TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
 COMPONENTS 10 ;
-    - U1 HM_100x400_4x4 + FIXED ( 665880 16590 ) FN ;
-    - U10 HM_100x100_1x1 + FIXED ( 17880 16550 ) FN ;
-    - U2 HM_100x100_1x1 + FIXED ( 233880 664610 ) S ;
-    - U3 HM_100x100_1x1 + FIXED ( 233880 232430 ) FN ;
-    - U4 HM_100x100_1x1 + FIXED ( 17880 232430 ) FN ;
-    - U5 HM_100x100_1x1 + FIXED ( 233880 16550 ) FN ;
-    - U6 HM_100x400_4x4 + FIXED ( 449880 16610 ) FS ;
-    - U7 HM_100x100_1x1 + FIXED ( 17880 664610 ) S ;
-    - U8 HM_100x100_1x1 + FIXED ( 233880 448450 ) FS ;
-    - U9 HM_100x100_1x1 + FIXED ( 17880 448450 ) FS ;
+    - U1 HM_100x400_4x4 + FIXED ( 665880 16610 ) S ;
+    - U10 HM_100x100_1x1 + FIXED ( 17880 232430 ) FN ;
+    - U2 HM_100x100_1x1 + FIXED ( 233880 448450 ) S ;
+    - U3 HM_100x100_1x1 + FIXED ( 233880 664610 ) S ;
+    - U4 HM_100x100_1x1 + FIXED ( 233880 16550 ) FN ;
+    - U5 HM_100x100_1x1 + FIXED ( 17880 448450 ) S ;
+    - U6 HM_100x400_4x4 + FIXED ( 449880 16590 ) N ;
+    - U7 HM_100x100_1x1 + FIXED ( 233880 232430 ) N ;
+    - U8 HM_100x100_1x1 + FIXED ( 17880 664610 ) S ;
+    - U9 HM_100x100_1x1 + FIXED ( 17880 16550 ) FN ;
 END COMPONENTS
 NETS 12 ;
     - w1 ( U2 I1 ) ( U1 O1 ) + USE SIGNAL ;

src/mpl/test/macro_only.defok

@@ -339,16 +339,16 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
 TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
 TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
 COMPONENTS 10 ;
-    - U1 HM_100x400_4x4 + FIXED ( 665880 16610 ) S ;
-    - U10 HM_100x100_1x1 + FIXED ( 233880 16550 ) FN ;
-    - U2 HM_100x100_1x1 + FIXED ( 449880 664610 ) S ;
-    - U3 HM_100x100_1x1 + FIXED ( 449880 448450 ) S ;
-    - U4 HM_100x100_1x1 + FIXED ( 449880 232430 ) FN ;
-    - U5 HM_100x100_1x1 + FIXED ( 449880 16550 ) FN ;
-    - U6 HM_100x400_4x4 + FIXED ( 17880 16610 ) S ;
-    - U7 HM_100x100_1x1 + FIXED ( 233880 664610 ) S ;
-    - U8 HM_100x100_1x1 + FIXED ( 233880 448450 ) S ;
-    - U9 HM_100x100_1x1 + FIXED ( 233880 232430 ) FN ;
+    - U1 HM_100x400_4x4 + FIXED ( 17880 16610 ) FS ;
+    - U10 HM_100x100_1x1 + FIXED ( 449880 16550 ) N ;
+    - U2 HM_100x100_1x1 + FIXED ( 233880 448450 ) FS ;
+    - U3 HM_100x100_1x1 + FIXED ( 233880 232430 ) N ;
+    - U4 HM_100x100_1x1 + FIXED ( 233880 664610 ) FS ;
+    - U5 HM_100x100_1x1 + FIXED ( 233880 16550 ) N ;
+    - U6 HM_100x400_4x4 + FIXED ( 665880 16610 ) FS ;
+    - U7 HM_100x100_1x1 + FIXED ( 449880 448450 ) FS ;
+    - U8 HM_100x100_1x1 + FIXED ( 449880 232430 ) N ;
+    - U9 HM_100x100_1x1 + FIXED ( 449880 664610 ) FS ;
 END COMPONENTS
 NETS 12 ;
     - w1 ( U2 I1 ) ( U1 O1 ) + USE SIGNAL ;