Merge remote-tracking branch 'origin/master' into 3dblox-parser

Signed-off-by: osamahammad21 <[email protected]>

Author: osamahammad21

BUILD.bazel

@@ -2,9 +2,9 @@
 # Copyright (c) 2025-2025, The OpenROAD Authors
 
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
+load("//bazel:python_wrap_cc.bzl", "PYTHON_STABLE_API_DEFINE", "python_wrap_cc")
 load("//bazel:tcl_encode_or.bzl", "tcl_encode")
 load("//bazel:tcl_wrap_cc.bzl", "tcl_wrap_cc")
-load("//bazel:python_wrap_cc.bzl", "python_wrap_cc", "PYTHON_STABLE_API_DEFINE")
 
 package(
     features = [
@@ -44,8 +44,6 @@ config_setting(
     },
 )
 
-# TODO: once project is properly decomposed, we don't
-# need these blanked dependencies in multiple places anymore.
 OPENROAD_LIBRARY_DEPS = [
     ":openroad_version",
     ":ord",
@@ -138,16 +136,19 @@ cc_binary(
     name = "openroad",
     srcs = [
         "src/Main.cc",
-        "//bazel:runfiles",
     ],
     copts = OPENROAD_COPTS,
     features = ["-use_header_modules"],
-    malloc = "@tcmalloc//tcmalloc",
+    malloc = select({
+        "@platforms//os:linux": "@tcmalloc//tcmalloc",
+        "@platforms//os:macos": "@bazel_tools//tools/cpp:malloc",
+    }),
     visibility = ["//visibility:public"],
     deps = [
         ":openroad_lib",
         ":openroad_version",
         ":ord",
+        "//bazel:runfiles",
         "//src/cut",
         "//src/gui",
         "//src/sta:opensta_lib",
@@ -165,25 +166,6 @@ GUI_BUILD_FLAGS = select(
     },
 )
 
-cc_library(
-    name = "openroad_lib_private",
-    srcs = [
-        "src/Design.cc",
-        "src/Tech.cc",
-        "src/Timing.cc",
-    ],
-    copts = OPENROAD_COPTS,
-    defines = OPENROAD_DEFINES + GUI_BUILD_FLAGS,
-    features = ["-use_header_modules"],
-    includes = [
-        "include",
-    ],
-    deps = OPENROAD_LIBRARY_DEPS + [
-        "//src/sta:opensta_lib",
-        "@tk_tcl//:tcl",
-    ],
-)
-
 cc_library(
     name = "openroad_lib",
     srcs = [
@@ -267,39 +249,38 @@ tcl_wrap_cc(
     ],
 )
 
-
 # This target compiles the SWIG C++ wrapper into a shared library (.so)
 # that Python can load dynamically.
 cc_binary(
     name = "_openroadpy.so",
     srcs = [":openroad_swig-py"],
+    defines = [PYTHON_STABLE_API_DEFINE],
     linkshared = True,
     deps = [
         ":openroad_lib",  # Depends on the core odb C++ library
         ":ord",
-        "//src/odb",
-        "//src/ifp",
-        "//src/utl",
-        "//src/gpl",
         "//src/ant",
         "//src/cts",
         "//src/dpl",
         "//src/drt",
         "//src/exa",
         "//src/fin",
+        "//src/gpl",
         "//src/grt",
+        "//src/gui",
+        "//src/ifp",
+        "//src/odb",
         "//src/par",
         "//src/pdn",
         "//src/ppl",
         "//src/psm",
         "//src/rcx",
         "//src/stt",
-        "//src/gui",
         "//src/tap",
+        "//src/utl",
         "@boost.stacktrace",
         "@openroad_rules_python//python/cc:current_py_cc_headers",
     ],
-    defines = [PYTHON_STABLE_API_DEFINE],
 )
 
 # This packages the SWIG-generated Python wrapper (odb.py) and the
@@ -309,23 +290,23 @@ py_library(
     srcs = [":openroad_swig-py"],  # Use the .py output from the swig-py rule
     # The data attribute makes the .so file available at runtime.
     data = [":_openroadpy.so"],
+    # This allows imports relative to the workspace root.
+    imports = ["."],
+    visibility = ["//visibility:public"],
     deps = [
-        "//src/utl:utl_py",
         "//src/odb:odb_py",
+        "//src/utl:utl_py",
     ],
-    # This allows imports relative to the workspace root.
-    imports = ["."],
-    visibility = ["//visibility:public",]
 )
 
 python_wrap_cc(
     name = "openroad_swig-py",
     srcs = [
-        "src/OpenRoad-py.i",
-        ":error_swig-py",
-        "include/ord/Tech.h",
         "include/ord/Design.h",
+        "include/ord/Tech.h",
         "include/ord/Timing.h",
+        "src/OpenRoad-py.i",
+        ":error_swig-py",
     ],
     module = "openroadpy",
     root_swig_src = "src/OpenRoad-py.i",
@@ -334,25 +315,25 @@ python_wrap_cc(
         "src",
     ],
     deps = [
-        "//src/gpl:swig-py",
-        "//src/ifp:swig-py",
         "//src/ant:swig-py",
         "//src/cts:swig-py",
         "//src/dpl:swig-py",
         "//src/drt:swig-py",
         "//src/exa:swig-py",
         "//src/fin:swig-py",
+        "//src/gpl:swig-py",
         "//src/grt:swig-py",
+        "//src/ifp:swig-py",
+        "//src/odb:swig-py",
         "//src/par:swig-py",
         "//src/pdn:swig-py",
         "//src/ppl:swig-py",
         "//src/psm:swig-py",
         "//src/rcx:swig-py",
         "//src/stt:swig-py",
         "//src/tap:swig-py",
-        "//src/odb:swig-py",
         "//src/utl:swig-py",
-    ]
+    ],
 )
 
 filegroup(
@@ -376,4 +357,4 @@ filegroup(
     srcs = [
         "src/Design.i",
     ],
-)
+)

MODULE.bazel

@@ -154,7 +154,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "f9c37f21de8e1095276e878d1628ac7a2f7908ab",
+    commit = "2cf0198a49a220cfcabae35bba64b0034bbdbffc",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -163,10 +163,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-3780-g2f349ade",
+    image = "docker.io/openroad/orfs:v3.0-3845-gbefd38218",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "637ffa1af0f224e17e3d5cddbe6b45d9b00102016acc9e866226e8c4e830aeab",
+    sha256 = "4982a5b87588e4699f11deaed3286cba8b65d144e439c6f5845656abebfc0971",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -16,4 +16,5 @@ cc_library(
     deps = [
         "@rules_cc//cc/runfiles",
     ],
+    alwayslink = True,
 )

bazel/BUILD

@@ -6,6 +6,11 @@
 #include <optional>
 #include <string>
 
+#if defined(__APPLE__)
+#include <mach-o/dyld.h>
+#include <sys/param.h>
+#endif
+
 #include "rules_cc/cc/runfiles/runfiles.h"
 
 // Avoid adding any dependencies like boost.filesystem
@@ -19,7 +24,7 @@ static std::optional<std::string> getProgramLocation()
   char result[MAXPATHLEN + 1] = {'\0'};
   uint32_t path_len = MAXPATHLEN;
   if (_NSGetExecutablePath(result, &path_len) != 0) {
-    path_len = readlink("/proc/self/exe", result, MAXPATHLEN);
+    path_len = readlink(result, result, MAXPATHLEN);
   }
 #else
   char result[PATH_MAX + 1] = {'\0'};

bazel/InitRunFiles.cpp

@@ -75,8 +75,8 @@ _installCommonDev() {
     spdlogVersion=1.15.0
     gtestVersion=1.13.0
     gtestChecksum="a1279c6fb5bf7d4a5e0d0b2a4adb39ac"
-    abslVersion=20250814.0
-    abslChecksum="016feacd6a6b3b9a47ab844e61f4f7bd"
+    abslVersion=20240722.0
+    abslChecksum="740fb8f35ebdf82740c294bde408b9c0"
     bisonVersion=3.8.2
     bisonChecksum="1e541a097cda9eca675d29dd2832921f"
     flexVersion=2.6.4
@@ -322,6 +322,8 @@ _installOrTools() {
     os=$1
     osVersion=$2
     arch=$3
+    local skipSystemOrTools=$4
+
     orToolsVersionBig=9.11
     orToolsVersionSmall=${orToolsVersionBig}.4210
 
@@ -331,18 +333,20 @@ _installOrTools() {
     cd "${baseDir}"
 
     # Disable exit on error for 'find' command, as it might return non zero
-    set +euo pipefail
-    LIST=($(find /local* /opt* /lib* /usr* /bin* -type f -name "libortools.so*" 2>/dev/null))
-    # Bring back exit on error
-    set -euo pipefail
-    # Return if right version of or-tools is installed
-    for lib in ${LIST[@]}; do
-        if [[ "$lib" =~ .*"/libortools.so.${orToolsVersionSmall}" ]]; then
-            echo "OR-Tools is already installed"
-            CMAKE_PACKAGE_ROOT_ARGS+=" -D ortools_ROOT=$(realpath $(dirname $lib)/..) "
-            return
-        fi
-    done
+    if [[ "${skipSystemOrTools}" == "false" ]]; then
+      set +euo pipefail
+      LIST=($(find /local* /opt* /lib* /usr* /bin* -type f -name "libortools.so*" 2>/dev/null))
+      # Bring back exit on error
+      set -euo pipefail
+      # Return if right version of or-tools is installed
+      for lib in ${LIST[@]}; do
+          if [[ "$lib" =~ .*"/libortools.so.${orToolsVersionSmall}" ]]; then
+              echo "OR-Tools is already installed"
+              CMAKE_PACKAGE_ROOT_ARGS+=" -D ortools_ROOT=$(realpath $(dirname $lib)/..) "
+              return
+          fi
+      done
+    fi
 
     orToolsPath=${PREFIX:-"/opt/or-tools"}
     if [ "$(uname -m)" == "aarch64" ]; then
@@ -791,6 +795,11 @@ Usage: $0 -all
                                 #    like working around a firewall. This opens
                                 #    vulnerability to man-in-the-middle (MITM)
                                 #    attacks.
+       $0 -skip-system-or-tools
+                                # If true, does not perform a search of system
+                                # paths for a pre-installed or-tools library.
+                                # Instead, will install a separate version 
+                                # of or-tools
        $0 -save-deps-prefixes=FILE
                                 # Dumps OpenROAD build arguments and variables
                                 # to FILE
@@ -813,6 +822,7 @@ equivalenceDeps="no"
 CI="no"
 saveDepsPrefixes=""
 numThreads=$(nproc)
+skipSystemOrTools="false"
 # temp dir to download and compile
 baseDir=$(mktemp -d /tmp/DependencyInstaller-XXXXXX)
 
@@ -886,6 +896,9 @@ while [ "$#" -gt 0 ]; do
             alias wget="wget --no-check-certificate"
             export GIT_SSL_NO_VERIFY=true
             ;;
+        -skip-system-or-tools)
+            skipSystemOrTools="true"
+            ;;
         -save-deps-prefixes=*)
             saveDepsPrefixes=$(realpath ${1#*=})
             ;;
@@ -956,7 +969,7 @@ case "${os}" in
             else
                 ubuntuVersion=20.04
             fi
-            _installOrTools "ubuntu" "${ubuntuVersion}" "amd64"
+            _installOrTools "ubuntu" "${ubuntuVersion}" "amd64" ${skipSystemOrTools}
         fi
         ;;
     "Red Hat Enterprise Linux" | "Rocky Linux" | "AlmaLinux")
@@ -982,10 +995,10 @@ case "${os}" in
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
             if [[ "${rhelVersion}" == "8" ]]; then
-                    _installOrTools "AlmaLinux" "8.10" "x86_64"
+                    _installOrTools "AlmaLinux" "8.10" "x86_64" ${skipSystemOrTools}
             fi
             if [[ "${rhelVersion}" == "9" ]]; then
-                    _installOrTools "rockylinux" "9" "amd64"
+                    _installOrTools "rockylinux" "9" "amd64" ${skipSystemOrTools}
             fi
         fi
         ;;
@@ -1012,7 +1025,7 @@ EOF
         fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
-            _installOrTools "opensuse" "leap" "amd64"
+            _installOrTools "opensuse" "leap" "amd64" ${skipSystemOrTools}
         fi
         cat <<EOF
 To enable GCC-11 you need to run:
@@ -1035,7 +1048,7 @@ EOF
         fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
             _installCommonDev
-            _installOrTools "debian" "${debianVersion}" "amd64"
+            _installOrTools "debian" "${debianVersion}" "amd64" ${skipSystemOrTools}
         fi
         ;;
     *)