Skip to content

Commit

Permalink
Use canonical BCR names for repositories.
Browse files Browse the repository at this point in the history
The canonical BCR repository names were aliased to the
previously used names in the WORKSPACE environment.
This change switches most of them to using the canonical
names directly (including the references in the BUILD
files they are used in).

Not all repo_name aliases could be removed in this change
yet as there are some remaining WORKSPACE dependencies
that refer to them with that name. These should be
handled in separate changes.

Issues: #931
PiperOrigin-RevId: 725799584
  • Loading branch information
hzeller authored and copybara-github committed Feb 11, 2025
1 parent 33e3e23 commit 35f8e22
Show file tree
Hide file tree
Showing 72 changed files with 661 additions and 660 deletions.
15 changes: 8 additions & 7 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,29 @@ use_repo(llvm, "llvm_toolchain")
register_toolchains("@llvm_toolchain//:all")

# Root module dependencies.
# Note: some WORKSPACE dependencies still require repo_name aliases.
bazel_dep(name = "abseil-cpp", version = "20240722.1", repo_name = "com_google_absl")
bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "com_google_absl_py")
bazel_dep(name = "abseil-py", version = "2.1.0")
bazel_dep(name = "bazel_features", version = "1.25.0")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "boringssl", version = "0.20250114.0")
bazel_dep(name = "cppitertools", version = "2.2")
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc")
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
bazel_dep(name = "grpc", version = "1.69.0")
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c", repo_name = "com_google_riegeli")
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "verible", version = "0.0.3933")

# Dev dependencies
bazel_dep(name = "fuzztest", version = "20241028.0", dev_dependency = True, repo_name = "com_google_fuzztest")
bazel_dep(name = "google_benchmark", version = "1.9.1", dev_dependency = True, repo_name = "com_google_benchmark")
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True, repo_name = "com_google_googletest")
bazel_dep(name = "google_benchmark", version = "1.9.1", dev_dependency = True)
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)

# Repositories we don't really depend on directly, but we need to provide
# for other dependencies as they are using old versions that are not
Expand Down
2 changes: 1 addition & 1 deletion docs_src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ py_test(
deps = [
requirement("pyyaml"),
"//xls/common:runfiles",
"@com_google_absl_py//absl:app",
"@abseil-py//absl:app",
],
)
2 changes: 1 addition & 1 deletion third_party/xls_colors/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ cc_test(
"//xls/ir:bits",
"//xls/ir:value",
"//xls/simulation:sim_test_base",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down
66 changes: 33 additions & 33 deletions xls/codegen/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ cc_library(
"//xls/ir:channel",
"//xls/ir:value",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -100,7 +100,7 @@ cc_test(
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -129,7 +129,7 @@ cc_test(
"//xls/simulation:module_testbench_thread",
"//xls/simulation:verilog_test_base",
"@com_google_absl//absl/status",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -167,7 +167,7 @@ cc_test(
"//xls/simulation:verilog_test_base",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -479,7 +479,7 @@ cc_library(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_googlesource_code_re2//:re2",
"@re2",
],
)

Expand Down Expand Up @@ -770,8 +770,8 @@ cc_test(
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_googletest//:gtest",
"@com_google_protobuf//:protobuf",
"@googletest//:gtest",
],
)

Expand All @@ -794,7 +794,7 @@ cc_test(
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -868,7 +868,7 @@ proto_library(
"//xls/ir:channel_proto",
"//xls/ir:foreign_function_data_proto",
"//xls/ir:xls_type_proto",
"@com_google_googleapis//google/api:field_behavior_proto",
"@googleapis//google/api:field_behavior_proto",
],
)

Expand Down Expand Up @@ -947,7 +947,7 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -970,7 +970,7 @@ cc_test(
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -988,7 +988,7 @@ cc_test(
"//xls/ir:source_location",
"//xls/ir:type",
"//xls/ir:value",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -1012,7 +1012,7 @@ cc_test(
"//xls/simulation:verilog_test_base",
"@com_google_absl//absl/status",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1066,7 +1066,7 @@ cc_test(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1096,7 +1096,7 @@ cc_test(
"//xls/scheduling:pipeline_schedule",
"//xls/scheduling:run_pipeline_schedule",
"//xls/scheduling:scheduling_options",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -1119,7 +1119,7 @@ cc_test(
"//xls/ir:value",
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -1143,7 +1143,7 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -1169,7 +1169,7 @@ cc_test(
"//xls/simulation:verilog_test_base",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1229,7 +1229,7 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1258,7 +1258,7 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -1275,7 +1275,7 @@ cc_test(
"//xls/ir:function_builder",
"//xls/ir:ir_test_base",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand All @@ -1293,7 +1293,7 @@ cc_test(
"//xls/ir:ir_test_base",
"//xls/passes:dce_pass",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1356,7 +1356,7 @@ cc_test(
"//xls/scheduling:pipeline_schedule",
"//xls/scheduling:run_pipeline_schedule",
"//xls/scheduling:scheduling_options",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1388,7 +1388,7 @@ cc_test(
"//xls/ir:function_builder",
"//xls/ir:ir_test_base",
"//xls/ir:value",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1423,7 +1423,7 @@ cc_library(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_googlesource_code_re2//:re2",
"@re2",
],
)

Expand Down Expand Up @@ -1464,7 +1464,7 @@ cc_test(
"//xls/ir:ir_test_base",
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1509,7 +1509,7 @@ cc_test(
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1597,7 +1597,7 @@ cc_test(
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_google_absl//absl/types:variant",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1661,7 +1661,7 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1744,7 +1744,7 @@ cc_test(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1794,7 +1794,7 @@ cc_test(
"//xls/ir:ir_matcher",
"//xls/ir:ir_test_base",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1854,7 +1854,7 @@ cc_test(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1893,7 +1893,7 @@ cc_test(
"//xls/ir:value",
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -1954,6 +1954,6 @@ cc_test(
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)
8 changes: 4 additions & 4 deletions xls/codegen/vast/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ cc_test(
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -108,7 +108,7 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -147,7 +147,7 @@ cc_test(
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status:status_matchers",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)

Expand Down Expand Up @@ -265,6 +265,6 @@ cc_test(
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:span",
"@com_google_googletest//:gtest",
"@googletest//:gtest",
],
)
Loading

0 comments on commit 35f8e22

Please sign in to comment.