Merge branch 'master' into mpl-notch-penalty

Author: joaomai

BUILD.bazel

@@ -8,7 +8,7 @@ load("//bazel:tcl_wrap_cc.bzl", "tcl_wrap_cc")
 package(
     features = [
         "-parse_headers",
-        "-layering_check",
+        "layering_check",
         # TODO(b/299593765): Fix strict ordering.
         "-libcxx_assertions",
     ],
@@ -84,6 +84,8 @@ OPENROAD_LIBRARY_DEPS = [
     "//src/psm",
     "//src/rcx",
     "//src/rcx:ui",
+    "//src/rmp",
+    "//src/rmp:ui",
     "//src/rsz",
     "//src/rsz:ui",
     "//src/stt",
@@ -129,24 +131,20 @@ cc_binary(
     name = "openroad",
     srcs = [
         "src/Main.cc",
-        "src/OpenRoad.cc",
-        ":openroad_swig",
-        ":openroad_tcl",
-        ":rmp_swig",
-        ":rmp_tcl",
         "//bazel:runfiles",
     ],
     copts = OPENROAD_COPTS,
     features = ["-use_header_modules"],
     malloc = "@tcmalloc//tcmalloc",
     visibility = ["//visibility:public"],
     deps = [
-        ":openroad_lib_private",
+        ":openroad_lib",
         ":openroad_version",
-        "//src/odb",
-        "//src/rsz",
+        "//:ord",
+        "//src/gui",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "@boost.stacktrace",
         "@rules_cc//cc/runfiles",
         "@tk_tcl//:tcl",
     ],
@@ -165,21 +163,17 @@ cc_library(
         "src/Design.cc",
         "src/Tech.cc",
         "src/Timing.cc",
-    ] + glob([
-        "src/rmp/src/*.h",
-        "src/rmp/src/*.cpp",
-    ]),
-    hdrs = glob([
-        "src/rmp/include/rmp/*.h",
-    ]),
+    ],
     copts = OPENROAD_COPTS,
     defines = OPENROAD_DEFINES + GUI_BUILD_FLAGS,
     features = ["-use_header_modules"],
     includes = [
         "include",
-        "src/rmp/include",
     ],
-    deps = OPENROAD_LIBRARY_DEPS,
+    deps = OPENROAD_LIBRARY_DEPS + [
+        "//src/sta:opensta_lib",
+        "@tk_tcl//:tcl",
+    ]
 )
 
 cc_library(
@@ -191,22 +185,19 @@ cc_library(
         "src/Timing.cc",
         ":openroad_swig",
         ":openroad_tcl",
-        ":rmp_swig",
-        ":rmp_tcl",
-    ] + glob([
-        "src/rmp/src/*.cpp",
-        "src/rmp/src/*.h",
-    ]),
-    hdrs = glob(["src/rmp/include/rmp/*.h"]),
+    ],
     copts = OPENROAD_COPTS,
     defines = OPENROAD_DEFINES + GUI_BUILD_FLAGS,
     features = ["-use_header_modules"],
     includes = [
         "include",
-        "src/rmp/include",
     ],
     visibility = ["//visibility:public"],
-    deps = OPENROAD_LIBRARY_DEPS,
+    deps = OPENROAD_LIBRARY_DEPS + [
+        "//src/sta:opensta_lib",
+        "@boost.stacktrace",
+        "@tk_tcl//:tcl",
+    ]
 )
 
 cc_library(
@@ -254,15 +245,6 @@ tcl_encode(
     namespace = "ord",
 )
 
-tcl_encode(
-    name = "rmp_tcl",
-    srcs = [
-        "src/rmp/src/rmp.tcl",
-    ],
-    char_array_name = "rmp_tcl_inits",
-    namespace = "rmp",
-)
-
 tcl_wrap_cc(
     name = "openroad_swig",
     srcs = [
@@ -277,22 +259,6 @@ tcl_wrap_cc(
     ],
 )
 
-tcl_wrap_cc(
-    name = "rmp_swig",
-    srcs = [
-        "src/rmp/src/rmp.i",
-        ":error_swig",
-        "//src/sta:sta_swig_files",
-    ],
-    module = "rmp",
-    namespace_prefix = "rmp",
-    root_swig_src = "src/rmp/src/rmp.i",
-    swig_includes = [
-        "src/rmp/src",
-        "src/sta",
-    ],
-)
-
 filegroup(
     name = "error_swig",
     srcs = [

WORKSPACE

@@ -8,9 +8,9 @@ workspace(name = "openroad")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-rules_hdl_git_hash = "56da46a87e8e5a4dbe84c0bbe5d00e92b936494f"
+rules_hdl_git_hash = "cf2bd95334741db74b39b47fa1d4622b0d45ce6c"
 
-rules_hdl_git_sha256 = "dc184ad0fe92f315eb5600fb3293c94ce1fce3fc1d0fd79400107038ed917d70"
+rules_hdl_git_sha256 = "137e1fbde970a41f295ca348f9105bc7eedd6640374ec7f4a8abaee9a2cfc2d0"
 
 http_archive(
     name = "rules_hdl",

etc/DependencyInstaller.sh

@@ -91,7 +91,7 @@ _installCommonDev() {
     cmakeBin=${cmakePrefix}/bin/cmake
     if [[ ! -f ${cmakeBin} || -z $(${cmakeBin} --version | grep ${cmakeVersionBig}) ]]; then
         cd "${baseDir}"
-        eval wget https://cmake.org/files/v${cmakeVersionBig}/cmake-${cmakeVersionSmall}-${osName}-${arch}.sh
+        eval wget https://github.com/Kitware/CMake/releases/download/v${cmakeVersionSmall}/cmake-${cmakeVersionSmall}-linux-${arch}.sh
         md5sum -c <(echo "${cmakeChecksum} cmake-${cmakeVersionSmall}-${osName}-${arch}.sh") || exit 1
         chmod +x cmake-${cmakeVersionSmall}-${osName}-${arch}.sh
         ./cmake-${cmakeVersionSmall}-${osName}-${arch}.sh --skip-license --prefix=${cmakePrefix}
@@ -861,10 +861,10 @@ while [ "$#" -gt 0 ]; do
             export GIT_SSL_NO_VERIFY=true
             ;;
         -save-deps-prefixes=*)
-            saveDepsPrefixes=$(realpath ${1#-save-deps-prefixes=})
+            saveDepsPrefixes=$(realpath ${1#*=})
             ;;
         -threads=*)
-            numThreads=${1}
+            numThreads=${1#*=}
             ;;
         *)
             echo "unknown option: ${1}" >&2
@@ -933,11 +933,13 @@ case "${os}" in
             _installOrTools "ubuntu" "${ubuntuVersion}" "amd64"
         fi
         ;;
-    "Red Hat Enterprise Linux" | "Rocky Linux")
+    "Red Hat Enterprise Linux" | "Rocky Linux" | "AlmaLinux")
     if [[ "${os}" == "Red Hat Enterprise Linux" ]]; then
         rhelVersion=$(rpm -q --queryformat '%{VERSION}' redhat-release | cut -d. -f1)
     elif  [[ "${os}" == "Rocky Linux" ]]; then
         rhelVersion=$(rpm -q --queryformat '%{VERSION}' rocky-release | cut -d. -f1)
+    elif [[ "${os}" == "AlmaLinux" ]]; then
+        rhelVersion=$(rpm -q --queryformat '%{VERSION}' almalinux-release | cut -d. -f1)
     fi
         if [[ "${rhelVersion}" != "8" ]] && [[ "${rhelVersion}" != "9" ]]; then
             echo "ERROR: Unsupported ${rhelVersion} version. Versions '8' and '9' are supported."
@@ -1018,4 +1020,8 @@ esac
 if [[ ! -z ${saveDepsPrefixes} ]]; then
     mkdir -p "$(dirname $saveDepsPrefixes)"
     echo "$CMAKE_PACKAGE_ROOT_ARGS" > $saveDepsPrefixes
+    # Fix permissions if running as root to allow user access
+    if [[ $(id -u) == 0 && ! -z "${SUDO_USER+x}" ]]; then
+        chown "$SUDO_USER:$(id -gn "$SUDO_USER")" "$saveDepsPrefixes" 2>/dev/null || true
+    fi
 fi

src/cts/test/balance_levels.defok

@@ -1,5 +1,5 @@
 VERSION 5.8 ;
-DIVIDERCHAR "|" ;
+DIVIDERCHAR "/" ;
 BUSBITCHARS "[]" ;
 DESIGN multi_sink ;
 UNITS DISTANCE MICRONS 2000 ;

src/dbSta/include/db_sta/dbNetwork.hh

@@ -298,11 +298,26 @@ class dbNetwork : public ConcreteNetwork
   NetTermIterator* termIterator(const Net* net) const override;
   const Net* highestConnectedNet(Net* net) const override;
   bool isSpecial(Net* net);
+
+  // Get the flat net (dbNet) with the Net*.
+  // If the net is a hierarchical net (dbModNet), return nullptr
   dbNet* flatNet(const Net* net) const;
-  Net* getOrFindFlatNet(const Net* net) const;
-  dbNet* getOrFindFlatDbNet(const Net* net) const;
-  Net* getOrFindFlatNet(const Pin* pin) const;
-  dbNet* getOrFindFlatDbNet(const Pin* pin) const;
+
+  // Given a net or pin that may be hierarchical, find the corresponding flat
+  // dbNet by traversing the netlist.
+  // If the net is already a flat net (dbNet), it is returned as is.
+  // If the net is a hierarchical net (dbModNet), find the associated dbNet.
+  dbNet* findFlatDbNet(const Net* net) const;
+  dbNet* findFlatDbNet(const Pin* pin) const;
+
+  // Given a net that may be hierarchical, find the corresponding flat dbNet by
+  // traversing the netlist and return it as Net*.
+  // If the net is already a flat net, it is returned as is.
+  // If the net is a hierarchical net (dbModNet), find the associated dbNet and
+  // return it as Net*.
+  Net* findFlatNet(const Net* net) const;
+  Net* findFlatNet(const Pin* pin) const;
+
   bool hasPort(const Net* net) const;
 
   ////////////////////////////////////////////////////////////////

src/dbSta/src/dbNetwork.cc

@@ -2655,7 +2655,7 @@ Net* dbNetwork::mergedInto(Net*)
 
 bool dbNetwork::isSpecial(Net* net)
 {
-  dbNet* db_net = getOrFindFlatDbNet(net);
+  dbNet* db_net = findFlatDbNet(net);
   return (db_net && db_net->isSpecial());
 }
 
@@ -3977,15 +3977,15 @@ void dbNetwork::checkAxioms()
 // If the net is already a flat net, it is returned as is.
 // If the net is a hierarchical net (dbModNet), find the associated dbNet and
 // return it as Net*.
-Net* dbNetwork::getOrFindFlatNet(const Net* net) const
+Net* dbNetwork::findFlatNet(const Net* net) const
 {
-  return dbToSta(getOrFindFlatDbNet(net));
+  return dbToSta(findFlatDbNet(net));
 }
 
 // Given a net that may be hierarchical, find the corresponding flat dbNet.
 // If the net is already a flat net (dbNet), it is returned as is.
 // If the net is a hierarchical net (dbModNet), find the associated dbNet.
-dbNet* dbNetwork::getOrFindFlatDbNet(const Net* net) const
+dbNet* dbNetwork::findFlatDbNet(const Net* net) const
 {
   if (!net) {
     return nullptr;
@@ -4010,14 +4010,14 @@ dbNet* dbNetwork::getOrFindFlatDbNet(const Net* net) const
 
 // Find the flat net connected to the pin.
 // This function handles both internal instance pins and top-level port pins.
-Net* dbNetwork::getOrFindFlatNet(const Pin* pin) const
+Net* dbNetwork::findFlatNet(const Pin* pin) const
 {
-  return dbToSta(getOrFindFlatDbNet(pin));
+  return dbToSta(findFlatDbNet(pin));
 }
 
 // Find the flat net (dbNet) connected to the pin in the OpenDB database.
 // This function handles both internal instance pins and top-level port pins.
-dbNet* dbNetwork::getOrFindFlatDbNet(const Pin* pin) const
+dbNet* dbNetwork::findFlatDbNet(const Pin* pin) const
 {
   dbNet* db_net = nullptr;
   if (isTopLevelPort(pin)) {

src/est/src/EstimateParasitics.cpp

@@ -993,7 +993,7 @@ SteinerTree* EstimateParasitics::makeSteinerTree(const Pin* drvr_pin)
   /*
     Handle hierarchy. Make sure all traversal on dbNets.
    */
-  odb::dbNet* db_net = db_network_->getOrFindFlatDbNet(drvr_pin);
+  odb::dbNet* db_net = db_network_->findFlatDbNet(drvr_pin);
   Net* net = db_network_->dbToSta(db_net);
 
   debugPrint(logger_, EST, "steiner", 1, "Net {}", sdc_network->pathName(net));

src/gpl/test/clust02.defok

@@ -1,5 +1,5 @@
 VERSION 5.8 ;
-DIVIDERCHAR "|" ;
+DIVIDERCHAR "/" ;
 BUSBITCHARS "[]" ;
 DESIGN top ;
 UNITS DISTANCE MICRONS 1000 ;