Merge pull request #375 from JoshVarga/bzlmod_progress

Removing workspace name from labels where possible

.bazelrc

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+common --noenable_bzlmod
 
 build --cxxopt "-std=c++17"
 build --cxxopt "-ffp-contract=off"

dependency_support/at_clifford_icestorm/at_clifford_icestorm.bzl

@@ -26,5 +26,5 @@ def at_clifford_icestorm():
         ],
         strip_prefix = "icestorm-cd2610e0fa1c6a90e8e4e4cfe06db1b474e752bb",
         sha256 = "e8d12796091f5988097459450de20e4a59c873ca2fa580fef2f560c5543a1738",
-        build_file = Label("@rules_hdl//dependency_support:at_clifford_icestorm/bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support:at_clifford_icestorm/bundled.BUILD.bazel"),
     )

dependency_support/at_clifford_icestorm/workspace.bzl

@@ -26,5 +26,5 @@ def repo():
         ],
         strip_prefix = "icestorm-cd2610e0fa1c6a90e8e4e4cfe06db1b474e752bb",
         sha256 = "e8d12796091f5988097459450de20e4a59c873ca2fa580fef2f560c5543a1738",
-        build_file = Label("@rules_hdl//dependency_support:at_clifford_icestorm/bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support:at_clifford_icestorm/bundled.BUILD.bazel"),
     )

dependency_support/at_clifford_yosys/at_clifford_yosys.bzl

@@ -26,9 +26,9 @@ def at_clifford_yosys():
         ],
         sha256 = "46a9a4d969770fa20a2fd12c8e83307a597126609645c9655c370c0c365da344",
         strip_prefix = "yosys-8f07a0d8404f63349d8d3111217b73c9eafbd667",
-        build_file = Label("@rules_hdl//dependency_support:at_clifford_yosys/bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support:at_clifford_yosys/bundled.BUILD.bazel"),
         patches = [
-            Label("@rules_hdl//dependency_support:at_clifford_yosys/yosys.patch"),
-            Label("@rules_hdl//dependency_support:at_clifford_yosys/autoname.patch"),
+            Label("//dependency_support:at_clifford_yosys/yosys.patch"),
+            Label("//dependency_support:at_clifford_yosys/autoname.patch"),
         ],
     )

dependency_support/boost/boost.bzl

@@ -32,9 +32,9 @@ def boost():
             # Bazel to depend on the Python headers of the current Python
             # toolchain. The patch below selects the same Python headers
             # that the rest of XLS uses.
-            Label("@rules_hdl//dependency_support/boost:add_python.patch"),
-            Label("@rules_hdl//dependency_support/boost:libbacktrace.patch"),
+            Label("//dependency_support/boost:add_python.patch"),
+            Label("//dependency_support/boost:libbacktrace.patch"),
             # See: https://github.com/nelhage/rules_boost/issues/555
-            Label("@rules_hdl//dependency_support/boost:downgrade_lzma.patch"),
+            Label("//dependency_support/boost:downgrade_lzma.patch"),
         ],
     )

dependency_support/com_github_fmtlib_fmt/com_github_fmtlib_fmt.bzl

@@ -26,5 +26,5 @@ def com_github_fmtlib_fmt():
         ],
         strip_prefix = "fmt-8.0.1",
         sha256 = "b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01",
-        build_file = Label("@rules_hdl//dependency_support/com_github_fmtlib_fmt:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_fmtlib_fmt:bundled.BUILD.bazel"),
     )

dependency_support/com_github_gabime_spdlog/com_github_gabime_spdlog.bzl

@@ -26,5 +26,5 @@ def com_github_gabime_spdlog():
         ],
         strip_prefix = "spdlog-1.11.0",
         sha256 = "ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb",
-        build_file = Label("@rules_hdl//dependency_support/com_github_gabime_spdlog:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_gabime_spdlog:bundled.BUILD.bazel"),
     )

dependency_support/com_github_libbacktrace/com_github_libbacktrace.bzl

@@ -26,5 +26,5 @@ def com_github_libbacktrace():
         ],
         strip_prefix = "libbacktrace-4d2dd0b172f2c9192f83ba93425f868f2a13c553",
         sha256 = "90d224a18c0a0c0f1f22fe73b89ebebd4f1ee368e55d646718b7f3b294a52705",
-        build_file = Label("@rules_hdl//dependency_support/com_github_libbacktrace:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_libbacktrace:bundled.BUILD.bazel"),
     )

dependency_support/com_github_ninja_build_ninja/com_github_ninja_build_ninja.bzl

