Merge branch 'master' into cts_improve_level_creating_threshold

Author: arthurjolo

MODULE.bazel

@@ -192,7 +192,7 @@ bazel_dep(name = "rules_nodejs", version = "6.7.3", dev_dependency = True)
 bazel_dep(name = "bazel-orfs", dev_dependency = True)
 bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
 
-BAZEL_ORFS_COMMIT = "78f19f25cec73bdec3517a76465dec7ce17ce227"
+BAZEL_ORFS_COMMIT = "60d62021c779e64ef7360a1b08a8faee00183c8d"
 
 BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
 
@@ -210,27 +210,30 @@ git_override(
     strip_prefix = "verilog",
 )
 
-# bazel-orfs pulls in orfs without a version and patches yosys, relying on
-# overrides that only apply when bazel-orfs is the root module. Mirror them
-# here so OpenROAD-as-root can resolve the module graph.
+# @orfs marks most non-root-only directives (qt-bazel/yosys-slang git_overrides,
+# orfs.default(), toolchain registration) as dev_dependency, so they are no-ops
+# here. But @orfs//flow loads @bazel-orfs//:openroad.bzl, and @orfs marks its
+# bazel-orfs bazel_dep dev_dependency too, which drops @bazel-orfs from @orfs's
+# repo mapping when consumed non-root — so loading @orfs//flow fails. The patch
+# makes that one bazel_dep non-dev.
 #
 # Use archive_override (HTTPS tarball) rather than git_override so the
 # build resolves on networks that block direct git access to github.com.
-ORFS_COMMIT = "10a2baea2171059ec14cda9a5855aa26dd7572c6"
+ORFS_COMMIT = "4b3f2663609fd3f6fd8d862729de1ec5967eb4e6"
 
 bazel_dep(name = "orfs", dev_dependency = True)
 archive_override(
     module_name = "orfs",
     patch_strip = 1,
     patches = [
-        "//bazel/bazel-orfs-patches:0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch",
+        "//bazel/bazel-orfs-patches:0035-orfs-bazel-orfs-visible-non-root.patch",
     ],
-    sha256 = "8325c6755215857a87a84db078d47dfbb2dfcbef70eaf0dd376fe5a7a363cd58",
+    sha256 = "b6e496221b5be5a5ecd54e978a7a8157a212b67374e2ecd6c27f90d35e02b473",
     strip_prefix = "OpenROAD-flow-scripts-" + ORFS_COMMIT,
     urls = ["https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts/archive/" + ORFS_COMMIT + ".tar.gz"],
 )
 
-bazel_dep(name = "yosys", version = "0.62.bcr.2", dev_dependency = True)
+bazel_dep(name = "yosys", version = "0.64", dev_dependency = True)
 bazel_dep(name = "yosys-slang", version = "0.0.0", dev_dependency = True)
 archive_override(
     module_name = "yosys-slang",

MODULE.bazel.lock

@@ -33,6 +33,37 @@ RUN apt-get -y update \
       python3-yaml \
       time
 
+# Runtime X11/xcb libraries for the Qt GUI build (--//:platform=gui).
+# Qt itself is hermetic (qt-bazel prebuilts), but the linked openroad binary
+# still resolves libX11/libxcb/libxkbcommon from the system at load time, so
+# without these every test against the gui binary dies at ld.so with
+# "libX11-xcb.so.1: cannot open shared object file". This is the runtime
+# (non -dev) subset of etc/DependencyInstaller.sh's GUI xcb list.
+RUN apt-get -y update \
+    && apt-get -y install --no-install-recommends \
+      libx11-6 \
+      libx11-xcb1 \
+      libsm6 \
+      libice6 \
+      libxcb1 \
+      libxcb-cursor0 \
+      libxcb-icccm4 \
+      libxcb-image0 \
+      libxcb-keysyms1 \
+      libxcb-randr0 \
+      libxcb-render0 \
+      libxcb-render-util0 \
+      libxcb-shape0 \
+      libxcb-shm0 \
+      libxcb-sync1 \
+      libxcb-util1 \
+      libxcb-xfixes0 \
+      libxcb-xkb1 \
+      libdbus-1-3 \
+      libfontconfig1 \
+      libxkbcommon0 \
+      libxkbcommon-x11-0
+
 RUN groupadd -g 9000 user \
     && useradd -u 9000 -g 9000 -m -s /bin/bash user
 USER user

bazel/Dockerfile

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Oyvind Harboe <oyvind.harboe@zylin.com>
+Date: Wed, 8 Jul 2026 00:00:00 +0000
+Subject: [PATCH] orfs: keep bazel-orfs visible when orfs is a non-root dep
+
+@orfs//flow loads @bazel-orfs//:openroad.bzl, so @bazel-orfs must be in
+@orfs's repo mapping. Upstream marks the bazel-orfs bazel_dep as
+dev_dependency, which drops it from the mapping when @orfs is consumed
+as a non-root dependency, so loading @orfs//flow fails with "No
+repository visible as '@bazel-orfs' from repository '@@orfs+'". Make the
+bazel_dep non-dev; the bazel-orfs version is unified by the root
+module's pin either way.
+
+Signed-off-by: Oyvind Harboe <oyvind.harboe@zylin.com>
+---
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -33,7 +33,7 @@
+     remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
+ )
+ 
+-bazel_dep(name = "bazel-orfs", dev_dependency = True)
++bazel_dep(name = "bazel-orfs")
+ bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
+ 
+ BAZEL_ORFS_COMMIT = "6ebadeb4be5c9ada103081c9a5e668c014126616"

