Merge pull request The-OpenROAD-Project#6796 from bnmfw/drt_incremental_acc_pattern_2

drt: unique_inst_patterns_ structure structure refactor

Author: osamahammad21

src/drt/src/db/obj/frInst.h

@@ -50,6 +50,9 @@ class frInst : public frRef
       : name_(name), master_(master), db_inst_(db_inst)
   {
   }
+  // used for archive serialization
+  frInst() : master_(nullptr), db_inst_(nullptr) {}
+
   // getters
   const frString& getName() const { return name_; }
   frMaster* getMaster() const { return master_; }

src/drt/src/db/obj/frInstTerm.h

@@ -63,6 +63,7 @@ class frInstTerm : public frBlockObject
   void addAccessPoint(frAccessPoint* in) { ap_.push_back(in); }
   void setAccessPoints(const std::vector<frAccessPoint*>& in) { ap_ = in; }
   // others
+  void clearAccessPoints() { ap_.clear(); }
   frBlockObjectEnum typeId() const override { return frcInstTerm; }
   frAccessPoint* getAccessPoint(frCoord x, frCoord y, frLayerNum lNum);
   bool hasAccessPoint(frCoord x, frCoord y, frLayerNum lNum);

src/drt/src/pa/FlexPA.h

@@ -29,6 +29,7 @@
 #pragma once
 
 #include <boost/polygon/polygon.hpp>
+#include <boost/serialization/unordered_map.hpp>
 #include <cstdint>
 #include <vector>
 
@@ -100,7 +101,8 @@ class FlexPA
   int macro_cell_pin_valid_planar_ap_cnt_ = 0;
   int macro_cell_pin_valid_via_ap_cnt_ = 0;
   int macro_cell_pin_no_ap_cnt_ = 0;
-  std::vector<std::vector<std::unique_ptr<FlexPinAccessPattern>>>
+  std::unordered_map<frInst*,
+                     std::vector<std::unique_ptr<FlexPinAccessPattern>>>
       unique_inst_patterns_;
 
   UniqueInsts unique_insts_;
@@ -631,11 +633,11 @@ class FlexPA
    */
   int prepPatternInstHelper(frInst* unique_inst, bool use_x);
 