@@ -26,5 +26,5 @@ def com_github_ninja_build_ninja():
         ],
         strip_prefix = "ninja-55f54511d35716c43637dee2bcb5fbc7839f967b",
         sha256 = "99b70ac3bd7d5c303a5b770888342af22b701d2a5cbc26da0912f79ebd6bd458",
-        build_file = Label("@rules_hdl//dependency_support/com_github_ninja_build_ninja:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_ninja_build_ninja:bundled.BUILD.bazel"),
     )

dependency_support/com_github_quantamhd_lemon/com_github_quantamhd_lemon.bzl

@@ -26,10 +26,10 @@ def com_github_quantamhd_lemon():
         ],
         strip_prefix = "lemon-1.3.1",
         sha256 = "a7f28821431b76505966e9a34c94c180130f6162ed2fc59ade8a685b5d5dcfeb",
-        build_file = Label("@rules_hdl//dependency_support/com_github_quantamhd_lemon:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_quantamhd_lemon:bundled.BUILD.bazel"),
         patches = [
-            Label("@rules_hdl//dependency_support/com_github_quantamhd_lemon:lemon.patch"),
-            Label("@rules_hdl//dependency_support/com_github_quantamhd_lemon:allocator-patch.patch"),
+            Label("//dependency_support/com_github_quantamhd_lemon:lemon.patch"),
+            Label("//dependency_support/com_github_quantamhd_lemon:allocator-patch.patch"),
         ],
         patch_args = [
             "-p1",

dependency_support/com_github_yosyshq_nextpnr/com_github_yosyshq_nextpnr.bzl

@@ -26,8 +26,8 @@ def com_github_yosyshq_nextpnr():
         ],
         strip_prefix = "nextpnr-f44498a5301f9f516488fb748c684926be514346",
         sha256 = "ee2a3a9f8a3632b28b33f0c7bd64d70e166c7f641184f2b84b606b7d8a67b878",
-        build_file = Label("@rules_hdl//dependency_support/com_github_yosyshq_nextpnr:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_yosyshq_nextpnr:bundled.BUILD.bazel"),
         patches = [
-            Label("@rules_hdl//dependency_support/com_github_yosyshq_nextpnr:dont_use_random_shuffle.patch"),
+            Label("//dependency_support/com_github_yosyshq_nextpnr:dont_use_random_shuffle.patch"),
         ],
     )

dependency_support/com_github_yosyshq_prjtrellis/com_github_yosyshq_prjtrellis.bzl

@@ -26,5 +26,5 @@ def com_github_yosyshq_prjtrellis():
         ],
         strip_prefix = "prjtrellis-315969591a12af11b02b4aa9c1dca9066e1be8e2",
         sha256 = "7f6eaf88ab386e8976e3bf085d0189a9153c19ad9866dea3920c995a7f717bbd",
-        build_file = Label("@rules_hdl//dependency_support/com_github_yosyshq_prjtrellis:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_yosyshq_prjtrellis:bundled.BUILD.bazel"),
     )

dependency_support/com_github_yosyshq_prjtrellis_db/com_github_yosyshq_prjtrellis_db.bzl

@@ -26,5 +26,5 @@ def com_github_yosyshq_prjtrellis_db():
         ],
         strip_prefix = "prjtrellis-db-c137076fdd8bfca3d2bf9cdacda9983dbbec599a",
         sha256 = "01d3d3906a7f690bd05f97b87bf196f602c659e0dadc77ebbccdd1acf1e362ca",
-        build_file = Label("@rules_hdl//dependency_support/com_github_yosyshq_prjtrellis_db:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_github_yosyshq_prjtrellis_db:bundled.BUILD.bazel"),
     )

dependency_support/com_google_skywater_pdk/build_defs.bzl

