mpl: create struct and new functions to avoid code duplication

Signed-off-by: Arthur Koucher <[email protected]>

Author: AcKoucher

src/mpl/src/clusterEngine.cpp

@@ -2018,49 +2018,60 @@ void ClusteringEngine::clearConnections()
 
 void ClusteringEngine::buildNetListConnections()
 {
-  const float connection_weight = 1.0;
-
-  for (odb::dbNet* net : block_->getNets()) {
-    if (!isValidNet(net)) {
+  for (odb::dbNet* db_net : block_->getNets()) {
+    if (!isValidNet(db_net)) {
       continue;
     }
 
-    int driver_cluster_id = -1;
-    std::vector<int> load_clusters_ids;
+    Net net = buildNet(db_net);
+    connectClusters(net);
+  }
+}
 
-    for (odb::dbITerm* iterm : net->getITerms()) {
-      odb::dbInst* inst = iterm->getInst();
-      const int cluster_id = tree_->maps.inst_to_cluster_id.at(inst);
+ClusteringEngine::Net ClusteringEngine::buildNet(odb::dbNet* db_net) const
+{
+  Net net;
 
-      if (iterm->getIoType() == odb::dbIoType::OUTPUT) {
-        driver_cluster_id = cluster_id;
-      } else {
-        load_clusters_ids.push_back(cluster_id);
-      }
+  for (odb::dbITerm* iterm : db_net->getITerms()) {
+    odb::dbInst* inst = iterm->getInst();
+    const int cluster_id = tree_->maps.inst_to_cluster_id.at(inst);
+
+    if (iterm->getIoType() == odb::dbIoType::OUTPUT) {
+      net.driver_id = cluster_id;
+    } else {
+      net.loads_ids.push_back(cluster_id);
     }
+  }
 
-    if (tree_->io_pads.empty()) {
-      for (odb::dbBTerm* bterm : net->getBTerms()) {
-        const int cluster_id = tree_->maps.bterm_to_cluster_id.at(bterm);
+  if (tree_->io_pads.empty()) {
+    for (odb::dbBTerm* bterm : db_net->getBTerms()) {
+      const int cluster_id = tree_->maps.bterm_to_cluster_id.at(bterm);
 
-        if (bterm->getIoType() == odb::dbIoType::INPUT) {
-          driver_cluster_id = cluster_id;
-        } else {
-          load_clusters_ids.push_back(cluster_id);
-        }
+      if (bterm->getIoType() == odb::dbIoType::INPUT) {
+        net.driver_id = cluster_id;
+      } else {
+        net.loads_ids.push_back(cluster_id);
       }
     }
+  }
+
+  return net;
+}
+
+void ClusteringEngine::connectClusters(const Net& net)
+{
+  if (net.driver_id == -1 || net.loads_ids.empty()
+      || net.loads_ids.size() >= tree_->large_net_threshold) {
+    return;
+  }
 
-    if (driver_cluster_id != -1 && !load_clusters_ids.empty()
-        && load_clusters_ids.size() < tree_->large_net_threshold) {
-      Cluster* driver_cluster = tree_->maps.id_to_cluster.at(driver_cluster_id);
+  const float connection_weight = 1.0;
+  Cluster* driver = tree_->maps.id_to_cluster.at(net.driver_id);
 
-      for (const int load_cluster_id : load_clusters_ids) {
-        if (load_cluster_id != driver_cluster_id) {
-          Cluster* load_cluster = tree_->maps.id_to_cluster.at(load_cluster_id);
-          connect(driver_cluster, load_cluster, connection_weight);
-        }
-      }
+  for (const int load_cluster_id : net.loads_ids) {
+    if (load_cluster_id != net.driver_id) {
+      Cluster* load = tree_->maps.id_to_cluster.at(load_cluster_id);
+      connect(driver, load, connection_weight);
     }
   }
 }

src/mpl/src/clusterEngine.h

@@ -169,6 +169,12 @@ class ClusteringEngine
  private:
   using UniqueClusterQueue = std::queue<std::unique_ptr<Cluster>>;
 
+  struct Net
+  {
+    int driver_id{-1};
+    std::vector<int> loads_ids;
+  };
+
   void init();
   Metrics* computeModuleMetrics(odb::dbModule* module);
   std::string generateMacroAndCoreDimensionsTable(const HardMacro* hard_macro,
@@ -249,6 +255,8 @@ class ClusteringEngine
   void clearConnections();
   void buildNetListConnections();
   void buildDataFlowConnections();
+  Net buildNet(odb::dbNet* db_net) const;
+  void connectClusters(const Net& net);
   void connect(Cluster* a, Cluster* b, float connection_weight) const;
 
   // Methods for data flow