bazel/bazel-orfs-patches/0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch

@@ -39,7 +39,6 @@ cc_library(
     name = "cts",
     srcs = [
         "src/Clock.cpp",
-        "src/Clock.h",
         "src/Clustering.cpp",
         "src/CtsOptions.cpp",
         "src/HTreeBuilder.cpp",

bazel/bazel-orfs-patches/0035-orfs-bazel-orfs-visible-non-root.patch

@@ -2722,13 +2722,25 @@ void FlexDRWorker::initMazeCost_fixedObj(const frDesign* design)
     result.clear();
     if (getTech()->getLayer(layerNum)->getType() == dbTechLayerType::ROUTING) {
       isRoutingLayer = true;
+      // The grid graph need not span the full layer stack: TOP_ROUTING_LAYER
+      // can trim routing layers above it out of the grid. Skip fixed-shape
+      // costing on layers absent from the grid so getMazeZIdx / getLayerNum
+      // stay in range. No-op when the grid spans every routing layer.
+      if (layerNum < gridGraph_.getMinLayerNum()
+          || layerNum > gridGraph_.getMaxLayerNum()) {
+        continue;
+      }
       zIdx = gridGraph_.getMazeZIdx(layerNum);
     } else if (getTech()->getLayer(layerNum)->getType()
                == dbTechLayerType::CUT) {
       isRoutingLayer = false;
       if (getTech()->getBottomLayerNum() <= layerNum - 1
           && getTech()->getLayer(layerNum - 1)->getType()
                  == dbTechLayerType::ROUTING) {
+        if (layerNum - 1 < gridGraph_.getMinLayerNum()
+            || layerNum - 1 > gridGraph_.getMaxLayerNum()) {
+          continue;
+        }
         zIdx = gridGraph_.getMazeZIdx(layerNum - 1);
       } else {
         continue;
@@ -2894,13 +2906,23 @@ void FlexDRWorker::initMazeCost_terms(
             if (getTech()->getLayer(layerNum)->getType()
                 == dbTechLayerType::ROUTING) {
               isRoutingLayer = true;
+              // Grid may not span the full stack (TOP_ROUTING_LAYER trim);
+              // skip layers absent from the grid. No-op when fully spanned.
+              if (layerNum < gridGraph_.getMinLayerNum()
+                  || layerNum > gridGraph_.getMaxLayerNum()) {
+                continue;
+              }
               zIdx = gridGraph_.getMazeZIdx(layerNum);
             } else if (getTech()->getLayer(layerNum)->getType()
                        == dbTechLayerType::CUT) {
               isRoutingLayer = false;
               if (getTech()->getBottomLayerNum() <= layerNum - 1
                   && getTech()->getLayer(layerNum - 1)->getType()
                          == dbTechLayerType::ROUTING) {
+                if (layerNum - 1 < gridGraph_.getMinLayerNum()
+                    || layerNum - 1 > gridGraph_.getMaxLayerNum()) {
+                  continue;
+                }
                 zIdx = gridGraph_.getMazeZIdx(layerNum - 1);
               } else {
                 continue;
@@ -2971,13 +2993,23 @@ void FlexDRWorker::initMazeCost_terms(
             if (getTech()->getLayer(layerNum)->getType()
                 == dbTechLayerType::ROUTING) {
               isRoutingLayer = true;
+              // Grid may not span the full stack (TOP_ROUTING_LAYER trim);
+              // skip layers absent from the grid. No-op when fully spanned.
+              if (layerNum < gridGraph_.getMinLayerNum()
+                  || layerNum > gridGraph_.getMaxLayerNum()) {
+                continue;
+              }
               zIdx = gridGraph_.getMazeZIdx(layerNum);
             } else if (getTech()->getLayer(layerNum)->getType()
                        == dbTechLayerType::CUT) {
               isRoutingLayer = false;
               if (getTech()->getBottomLayerNum() <= layerNum - 1
                   && getTech()->getLayer(layerNum - 1)->getType()
                          == dbTechLayerType::ROUTING) {
+                if (layerNum - 1 < gridGraph_.getMinLayerNum()
+                    || layerNum - 1 > gridGraph_.getMaxLayerNum()) {
+                  continue;
+                }
                 zIdx = gridGraph_.getMazeZIdx(layerNum - 1);
               } else {
                 continue;

src/cts/BUILD

@@ -471,6 +471,17 @@ void FlexGridGraph::initTracks(
       continue;
     }
     frLayerNum currLayerNum = layer->getLayerNum();
+    // Layers above TOP_ROUTING_LAYER carry no routing edges or access vias
+    // (initEdges and the special-access via loop already cap work at
+    // TOP_ROUTING_LAYER), yet they were still added to the grid here, sizing
+    // nodes_, the per-node arrays, and the maze search bounds across the full
+    // layer stack. Skip them so the grid graph spans only the routing range,
+    // cutting detailed-route memory and runtime when the design's top routing
+    // layer is below the technology top. Default TOP_ROUTING_LAYER is INT_MAX,
+    // so this is a no-op unless the top routing layer is explicitly lowered.
+    if (currLayerNum > router_cfg_->TOP_ROUTING_LAYER) {
+      continue;
+    }
     dbTechLayerDir currPrefRouteDir = layer->getDir();
     for (auto& tp : design->getTopBlock()->getTrackPatterns(currLayerNum)) {
       // allow wrongway if global variable and design rule allow