bazel: move MODULE.bazel to root of git repository

oharboe · oharboe · commit 3f8f484c450b · 2025-04-25T14:55:52.000+02:00
This is idiomatic for Bazel and fixes problems with e.g. git_override()

Signed-off-by: Øyvind Harboe &lt;oyvind.harboe@zylin.com&gt;
diff --git a/.bazelignore b/.bazelignore
@@ -0,0 +1,8 @@
+tools/
+dependencies/
+docker/
+etc/
+jenkins/
+docs/
+
+
diff --git a/.bazelrc b/.bazelrc
diff --git a/.bazelversion b/.bazelversion
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,6 @@ build
 
 # autotuner artifacts
 metadata-base-at.json
+
+user.bazelrc
+bazel-*
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -27,7 +27,7 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
 pip.parse(
     hub_name = "orfs-pip",
     python_version = "3.12",
-    requirements_lock = "//:util/requirements_lock.txt",
+    requirements_lock = "//flow:util/requirements_lock.txt",
 )
 use_repo(pip, "orfs-pip")
 
@@ -46,7 +46,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 """,
-    path = "../tools/OpenROAD/bazel-out/k8-opt/bin",
+    path = "tools/OpenROAD/bazel-out/k8-opt/bin",
 )
 
 orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
@@ -63,8 +63,8 @@ orfs.default(
     # Official image https://hub.docker.com/r/openroad/orfs/tags
     image = "docker.io/openroad/orfs:v3.0-2883-ge22e4fc7",
     # Use local files instead of docker image
-    makefile = "//:makefile",
-    makefile_yosys = "//:makefile_yosys",
+    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
@@ -77,8 +77,8 @@ orfs.default(
     #
     # cd ../tools/OpenROAD
     # bazelisk build -c opt :openroad
-    openroad = "//test:openroad",
-    pdk = "//:asap7",
+    openroad = "//flow/test:openroad",
+    pdk = "//flow:asap7",
     sha256 = "6ad0b1b7fbf290f33f0050ead4da181c83c6e8a9337b65f5f9cff65d67788424",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
diff --git a/flow/BUILD.bazel b/flow/BUILD.bazel
@@ -18,7 +18,7 @@ filegroup(
         "scripts/synth*.tcl",
         "platforms/common/**/*.v",
     ]) + [
-        "//util:makefile_yosys",
+        "//flow/util:makefile_yosys",
     ],
     visibility = ["//visibility:public"],
 )
@@ -31,7 +31,7 @@ filegroup(
         "scripts/*.tcl",
         "platforms/common/**/*.v",
     ]) + [
-        "//util:makefile",
+        "//flow/util:makefile",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/flow/designs/asap7/aes/BUILD.bazel b/flow/designs/asap7/aes/BUILD.bazel
@@ -15,7 +15,7 @@ BLACKBOXES = [
     data = [":constraint.sdc"],
     module_top = name,
     variant = "netlist",
-    verilog_files = ["//designs/src/aes:verilog"],
+    verilog_files = ["//flow/designs/src/aes:verilog"],
 ) for name in BLACKBOXES]
 
 [filegroup(
diff --git a/flow/designs/asap7/ethmac_lvt/BUILD.bazel b/flow/designs/asap7/ethmac_lvt/BUILD.bazel
@@ -20,5 +20,5 @@ orfs_flow(
         "SDC_FILE": [":constraint.sdc"],
     },
     top = "ethmac",
-    verilog_files = ["//designs/src/ethmac_lvt:verilog"],
+    verilog_files = ["//flow/designs/src/ethmac_lvt:verilog"],
 )
diff --git a/flow/designs/asap7/gcd/BUILD b/flow/designs/asap7/gcd/BUILD
@@ -16,6 +16,6 @@ orfs_flow(
         "RULES_JSON": [":rules-base.json"],
         "SDC_FILE": [":constraint.sdc"],
     },
-    verilog_files = ["//designs/src/gcd:verilog"],
+    verilog_files = ["//flow/designs/src/gcd:verilog"],
     tags = ["manual"],
 )
diff --git a/flow/designs/asap7/mock-array/BUILD.bazel b/flow/designs/asap7/mock-array/BUILD.bazel
@@ -97,7 +97,7 @@ filegroup(
         "io.tcl",
     ],
     data = [
-        "//designs/src/mock-array:util.tcl",
+        "//flow/designs/src/mock-array:util.tcl",
     ],
     visibility = [":__subpackages__"],
 )
@@ -137,7 +137,7 @@ orfs_flow(
         "IO_CONSTRAINTS": [":mock-array-io"],
         # "MACRO_PLACEMENT_TCL": [":macro-placement.tcl"],
     },
-    verilog_files = ["//designs/src/mock-array:verilog"],
+    verilog_files = ["//flow/designs/src/mock-array:verilog"],
 )
 
 filegroup(
@@ -146,7 +146,7 @@ filegroup(
         "Element/io.tcl",
     ],
     data = [
-        "//designs/src/mock-array:util.tcl",
+        "//flow/designs/src/mock-array:util.tcl",
     ],
     visibility = [":__subpackages__"],
 )
@@ -182,5 +182,5 @@ orfs_flow(
         "IO_CONSTRAINTS": [":mock-array-element-io"],
         "SDC_FILE": [":mock-array-constraints"],
     },
-    verilog_files = ["//designs/src/mock-array:verilog"],
+    verilog_files = ["//flow/designs/src/mock-array:verilog"],
 )
diff --git a/flow/designs/asap7/swerv_wrapper/BUILD.bazel b/flow/designs/asap7/swerv_wrapper/BUILD.bazel
@@ -56,7 +56,7 @@ BLACKBOXES = [
     variant = "netlist",
     verilog_files = [
         "macros.v",
-        "//designs/src/swerv:verilog",
+        "//flow/designs/src/swerv:verilog",
     ],
     deps = FAKERAMS,
 ) for name in BLACKBOXES]
diff --git a/flow/designs/sky130hd/ibex/BUILD.bazel b/flow/designs/sky130hd/ibex/BUILD.bazel
@@ -15,5 +15,5 @@ orfs_flow(
         "FASTROUTE_TCL": ["fastroute.tcl"],
     },
     top = "ibex_core",
-    verilog_files = ["//designs/src/ibex:verilog"],
+    verilog_files = ["//flow/designs/src/ibex:verilog"],
 )
diff --git a/flow/util/plot_congestion.bzl b/flow/util/plot_congestion.bzl
@@ -11,13 +11,13 @@ def plot_congestion(name, srcs, argument, values):
         name = "{}_pdf".format(name),
         srcs = ["{name}_congestion".format(name = name)],
         outs = ["{}.pdf".format(name)],
-        cmd = "$(execpath //util:plot_congestion) {argument} $@ $(locations :{name}_congestion) {values}".format(values = " ".join(values), argument = argument, name = name),
-        tools = ["//util:plot_congestion"],
+        cmd = "$(execpath //flow/util:plot_congestion) {argument} $@ $(locations :{name}_congestion) {values}".format(values = " ".join(values), argument = argument, name = name),
+        tools = ["//flow/util:plot_congestion"],
     )
 
     native.sh_binary(
         name = name,
-        srcs = ["//util:open_plots.sh"],
+        srcs = ["//flow/util:open_plots.sh"],
         args = ["$(location :{}.pdf)".format(name)],
         data = ["{}.pdf".format(name)],
     )

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +tools/
 +dependencies/
 +docker/
 +etc/
 +jenkins/
 +docs/
++
++
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ orfs_flow(`
`20`	`20`	`"SDC_FILE": [":constraint.sdc"],`
`21`	`21`	`},`
`22`	`22`	`top = "ethmac",`
`23`		`- verilog_files = ["//designs/src/ethmac_lvt:verilog"],`
	`23`	`+ verilog_files = ["//flow/designs/src/ethmac_lvt:verilog"],`
`24`	`24`	`)`