Merge branch 'upstream-master' into signoff-single-commit

Author: nanocoh

.bazelignore

@@ -6,3 +6,4 @@ jenkins/
 docs/
 
 
+tmp

.bazelrc

@@ -1,2 +1,12 @@
 build --incompatible_strict_action_env
+build --cxxopt "-std=c++20" --host_cxxopt "-std=c++20"
+
+# Don't track MODULE.bazel.lock.  Resolved versions ride along with the
+# pinned BCR + git_override(commit=…) coordinates in MODULE.bazel and
+# downstream cache hits are what we actually care about.  Tracking the
+# lockfile just means every bazel-orfs / yosys / openroad bump produces
+# a 1000-line lock diff that buries the real change.  Matches what
+# bazel-orfs itself does (its own .bazelrc:7).
+common --lockfile_mode=off
+
 try-import %workspace%/user.bazelrc

.gitignore

@@ -102,6 +102,8 @@ bazel-bin
 bazel-out
 bazel-OpenROAD-flow-scripts
 bazel-testlogs
+MODULE.bazel.lock
 
 # python venv
 venv/
+tmp/

MODULE.bazel

@@ -5,17 +5,92 @@ module(
     version = "0.0.1",
 )
 
-bazel_dep(name = "bazel-orfs")
+# --- Regular dependencies (propagated to downstream consumers) ---
+
+bazel_dep(name = "rules_python", version = "1.8.5")
+bazel_dep(name = "rules_shell", version = "0.6.1")
+
+# --- Dev dependencies (only honoured when @orfs is the root module) ---
+#
+# When @orfs is consumed as a non-root dep (e.g. by tools/OpenROAD), the
+# downstream module brings its own openroad/qt-bazel/bazel-orfs/yosys-slang
+# pins and orfs.default() configuration. Marking everything below as
+# dev_dependency = True makes those declarations no-ops in that case, so
+# our MODULE.bazel doesn't need to be patched at non-root consumption
+# time.
+
+bazel_dep(name = "toolchains_llvm", version = "1.5.0", dev_dependency = True)
+bazel_dep(name = "openroad", dev_dependency = True)
+local_path_override(
+    module_name = "openroad",
+    path = "tools/OpenROAD",
+)
+
+bazel_dep(name = "qt-bazel", dev_dependency = True)
+git_override(
+    module_name = "qt-bazel",
+    commit = "886104974c2fd72439f2c33b5deebf0fe4649df7",
+    remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
+)
+
+bazel_dep(name = "bazel-orfs", dev_dependency = True)
+bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
+
+BAZEL_ORFS_COMMIT = "3a5ddd7eb48c363717e65903ae4573d528327fd3"
+
+BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
 
 # To bump version, run: bazelisk run @bazel-orfs//:bump
+#
+# `patches =` keeps small bazel-orfs fixes vendored in this repo while
+# we iterate, instead of round-tripping every change through a
+# bazel-orfs PR + pin bump.  When a patch lands upstream, drop the
+# entry here and bump BAZEL_ORFS_COMMIT.
 git_override(
     module_name = "bazel-orfs",
-    commit = "f8a4b694b37c8f5322323eba9a9ae37f9541ee17",
-    remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
+    commit = BAZEL_ORFS_COMMIT,
+    patch_strip = 1,
+    patches = [
+        "//patches/bazel-orfs:0001-render_gds-monkey-patch-PDK_CONFIGS-not-gdsii_use_custom_config.patch",
+    ],
+    remote = BAZEL_ORFS_REMOTE,
 )
 
-bazel_dep(name = "rules_python", version = "1.8.5")
-bazel_dep(name = "rules_shell", version = "0.6.1")
+git_override(
+    module_name = "bazel-orfs-verilog",
+    commit = BAZEL_ORFS_COMMIT,
+    remote = BAZEL_ORFS_REMOTE,
+    strip_prefix = "verilog",
+)
+
+# 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",
+)
+
+# --- Extensions ---
+
+llvm = use_extension(
+    "@toolchains_llvm//toolchain/extensions:llvm.bzl",
+    "llvm",
+    dev_dependency = True,
+)
+llvm.toolchain(
+    llvm_version = "20.1.8",
+)
+use_repo(llvm, "llvm_toolchain")
+
+register_toolchains(
+    "@llvm_toolchain//:all",
+    dev_dependency = True,
+)
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(
@@ -31,16 +106,33 @@ pip.parse(
 )
 use_repo(pip, "orfs-pip")
 
-orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
-
-# To bump version, run: bazelisk run @bazel-orfs//:bump
+orfs = use_extension(
+    "@bazel-orfs//:extension.bzl",
+    "orfs_repositories",
+    dev_dependency = True,
+)
 orfs.default(
-    image = "docker.io/openroad/orfs:v3.0-3273-gedf3d6bf",
-    # Use local files instead of docker image
-    makefile = "//flow:makefile",
-    makefile_yosys = "//flow:makefile_yosys",
-    pdk = "//flow:asap7",
-    sha256 = "f5692c6325ebcf27cc348e033355ec95c82c35ace1af7e72a0d352624ada143e",
-)
-use_repo(orfs, "com_github_nixos_patchelf_download")
-use_repo(orfs, "docker_orfs")
+    # Expose the yosys-slang plugin via YOSYS_PLUGIN_PATH so
+    # SYNTH_HDL_FRONTEND=slang works for ibex, cva6, uart, etc.
+    yosys_plugins = ["@yosys-slang//src/yosys_plugin:slang.so"],
+)
+use_repo(orfs, "config")
+use_repo(orfs, "gnumake")
+use_repo(orfs, "orfs_variable_metadata")
+
+# Auto-generate orfs_flow() targets from config.mk files.
+# See flow/README.md for usage.
+orfs_designs = use_repo_rule("@bazel-orfs//private:designs.bzl", "orfs_designs")
+
+orfs_designs(
+    name = "orfs_designs",
+    designs_dir = "//flow/designs:BUILD",
+    platforms = [
+        "asap7",
+        "gf180",
+        "ihp-sg13g2",
+        "nangate45",
+        "sky130hd",
+        "sky130hs",
+    ],
+)