Merge branch 'master' of github.com:The-OpenROAD-Project-private/OpenROAD into grt-infinite-resources

Author: jfgava

BUILD.bazel

@@ -180,7 +180,7 @@ cc_binary(
         "//src/utl",
         "@boost.stacktrace",
         "@rules_cc//cc/runfiles",
-        "@tk_tcl//:tcl",
+        "@tcl_lang//:tcl",
     ],
 )
 
@@ -210,8 +210,10 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//src/sta:opensta_lib",
+        "@abseil-cpp//absl/base:core_headers",
+        "@abseil-cpp//absl/synchronization",
         "@boost.stacktrace",
-        "@tk_tcl//:tcl",
+        "@tcl_lang//:tcl",
     ] + OPENROAD_LIBRARY_DEPS,
 )
 
@@ -230,6 +232,7 @@ cc_library(
         "include/ord",
     ],
     visibility = ["//:__subpackages__"],
+    deps = ["@abseil-cpp//absl/synchronization"],
 )
 
 cc_library(

CMakeLists.txt

@@ -12,9 +12,11 @@ cmake_policy(SET CMP0086 NEW)
 # Allows <PackageName>_ROOT to be used
 cmake_policy(SET CMP0074 NEW)
 
-# Disallows <PACKAGENAME>_ROOT in find_package.
-# TODO: resolve absl/or-tools issue and switch to NEW
-cmake_policy(SET CMP0144 OLD)
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.27")
+  # Disallows <PACKAGENAME>_ROOT in find_package.
+  # TODO: resolve absl/or-tools issue and switch to NEW
+  cmake_policy(SET CMP0144 OLD)
+endif()
 
 # Allow AUTOUIC on generated source
 cmake_policy(SET CMP0071 NEW)

MODULE.bazel

@@ -71,6 +71,7 @@ bazel_dep(name = "spdlog", version = "1.15.1")
 bazel_dep(name = "tcmalloc", version = "0.0.0-20250927-12f2552")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 bazel_dep(name = "yaml-cpp", version = "0.8.0")
+bazel_dep(name = "tcl_lang", version = "8.6.16.bcr.1")
 
 # Make compilation DB (and possibly build cleaner)
 bazel_dep(name = "bant", version = "0.2.4", dev_dependency = True)
@@ -146,7 +147,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "72db79cc90376851e27ee484c1ae1e23c2e30f44",
+    commit = "63ecaa366a7418d7afaa3777b96daa8401a64983",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -155,10 +156,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-4512-g528ad3d8a",
+    image = "docker.io/openroad/orfs:26Q1-333-g9ad095627",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "087122e12c90edcb3ebfc452a3238417fbc78e1135f5b43feaf7162d885cada1",
+    sha256 = "c89d51c311c16d2f0e6aae43648d6ffb0b1befd4cc4a122c683684361776f838",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -24,13 +24,9 @@ http_archive(
 # Direct dependencies needed in openroad, and others that these in turn need.
 # This essentially reads as a TODO list of what needs to be upstreamed to BCR
 load("@rules_hdl//dependency_support/com_github_westes_flex:com_github_westes_flex.bzl", "com_github_westes_flex")
-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")
 load("@rules_hdl//dependency_support/org_pcre_ftp:org_pcre_ftp.bzl", "org_pcre_ftp")
 load("@rules_hdl//dependency_support/org_swig:org_swig.bzl", "org_swig")
-load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
-
-tk_tcl()
 
 # Swig exists in BCR, but in a newer version where we need to test how to make
 # it to work with TCL.
@@ -42,7 +38,4 @@ com_github_westes_flex()
 
 org_gnu_bison()
 
-# remaining user is tcl. Once we can get that from BCR, this can go.
-net_zlib()  # BCR has @zlib we use, but some above dep uses it w/ differet name
-
 org_pcre_ftp()  # there is a newer pcre2 in BCR

WORKSPACE

@@ -20,6 +20,9 @@ cc_library(
     srcs = [
         "InitRunFiles.cpp",
     ],
+    data = [
+        "@tcl_lang//:tcl_core",
+    ],
     visibility = ["//visibility:public"],
     deps = [
         "@rules_cc//cc/runfiles",

bazel/BUILD

@@ -1,6 +1,7 @@
 #include <unistd.h>
 
 #include <climits>
+#include <cstdlib>
 #include <iostream>
 #include <memory>
 #include <optional>
@@ -55,11 +56,11 @@ class BazelInitializer
     }
 
     // Set the TCL_LIBRARY environment variable
-    const std::string tcl_path = runfiles->Rlocation("tk_tcl/library/");
+    const std::string tcl_path = runfiles->Rlocation("tcl_lang/library/");
     if (!tcl_path.empty()) {
-      setenv("TCL_LIBRARY", tcl_path.c_str(), 0);
+      setenv("TCL_LIBRARY", tcl_path.c_str(), true);
     } else {
-      std::cerr << "Error: Could not locate 'tk_tcl/library/' in runfiles."
+      std::cerr << "Error: Could not locate 'tcl_lang/library/' in runfiles."
                 << std::endl;
       std::exit(1);
     }

bazel/InitRunFiles.cpp

@@ -24,10 +24,6 @@ def _tcl_encode_sta_impl(ctx):
         arguments = [args],
         tools = [ctx.executable._tclsh, ctx.file._encode_script],
         executable = ctx.executable._tclsh,
-        env = {
-            # FIXME why is this needed?
-            "TCL_LIBRARY": ctx.executable._tclsh.path + ".runfiles/tk_tcl/library",
-        },
     )
     return [DefaultInfo(files = depset([output_file]))]
 
@@ -51,7 +47,7 @@ tcl_encode_sta = rule(
             allow_single_file = True,
         ),
         "_tclsh": attr.label(
-            default = "@tk_tcl//:tclsh",
+            default = "@tcl_lang//:tclsh",
             executable = True,
             cfg = "exec",
         ),

bazel/tcl_encode_sta.bzl

@@ -8,7 +8,8 @@
   fetchFromGitHub,
   fetchzip,
   libsForQt5,
-  boost183,
+  abseil-cpp,
+  boost189,
   eigen,
   cudd,
   ninja,
@@ -26,51 +27,50 @@
   clp,
   cbc,
   re2,
-  swig4,
+  swig,
   pkg-config,
   cmake,
   gnumake,
   flex,
   bison,
-  clang-tools_14,
+  clang-tools,
   gtest,
   # or-tools
   stdenv,
   overrideSDK,
   git,
   yaml-cpp,
-}: let
+}:
+let
   or-tools' =
     (or-tools.override {
       ## Alligned alloc not available on the default SDK for x86_64-darwin (10.12!!)
-      stdenv =
-        if stdenv.isDarwin
-        then (overrideSDK stdenv "11.0")
-        else stdenv;
-    })
-    .overrideAttrs (finalAttrs: previousAttrs: {
-      # Based on https://github.com/google/or-tools/commit/af44f98dbeb905656b5a9fc664b5fdcffcbe1f60
-      # Stops CMake going haywire on reconfigures
-      postPatch =
-        previousAttrs.postPatch
-        + ''
-          sed -Ei.bak 's/(NOT\s+\w+_FOUND\s+AND\s+)+//' cmake/ortoolsConfig.cmake.in
-          sed -Ei.bak 's/NOT absl_FOUND/NOT TARGET absl::base/' cmake/ortoolsConfig.cmake.in
-        '';
-    });
+      stdenv = if stdenv.isDarwin then (overrideSDK stdenv "11.0") else stdenv;
+    }).overrideAttrs
+      (
+        finalAttrs: previousAttrs: {
+          # Based on https://github.com/google/or-tools/commit/af44f98dbeb905656b5a9fc664b5fdcffcbe1f60
+          # Stops CMake going haywire on reconfigures
+          postPatch = previousAttrs.postPatch + ''
+            sed -Ei.bak 's/(NOT\s+\w+_FOUND\s+AND\s+)+//' cmake/ortoolsConfig.cmake.in
+            sed -Ei.bak 's/NOT absl_FOUND/NOT TARGET absl::base/' cmake/ortoolsConfig.cmake.in
+          '';
+        }
+      );
   fetchedGtest = fetchzip {
     url = "https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip";
     sha256 = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U=";
   };