@@ -17,8 +17,8 @@
 These rules generate PDK providers for downstream tools.
 """
 
-load("@rules_hdl//pdk:build_defs.bzl", "CornerInfo", "StandardCellInfo")
-load("@rules_hdl//pdk:open_road_configuration.bzl", "OpenRoadPdkInfo")
+load("//pdk:build_defs.bzl", "CornerInfo", "StandardCellInfo")
+load("//pdk:open_road_configuration.bzl", "OpenRoadPdkInfo")
 
 def _skywater_corner_impl(ctx):
     # Choose user supplied root, or default to build directory.

dependency_support/com_google_skywater_pdk/cell_libraries.bzl

@@ -55,9 +55,9 @@ CELL_LIBRARIES = {
             "tt_100C_1v80": ["basic"],
         },
         "default_corner": "ff_100C_1v95",
-        "open_road_configuration": Label("@rules_hdl//dependency_support/com_google_skywater_pdk/sky130_fd_sc_hd:open_road_sky130_fd_sc_hd"),
+        "open_road_configuration": Label("//dependency_support/com_google_skywater_pdk/sky130_fd_sc_hd:open_road_sky130_fd_sc_hd"),
         "patches": [
-            Label("@rules_hdl//dependency_support/com_google_skywater_pdk/sky130_fd_sc_hd:pdk.patch"),
+            Label("//dependency_support/com_google_skywater_pdk/sky130_fd_sc_hd:pdk.patch"),
         ],
         "shallow_since": "1605028103 -0800",
     },

dependency_support/com_google_skywater_pdk/cells_info.bzl

@@ -14,8 +14,8 @@
 
 """Standard cell options for SkyWater 130nm PDK."""
 
-load("@rules_hdl//dependency_support/com_google_skywater_pdk:cell_libraries.bzl", "CELL_LIBRARIES")
-load("@rules_hdl//pdk:build_defs.bzl", "StandardCellOptionsInfo", "check_for_each_cells_args", "temp_normalize", "voltage_normalize")
+load("//dependency_support/com_google_skywater_pdk:cell_libraries.bzl", "CELL_LIBRARIES")
+load("//pdk:build_defs.bzl", "StandardCellOptionsInfo", "check_for_each_cells_args", "temp_normalize", "voltage_normalize")
 
 SKY130_OPTIONS = StandardCellOptionsInfo(
     libraries = [
@@ -104,7 +104,7 @@ def for_each_sky130_cells(libname, include_vts = None, include_corners = None, i
 
     Use this to create bazel rules for every standard cell version like shown below;
         ```
-        load("@rules_hdl//dependency_support/com_google_skywater_pdk:build_info.bzl", "for_each_sky130_cells")
+        load("//dependency_support/com_google_skywater_pdk:build_info.bzl", "for_each_sky130_cells")
         [
             extract_lef_and_liberty(
                 name = cell_name + "-data",

dependency_support/com_google_skywater_pdk/com_google_skywater_pdk.bzl

@@ -36,7 +36,7 @@ def com_google_skywater_pdk():
         ],
         strip_prefix = "skywater-pdk-3d7617a1acb92ea883539bcf22a632d6361a5de4",
         sha256 = "49e5b03c26131a03eb038697d396a6ebf14058d78196f5d95c2bbdb0bdc8f32e",
-        build_file = Label("@rules_hdl//dependency_support/com_google_skywater_pdk:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_google_skywater_pdk:bundled.BUILD.bazel"),
     )
 
     for library_name in CELL_LIBRARIES:

dependency_support/com_icarus_iverilog/com_icarus_iverilog.bzl

@@ -26,5 +26,5 @@ def com_icarus_iverilog():
         ],
         strip_prefix = "iverilog-12_0",
         sha256 = "a68cb1ef7c017ef090ebedb2bc3e39ef90ecc70a3400afb4aa94303bc3beaa7d",
-        build_file = Label("@rules_hdl//dependency_support:com_icarus_iverilog/bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support:com_icarus_iverilog/bundled.BUILD.bazel"),
     )

dependency_support/com_opencircuitdesign_magic/com_opencircuitdesign_magic.bzl

@@ -26,7 +26,7 @@ def com_opencircuitdesign_magic():
         ],
         strip_prefix = "magic-0df5f6d0731024da457eeb42cb88725d93572920",
         sha256 = "1bc9966e5118c3d312e2dfebadb6f01ca343fbf1f0847e1434300972a4ca91f9",
-        build_file = Label("@rules_hdl//dependency_support/com_opencircuitdesign_magic:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_opencircuitdesign_magic:bundled.BUILD.bazel"),
         patches = [
             Label("@rules_hdl//dependency_support/com_opencircuitdesign_magic:magic_wrapper.patch"),
             Label("@rules_hdl//dependency_support/com_opencircuitdesign_magic:use_bash.patch"),

dependency_support/com_opencircuitdesign_netgen/com_opencircuitdesign_netgen.bzl

@@ -26,5 +26,5 @@ def com_opencircuitdesign_netgen():
         ],
         strip_prefix = "netgen-50b0e9cb6572cfa2f96d49556d13e4c445986e0f",
         sha256 = "2472de7d55f6266be3389e150571e48952a7613f6cb284a59eb46adfde770061",
-        build_file = Label("@rules_hdl//dependency_support/com_opencircuitdesign_netgen:bundled.BUILD.bazel"),
+        build_file = Label("//dependency_support/com_opencircuitdesign_netgen:bundled.BUILD.bazel"),
     )