Merge remote-tracking branch 'private/master' into dpl-cell-height

Author: gudeh

.gitmodules

@@ -6,4 +6,4 @@
 	url = ../../The-OpenROAD-Project/abc.git
 [submodule "third-party/slang-elab"]
 	path = third-party/slang-elab
-	url = https://github.com/povik/yosys-slang
+	url = ../../povik/yosys-slang.git

MODULE.bazel

@@ -23,7 +23,7 @@ single_version_override(
 
 bazel_dep(name = "abseil-cpp", version = "20260107.1")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "coin-or-lemon", version = "1.3.1")
+bazel_dep(name = "coin-or-lemon", version = "1.3.1.bcr.1")
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_bison", version = "0.3.1")
 bazel_dep(name = "rules_cc", version = "0.2.18")
@@ -158,18 +158,7 @@ archive_override(
 )
 
 bazel_dep(name = "yosys", version = "0.62.bcr.2", dev_dependency = True)
-
-# yosys-slang is not on BCR. Pin to a commit on povik/yosys-slang master
-# that has the upstream Bazel build (povik/yosys-slang#310) and the
-# slang.so visibility fix (povik/yosys-slang#311). Submodules pull in
-# vendored slang and fmt sources.
-bazel_dep(name = "yosys-slang", dev_dependency = True)
-git_override(
-    module_name = "yosys-slang",
-    commit = "7753ea70431d85929292b90c33b32f6dbdb3b048",
-    init_submodules = True,
-    remote = "https://github.com/povik/yosys-slang.git",
-)
+bazel_dep(name = "yosys-slang", version = "0.0.0", dev_dependency = True)
 
 # --- Extensions ---
 

MODULE.bazel.lock

@@ -61,6 +61,21 @@ fi
 ABS_DEST="$(realpath "$DEST_DIR")"
 echo "OpenROAD binary installed to $ABS_DEST"
 
+# Install man pages (cat/ and html/ generated by //docs:man_pages).
+MAN_CAT_SRC="$(rlocation openroad/docs/man_pages/cat 2>/dev/null || true)"
+if [ -n "$MAN_CAT_SRC" ] && [ -d "$MAN_CAT_SRC" ]; then
+    MAN_DIR="$ABS_DEST/share/openroad/man"
+    mkdir -p "$MAN_DIR"
+    rm -rf "$MAN_DIR/cat"
+    cp -rf "$MAN_CAT_SRC" "$MAN_DIR/"
+    MAN_HTML_SRC="$(rlocation openroad/docs/man_pages/html 2>/dev/null || true)"
+    if [ -n "$MAN_HTML_SRC" ] && [ -d "$MAN_HTML_SRC" ]; then
+        rm -rf "$MAN_DIR/html"
+        cp -rf "$MAN_HTML_SRC" "$MAN_DIR/"
+    fi
+    echo "OpenROAD man pages installed to $MAN_DIR"
+fi
+
 # Remove any previously installed desktop entry and icon before (re)installing,
 # mirroring the binary artifact cleanup above. This runs unconditionally so a
 # prior GUI install is cleaned up even when the current install is not a GUI

bazel/install.sh