-  int genPatterns(frInst* inst,
+  int genPatterns(frInst* unique_inst,
                   const std::vector<std::pair<frMPin*, frInstTerm*>>& pins);
 
   int genPatternsHelper(
-      frInst* inst,
+      frInst* unique_inst,
       const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
       std::set<std::vector<int>>& inst_access_patterns,
       std::set<std::pair<int, int>>& used_access_points,
@@ -665,7 +667,7 @@ class FlexPA
    * @brief Determines the value of all the paths of the DP problem
    */
   void genPatternsPerform(
-      frInst* inst,
+      frInst* unique_inst,
       std::vector<std::vector<std::unique_ptr<FlexDPNode>>>& nodes,
       const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
       std::vector<int>& vio_edges,
@@ -676,7 +678,7 @@ class FlexPA
   /**
    * @brief Determines the edge cost between two DP nodes
    */
-  int getEdgeCost(frInst* inst,
+  int getEdgeCost(frInst* unique_inst,
                   FlexDPNode* prev_node,
                   FlexDPNode* curr_node,
                   const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
@@ -705,7 +707,7 @@ class FlexPA
    * @brief Commits to the best path (solution) on the DP graph
    */
   bool genPatternsCommit(
-      frInst* inst,
+      frInst* unique_inst,
       const std::vector<std::vector<std::unique_ptr<FlexDPNode>>>& nodes,
       const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
       bool& is_valid,

src/drt/src/pa/FlexPA_acc_pattern.cpp

@@ -51,8 +51,9 @@ namespace drt {
 using utl::ThreadException;
 
 static inline void serializePatterns(
-    const std::vector<std::vector<std::unique_ptr<FlexPinAccessPattern>>>&
-        patterns,
+    const std::unordered_map<
+        frInst*,
+        std::vector<std::unique_ptr<FlexPinAccessPattern>>>& patterns,
     const std::string& file_name)
 {
   std::ofstream file(file_name.c_str());
@@ -99,7 +100,7 @@ void FlexPA::prepPattern()
   const auto& unique = unique_insts_.getUnique();
 
   // revert access points to origin
-  unique_inst_patterns_.resize(unique.size());
+  unique_inst_patterns_.reserve(unique.size());
 
   int cnt = 0;
 
@@ -192,6 +193,10 @@ void FlexPA::prepPattern()
 
 void FlexPA::prepPatternInst(frInst* unique_inst)
 {
+#pragma omp critical
+  unique_inst_patterns_[unique_inst]
+      = std::vector<std::unique_ptr<FlexPinAccessPattern>>();
+
   int num_valid_pattern = prepPatternInstHelper(unique_inst, true);
 
   if (num_valid_pattern > 0) {
@@ -258,7 +263,7 @@ int FlexPA::prepPatternInstHelper(frInst* unique_inst, const bool use_x)
 }
 
 int FlexPA::genPatterns(
-    frInst* inst,
+    frInst* unique_inst,
     const std::vector<std::pair<frMPin*, frInstTerm*>>& pins)
 {
   if (pins.empty()) {
@@ -282,7 +287,7 @@ int FlexPA::genPatterns(
   std::set<std::pair<int, int>> viol_access_points;
   int num_valid_pattern = 0;
 
-  num_valid_pattern += FlexPA::genPatternsHelper(inst,
+  num_valid_pattern += FlexPA::genPatternsHelper(unique_inst,
                                                  pins,
                                                  inst_access_patterns,
                                                  used_access_points,
@@ -293,7 +298,7 @@ int FlexPA::genPatterns(
     auto reversed_pins = pins;
     reverse(reversed_pins.begin(), reversed_pins.end());
 
-    num_valid_pattern += FlexPA::genPatternsHelper(inst,
+    num_valid_pattern += FlexPA::genPatternsHelper(unique_inst,
                                                    reversed_pins,
                                                    inst_access_patterns,
                                                    used_access_points,
@@ -305,7 +310,7 @@ int FlexPA::genPatterns(
 }
 
 int FlexPA::genPatternsHelper(
-    frInst* inst,
+    frInst* unique_inst,
     const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
     std::set<std::vector<int>>& inst_access_patterns,
     std::set<std::pair<int, int>>& used_access_points,
@@ -327,15 +332,15 @@ int FlexPA::genPatternsHelper(
 
   for (int i = 0; i < router_cfg_->ACCESS_PATTERN_END_ITERATION_NUM; i++) {
     genPatternsReset(nodes, pins);
-    genPatternsPerform(inst,
+    genPatternsPerform(unique_inst,
                        nodes,
                        pins,
                        vio_edge,
                        used_access_points,
                        viol_access_points,
                        max_access_point_size);
     bool is_valid = false;
-    if (genPatternsCommit(inst,
+    if (genPatternsCommit(unique_inst,
                           nodes,
                           pins,
                           is_valid,
@@ -483,7 +488,7 @@ bool FlexPA::genPatternsGC(
 }
 
 void FlexPA::genPatternsPerform(
-    frInst* inst,
+    frInst* unique_inst,
     std::vector<std::vector<std::unique_ptr<FlexDPNode>>>& nodes,
     const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
     std::vector<int>& vio_edges,
@@ -510,7 +515,7 @@ void FlexPA::genPatternsPerform(
           continue;
         }
 
-        const int edge_cost = getEdgeCost(inst,
+        const int edge_cost = getEdgeCost(unique_inst,
                                           prev_node,
                                           curr_node,
                                           pins,
@@ -530,7 +535,7 @@ void FlexPA::genPatternsPerform(
 }
 
 int FlexPA::getEdgeCost(
-    frInst* inst,
+    frInst* unique_inst,
     FlexDPNode* prev_node,
     FlexDPNode* curr_node,
     const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
@@ -556,7 +561,7 @@ int FlexPA::getEdgeCost(
   if (vio_edges[edge_idx] != -1) {
     has_vio = (vio_edges[edge_idx] == 1);
   } else {
-    dbTransform xform = inst->getNoRotationTransform();
+    dbTransform xform = unique_inst->getNoRotationTransform();
     // check DRC
     std::vector<std::pair<frConnFig*, frBlockObject*>> objs;
     const auto& [pin_1, inst_term_1] = pins[prev_pin_idx];
@@ -684,7 +689,7 @@ std::vector<int> FlexPA::extractAccessPatternFromNodes(
 }
 
 bool FlexPA::genPatternsCommit(
-    frInst* inst,
+    frInst* unique_inst,
     const std::vector<std::vector<std::unique_ptr<FlexDPNode>>>& nodes,
     const std::vector<std::pair<frMPin*, frInstTerm*>>& pins,
     bool& is_valid,
@@ -711,8 +716,8 @@ bool FlexPA::genPatternsCommit(
   for (int pin_idx = 0; pin_idx < (int) pins.size(); pin_idx++) {
     auto acc_point_idx = access_pattern[pin_idx];
     auto& [pin, inst_term] = pins[pin_idx];
-    target_obj = inst;
-    const int pin_access_idx = unique_insts_.getPAIndex(inst);
+    target_obj = unique_inst;
+    const int pin_access_idx = unique_insts_.getPAIndex(unique_inst);
     const auto pa = pin->getPinAccess(pin_access_idx);
     const auto access_point = pa->getAccessPoint(acc_point_idx);
     pin_to_access_point[pin] = access_point;
@@ -724,7 +729,7 @@ bool FlexPA::genPatternsCommit(
       auto rvia = via.get();
       temp_vias.push_back(std::move(via));
 
-      dbTransform xform = inst->getNoRotationTransform();
+      dbTransform xform = unique_inst->getNoRotationTransform();
       Point pt(access_point->getPoint());
       xform.apply(pt);
       rvia->setOrigin(pt);
@@ -741,7 +746,7 @@ bool FlexPA::genPatternsCommit(
   frCoord left_pt = std::numeric_limits<frCoord>::max();
   frCoord right_pt = std::numeric_limits<frCoord>::min();
 
-  for (auto& inst_term : inst->getInstTerms()) {
+  for (auto& inst_term : unique_inst->getInstTerms()) {
     if (isSkipInstTerm(inst_term.get())) {
       continue;
     }
@@ -778,8 +783,7 @@ bool FlexPA::genPatternsCommit(
   if (target_obj != nullptr
       && genPatternsGC({target_obj}, objs, Commit, &owners)) {
     pin_access_pattern->updateCost();
-    const int inst_idx = unique_insts_.getIndex(inst);
-    unique_inst_patterns_[inst_idx].push_back(std::move(pin_access_pattern));
+    unique_inst_patterns_[unique_inst].push_back(std::move(pin_access_pattern));
     // genPatternsPrint(nodes, pins);
     is_valid = true;
   } else {
@@ -811,8 +815,8 @@ void FlexPA::genPatternsPrintDebug(
   dbTransform xform;
   auto& [pin, inst_term] = pins[0];
   if (inst_term) {
-    frInst* inst = inst_term->getInst();
-    xform = inst->getNoRotationTransform();
+    frInst* unique_inst = inst_term->getInst();
+    xform = unique_inst->getNoRotationTransform();
   }
 
   std::cout << "failed pattern:";
@@ -822,9 +826,9 @@ void FlexPA::genPatternsPrintDebug(
     // non-virtual node
     if (pin_cnt != (int) pins.size()) {
       auto& [pin, inst_term] = pins[pin_cnt];
-      auto inst = inst_term->getInst();
+      auto unique_inst = inst_term->getInst();
       std::cout << " " << inst_term->getTerm()->getName();
-      const int pin_access_idx = unique_insts_.getPAIndex(inst);
+      const int pin_access_idx = unique_insts_.getPAIndex(unique_inst);
       auto pa = pin->getPinAccess(pin_access_idx);
       auto [curr_pin_idx, curr_acc_point_idx] = curr_node->getIdx();
       Point pt(pa->getAccessPoint(curr_acc_point_idx)->getPoint());
@@ -855,17 +859,17 @@ void FlexPA::genPatternsPrint(
     // non-virtual node
     if (pin_cnt != (int) pins.size()) {
       auto& [pin, inst_term] = pins[pin_cnt];
-      auto inst = inst_term->getInst();
-      const int pin_access_idx = unique_insts_.getPAIndex(inst);
+      auto unique_inst = inst_term->getInst();
+      const int pin_access_idx = unique_insts_.getPAIndex(unique_inst);
       auto pa = pin->getPinAccess(pin_access_idx);
       auto [curr_pin_idx, curr_acc_point_idx] = curr_node->getIdx();
       std::unique_ptr<frVia> via = std::make_unique<frVia>(
           pa->getAccessPoint(curr_acc_point_idx)->getViaDef());
       Point pt(pa->getAccessPoint(curr_acc_point_idx)->getPoint());
-      std::cout << " gccleanvia " << inst->getMaster()->getName() << " "
+      std::cout << " gccleanvia " << unique_inst->getMaster()->getName() << " "
                 << inst_term->getTerm()->getName() << " "
                 << via->getViaDef()->getName() << " " << pt.x() << " " << pt.y()
-                << " " << inst->getOrient().getString() << "\n";
+                << " " << unique_inst->getOrient().getString() << "\n";
     }
 
     curr_node = curr_node->getPrevNode();