-  lemon-graph' =
-    lemon-graph.overrideAttrs (finalAttrs: previousAttrs: {
+  lemon-graph' = lemon-graph.overrideAttrs (
+    finalAttrs: previousAttrs: {
       src = fetchFromGitHub {
         owner = "The-OpenROAD-Project";
         repo = "lemon-graph";
         rev = "f871b10396270cfd09ffddc4b6ead07722e9c232";
         sha256 = "snqjc82vtgKC5uGu7V6Hhcf7YzRk0xHJDEOCN91iywI=";
       };
-  });
+    }
+  );
   self = clangStdenv.mkDerivation (finalAttrs: {
     name = "openroad";
 
@@ -83,58 +83,62 @@
       "-DVERBOSE=1"
       "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=${fetchedGtest}"
     ];
-    
+
     postPatch = ''
       patchShebangs .
     '';
-    
+
     shellHook = ''
-      alias ord-format-changed="${git}/bin/git diff --name-only | grep -E '\.(cpp|cc|c|h|hh)$' | xargs clang-format -i -style=file:.clang-format"; 
+      alias ord-format-changed="${git}/bin/git diff --name-only | grep -E '\.(cpp|cc|c|h|hh)$' | xargs clang-format -i -style=file:.clang-format";
     '';
-    
+
     qt5Libs = [
       libsForQt5.qt5.qtbase
       libsForQt5.qt5.qtcharts
       libsForQt5.qt5.qtsvg
       libsForQt5.qt5.qtdeclarative
     ];
-    
-    QT_PLUGIN_PATH = lib.makeSearchPathOutput "bin" "lib/qt-${libsForQt5.qt5.qtbase.version}/plugins" self.qt5Libs;
+
+    QT_PLUGIN_PATH =
+      lib.makeSearchPathOutput "bin" "lib/qt-${libsForQt5.qt5.qtbase.version}/plugins"
+        self.qt5Libs;
 
     buildInputs = self.qt5Libs ++ [
-      boost183
-      eigen
+      abseil-cpp
+      boost189
+      cbc
+      clp
       cudd
-      tcl
+      eigen
+      glpk
+      gtest
+      libffi
+      llvmPackages.openmp
       python3
+      re2
       readline
-      tclreadline
       spdlog
-      libffi
-      llvmPackages.openmp
+      tcl
+      tclreadline
+      yaml-cpp
+      zlib
 
-      lemon-graph'
+      # Local derivations
       or-tools'
-      glpk
-      zlib
-      clp
-      cbc
-      re2
-      gtest
-      yaml-cpp
+      lemon-graph'
     ];
 
     nativeBuildInputs = [
-      swig4
-      pkg-config
+      bison
+      clang-tools
       cmake
-      ninja
-      gnumake
       flex
-      bison
+      gnumake
       libsForQt5.wrapQtAppsHook
-      clang-tools_14
+      ninja
+      pkg-config
+      swig
     ];
   });
 in
-  self
+self

default.nix

@@ -49,6 +49,16 @@ done >> compile_flags.txt
 # Qt include files check for this
 echo '-fPIC' >> compile_flags.txt
 
+# Python include bindings.
+for f in bazel-out/../../../external/*/include/python3.*/Python.h; do
+  if [ -f "${f}" ]; then
+    PY_INC="$(dirname "${f}")"
+    echo "-I${PY_INC}"
+    echo "-I$(realpath "${PY_INC}")"  # work around clangd bug
+    break
+  fi
+done >> compile_flags.txt
+
 # Since we don't do per-file define extraction in compile_flag.txt,
 # add them here globally
 cat >> compile_flags.txt <<EOF