Merge branch 'master' into nested_journal

Author: erendn

MODULE.bazel

@@ -162,7 +162,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "e2749923bad0203342d1041f8d01c3514d262402",
+    commit = "c8fbabde2a4ecb9b34a9bfb2947bc370bd0d5ee0",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -171,10 +171,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 orfs.default(
     # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-4119-gb2918bafb",
+    image = "docker.io/openroad/orfs:v3.0-4123-g30da7ceff",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "6e3228200ec04904d2c912a551ba440d17a4ac1e05fad8ac2d7be35513bfeea4",
+    sha256 = "974844d2c888227a07f4d6a4e1c7b969a61723f3ecb7eb72c5e1145d8d33a7d0",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -29,3 +29,7 @@ RUN apt-get -y update \
       python3 \
       python3-yaml \
       time
+
+RUN groupadd -g 9000 user \
+    && useradd -u 9000 -g 9000 -m -s /bin/bash user
+USER user

bazel/Dockerfile

@@ -34,6 +34,8 @@
 #include "dft/MakeDft.hh"
 #include "dpl/MakeOpendp.h"
 #include "dpl/Opendp.h"
+#include "drt/MakeTritonRoute.h"
+#include "drt/TritonRoute.h"
 #include "dst/Distributed.h"
 #include "dst/MakeDistributed.h"
 #include "est/EstimateParasitics.h"
@@ -81,8 +83,6 @@
 #include "stt/MakeSteinerTreeBuilder.h"
 #include "tap/MakeTapcell.h"
 #include "tap/tapcell.h"
-#include "triton_route/MakeTritonRoute.h"
-#include "triton_route/TritonRoute.h"
 #include "upf/MakeUpf.h"
 #include "utl/CallBackHandler.h"
 #include "utl/Logger.h"

src/OpenRoad.cc

@@ -147,7 +147,7 @@ class Opendp
 
   using MasterByImplant = std::map<odb::dbTechLayer*, dbMasterSeq>;
 
-  using YCoordToGap = std::map<DbuY, std::vector<GapInfo*>>;
+  using YCoordToGap = std::map<DbuY, std::vector<std::unique_ptr<GapInfo>>>;
 
   friend class OpendpTest_IsPlaced_Test;
   friend class Graphics;
@@ -290,7 +290,7 @@ class Opendp
   void insertDecapInPos(odb::dbMaster* master,
                         const DbuX& pos_x,
                         const DbuY& pos_y);
-  void insertDecapInRow(const std::vector<GapInfo*>& gaps,
+  void insertDecapInRow(const std::vector<std::unique_ptr<GapInfo>>& gaps,
                         DbuY gap_y,
                         DbuX irdrop_x,
                         DbuY irdrop_y,
@@ -333,7 +333,7 @@ class Opendp
   bool have_fillers_ = false;
 
   // Decap placement.
-  std::vector<DecapCell*> decap_masters_;
+  std::vector<std::unique_ptr<DecapCell>> decap_masters_;
   int decap_count_ = 0;
   YCoordToGap gaps_;
 

src/dpl/include/dpl/Opendp.h

@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -83,7 +84,8 @@ void Opendp::prepareDecapAndGaps()
   // Sort decaps cells in descending order
   std::sort(decap_masters_.begin(),
             decap_masters_.end(),
-            [](const DecapCell* decap1, const DecapCell* decap2) {
+            [](const std::unique_ptr<DecapCell>& decap1,
+               const std::unique_ptr<DecapCell>& decap2) {
               return decap1->capacitance > decap2->capacitance;
             });
 
@@ -92,11 +94,11 @@ void Opendp::prepareDecapAndGaps()
   int gaps_count = 0;
   // Sort each gap vector for X position
   for (auto& it : gaps_) {
-    std::sort(it.second.begin(),
-              it.second.end(),
-              [](const GapInfo* gap1, const GapInfo* gap2) {
-                return gap1->x < gap2->x;
-              });
+    std::sort(
+        it.second.begin(),
+        it.second.end(),
+        [](const std::unique_ptr<GapInfo>& gap1,
+           const std::unique_ptr<GapInfo>& gap2) { return gap1->x < gap2->x; });
     gaps_count += it.second.size();
   }
 
@@ -166,19 +168,20 @@ void Opendp::insertDecapCells(const double target, IRDropByPoint& psm_ir_drops)
                 total_cap);
 }
 
-void Opendp::insertDecapInRow(const std::vector<GapInfo*>& gaps,
+void Opendp::insertDecapInRow(const std::vector<std::unique_ptr<GapInfo>>& gaps,
                               const DbuY gap_y,
                               const DbuX irdrop_x,
                               const DbuY irdrop_y,
                               double& total,
                               const double& target)
 {
   // Find gap in same row and x near the ir drop
-  auto find_gap = std::lower_bound(
-      gaps.begin(),
-      gaps.end(),
-      irdrop_x,
-      [](const GapInfo* elem, const DbuX& value) { return elem->x < value; });
+  auto find_gap
+      = std::lower_bound(gaps.begin(),
+                         gaps.end(),
+                         irdrop_x,
+                         [](const std::unique_ptr<GapInfo>& elem,
+                            const DbuX& value) { return elem->x < value; });
   // if this row has free gap with x <= xpoint <= x + width
   if (find_gap != gaps.end()
       && ((*find_gap)->x + (*find_gap)->width) >= irdrop_x

src/dpl/src/DecapPlacement.cpp

@@ -18,6 +18,7 @@
 #include "dpl/OptMirror.h"
 #include "graphics/DplObserver.h"
 #include "infrastructure/Coordinates.h"
+#include "infrastructure/DecapObjects.h"
 #include "infrastructure/Grid.h"
 #include "infrastructure/Objects.h"
 #include "infrastructure/Padding.h"

src/dpl/src/Opendp.cpp

@@ -194,7 +194,7 @@ cc_library(
         "src/ta/FlexTA_rq.cpp",
     ],
     hdrs = [
-        "include/triton_route/TritonRoute.h",
+        "include/drt/TritonRoute.h",
     ],
     copts = [
         "-Isrc/drt/src",
@@ -225,7 +225,7 @@ cc_library(
 cc_library(
     name = "ui",
     srcs = [
-        "include/triton_route/TritonRoute.h",
+        "include/drt/TritonRoute.h",
         "src/AbstractGraphicsFactory.h",
         "src/GraphicsFactory.cpp",
         "src/GraphicsFactory.h",
@@ -256,7 +256,7 @@ cc_library(
         ":tcl",
     ],
     hdrs = [
-        "include/triton_route/MakeTritonRoute.h",
+        "include/drt/MakeTritonRoute.h",
     ],
     copts = [
         "-Isrc/drt/src",
@@ -312,7 +312,7 @@ tcl_wrap_cc(
 python_wrap_cc(
     name = "swig-py",
     srcs = [
-        "include/triton_route/TritonRoute.h",
+        "include/drt/TritonRoute.h",
         "src/TritonRoute-py.i",
         "//:error_swig-py",
     ],