Merge remote-tracking branch 'origin/master' into HEAD

Author: oharboe

BUILD.bazel

@@ -104,7 +104,7 @@ OPENROAD_LIBRARY_DEPS = [
     "//src/upf:ui",
     "//src/utl",
     "//src/utl:ui",
-    "@edu_berkeley_abc//:abc-lib",
+    "//third-party/abc:abc-lib",
     ":ord",
 ] + select(
     {

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

@@ -25,7 +25,6 @@ http_archive(
 # This essentially reads as a TODO list of what needs to be upstreamed to BCR
 load("@rules_hdl//dependency_support/com_github_quantamhd_lemon:com_github_quantamhd_lemon.bzl", "com_github_quantamhd_lemon")
 load("@rules_hdl//dependency_support/com_github_westes_flex:com_github_westes_flex.bzl", "com_github_westes_flex")
-load("@rules_hdl//dependency_support/edu_berkeley_abc:edu_berkeley_abc.bzl", "edu_berkeley_abc")
 load("@rules_hdl//dependency_support/net_invisible_island_ncurses:net_invisible_island_ncurses.bzl", "net_invisible_island_ncurses")
 load("@rules_hdl//dependency_support/net_zlib:net_zlib.bzl", "net_zlib")
 load("@rules_hdl//dependency_support/org_gnu_bison:org_gnu_bison.bzl", "org_gnu_bison")
@@ -37,8 +36,6 @@ load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
 # Direct dependencies needed in Openroad
 com_github_quantamhd_lemon()
 
-edu_berkeley_abc()
-
 tk_tcl()
 
 # Swig exists in BCR, but in a newer version where we need to test how to make

WORKSPACE

@@ -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

@@ -417,6 +417,9 @@ set_debug_level(const char* tool_name,
   if (id == utl::UKN) {
     logger->error(utl::ORD, 15, "Unknown tool name {}", tool_name);
   }
+  if (id == utl::STA) {
+    getSta()->setDebugLevel(group, level);
+  }
   logger->setDebugLevel(id, group, level);
 }
 

src/OpenRoad.i

@@ -40,8 +40,8 @@ cc_library(
         "//src/odb",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.stacktrace",
-        "@edu_berkeley_abc//:abc-lib",
         "@tk_tcl//:tcl",
     ],
 )

src/cgt/BUILD

@@ -37,13 +37,13 @@ cc_library(
         "//src/rsz",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.bind",
         "@boost.config",
         "@boost.fusion",
         "@boost.lambda",
         "@boost.optional",
         "@boost.phoenix",
         "@boost.spirit",
-        "@edu_berkeley_abc//:abc-lib",
     ],
 )

src/cut/BUILD

@@ -37,7 +37,7 @@ cc_test(
         "//src/sta:opensta_lib",
         "//src/tst",
         "//src/utl",
-        "@edu_berkeley_abc//:abc-lib",
+        "//third-party/abc:abc-lib",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],