Merge pull request #3214 from Pinata-Consulting/bazel-simpler

Bazel simpler

Author: maliberty

MODULE.bazel

@@ -11,7 +11,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "4a67015d0165e14466b89cc7ce1e92688f393093",
+    commit = "9a3778bdbe63106a894a03e865335a31ebc860d1",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -31,55 +31,16 @@ pip.parse(
 )
 use_repo(pip, "orfs-pip")
 
-# HACK! While we're waiting for OpenROAD to switch to bzlmod
-new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository")
-
-new_local_repository(
-    name = "openroad",
-    build_file_content = """
-exports_files(["openroad"],
-visibility = ["//visibility:public"],
-)
-filegroup(
-    name = "all",
-    data = glob(["openroad.runfiles/**/*"]),
-    visibility = ["//visibility:public"],
-)
-""",
-    path = "tools/OpenROAD/bazel-out/k8-opt/bin",
-)
-
 orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
 
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 orfs.default(
-    # Check out the version you want to test and make any modifications locally:
-    #
-    # ./build_openroad.sh --no_init
-    #
-    # Comment out "sha256" below, not available for local docker images
-    # and update "image" to point to the local image.
-
-    # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-2888-g38f93c61",
+    image = "docker.io/openroad/orfs:v3.0-3190-g5ac9869c",
     # Use local files instead of docker image
     makefile = "//flow:makefile",
     makefile_yosys = "//flow:makefile_yosys",
-    # TODO once openroad is switched to MODULE.bazel, use
-    # local_path_override(module_name = "openroad", path = "../tools/OpenROAD")
-    # to point to the local openroad Bazel module instead of
-    # getting the openroad binary from the docker image, supports GUI.
-    #
-    # openroad = "@docker_orfs//:openroad",
-
-    # Use locally built OpenROAD while we're waiting for OpenROAD
-    # to bzlmod, no GUI for now.
-    #
-    # cd ../tools/OpenROAD
-    # bazelisk build -c opt :openroad
-    openroad = "//flow/test:openroad",
     pdk = "//flow:asap7",
-    sha256 = "173581fc6ca74ece349150866ddce96534c5e9d855a25ca8ae509a45fcaefc0d",
+    sha256 = "2ca999699bc91144074b7f23f42da9330d7279437c386a1413fba4a6a7520916",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    bazel run //:requirements.update
+#    bazel run //flow/util:requirements.update
 #
 contourpy==1.3.1 \
     --hash=sha256:041b640d4ec01922083645a94bb3b2e777e6b626788f4095cf21abbe266413c1 \
@@ -233,7 +233,7 @@ matplotlib==3.10.0 \
     --hash=sha256:d44cb942af1693cced2604c33a9abcef6205601c445f6d0dc531d813af8a2f5a \
     --hash=sha256:d907fddb39f923d011875452ff1eca29a9e7f21722b873e90db32e5d8ddff12e \
     --hash=sha256:fd44fc75522f58612ec4a33958a7e5552562b7705b42ef1b4f8c0818e304a363
-    # via -r util/requirements.in
+    # via -r flow/util/requirements.in
 numpy==2.2.2 \
     --hash=sha256:02935e2c3c0c6cbe9c7955a8efa8908dd4221d7755644c59d1bba28b94fd334f \
     --hash=sha256:0349b025e15ea9d05c3d63f9657707a4e1d471128a3b1d876c095f328f8ff7f0 \
@@ -432,7 +432,7 @@ pyyaml==6.0.2 \
     --hash=sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba \
     --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
     --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
-    # via -r util/requirements.in
+    # via -r flow/util/requirements.in
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
     --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81