@@ -10,6 +10,14 @@ the real work is delegated to the `bazel-manpages` Makefile target.
 Host requirements: pandoc, nroff (groff), col (bsdextrautils), python3>=3.10.
 """
 
+def _man_pages_resource_set(_os, _num_inputs):
+    # The 'cat web' make below fans out with -j$(nproc), so this action uses
+    # the whole host. Reserve all local CPUs to keep Bazel from co-scheduling
+    # other heavy actions alongside it and oversubscribing the machine. Bazel
+    # clamps the request to the cores actually available, so this is safe on
+    # small CI hosts too.
+    return {"cpu": 512.0}
+
 def _man_pages_impl(ctx):
     cat_dir = ctx.actions.declare_directory("cat")
     html_dir = ctx.actions.declare_directory("html")
@@ -18,14 +26,25 @@ def _man_pages_impl(ctx):
 set -euo pipefail
 CAT_OUT="$PWD/{cat_out}"
 HTML_OUT="$PWD/{html_out}"
-make --no-print-directory -C docs -f Makefile bazel-manpages \\
+# Two phases: 'preprocess' (serial) generates the md/man*/*.md sources, then
+# 'cat web' fan out pandoc/nroff in parallel. They cannot share one -j make
+# invocation: cat/web read the md files preprocess produces, and a parallel
+# build has no dependency edge forcing preprocess to finish first. Running
+# 'cat web' as a second invocation also re-parses the Makefile so its
+# $(wildcard md/man*/*.md) picks up the freshly generated sources.
+# nproc is GNU coreutils (absent on stock macOS); fall back to sysctl, then 4.
+JOBS="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4)"
+make --no-print-directory -C docs -f Makefile preprocess \\
+    CAT_ROOT_DIR="$CAT_OUT" HTML_ROOT_DIR="$HTML_OUT"
+make --no-print-directory -j"$JOBS" -C docs -f Makefile cat web \\
     CAT_ROOT_DIR="$CAT_OUT" HTML_ROOT_DIR="$HTML_OUT"
 """.format(
         cat_out = cat_dir.path,
         html_out = html_dir.path,
     )
 
     ctx.actions.run_shell(
+        resource_set = _man_pages_resource_set,
         outputs = [cat_dir, html_dir],
         inputs = ctx.files.docs_srcs + ctx.files.scripts + ctx.files.readmes + ctx.files.messages,
         command = command,

bazel/man_pages.bzl

@@ -48,9 +48,9 @@ tcl_encode = rule(
             doc = "Files to be wrapped.",
         ),
         "_encode_script": attr.label(
-            default = "//etc:file_to_string",
+            default = "//etc:file_to_string.py",
             executable = True,
-            allow_files = True,
+            allow_single_file = [".py"],
             cfg = "exec",
         ),
     },

bazel/tcl_encode_or.bzl

@@ -1,4 +1,4 @@
-load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 package(features = ["layering_check"])
 
@@ -7,16 +7,8 @@ exports_files(
         "whittle.py",
         "whittle_cleanup.tcl",
         "whittle_cut.tcl",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-py_binary(
-    name = "file_to_string",
-    srcs = [
         "file_to_string.py",
     ],
-    main = "file_to_string.py",
     visibility = ["//visibility:public"],
 )
 

etc/BUILD

@@ -7,7 +7,10 @@ load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 sh_binary(
     name = "install",
     srcs = ["//bazel:install.sh"],
-    data = [":tarfile"] + select({
+    data = [
+        ":tarfile",
+        "//docs:man_pages",
+    ] + select({
         # Ship the desktop entry + icon only for GUI builds so install.sh
         # can register a menu launcher (mirrors the CMake GUI install).
         "//:platform_gui": ["//src/gui:desktop_files"],

packaging/BUILD.bazel

@@ -728,6 +728,20 @@ std::string OpenRoad::getExePath() const
 
 std::string OpenRoad::getDocsPath() const
 {
+#ifdef BAZEL_BUILD
+  // When invoked via 'bazel run', BUILD_WORKSPACE_DIRECTORY is set to the
+  // workspace root. Look for generated man pages in bazel-bin/docs/ so that
+  // 'man' works without a full install step.
+  const char* workspace_dir = std::getenv("BUILD_WORKSPACE_DIRECTORY");
+  if (workspace_dir != nullptr) {
+    auto docs_path
+        = std::filesystem::path(workspace_dir) / "bazel-bin" / "docs";
+    if (std::filesystem::is_directory(docs_path)) {
+      return docs_path;
+    }
+  }
+#endif
+
   const std::string exe = getExePath();
 
   if (exe.empty()) {

src/OpenRoad.cc

@@ -61,6 +61,7 @@ Opendp::Opendp(odb::dbDatabase* db, utl::Logger* logger)
   grid_ = std::make_unique<Grid>();
   grid_->init(logger);
   network_ = std::make_unique<Network>();
+  network_->init(logger);
   arch_ = std::make_unique<Architecture>();
 }