This is an archive of the discontinued LLVM Phabricator instance.

Differential D147948

[bazel][NFC] Replace @bazel_tools//src/conditions with equivalent @platforms rules
ClosedPublic

Authored by rupprecht on Apr 10 2023, 9:03 AM.

Details

Reviewers
GMNGeoffrey
Commits
rG5e57f1bf5283: [bazel][NFC] Replace @bazel_tools//src/conditions with equivalent @platforms…
Summary

Followup to D147354. Using src/conditions is discouraged in favor of using rules from the @platforms repository directly.

This replaces three conditions:

  • @bazel_tools//src/conditions:windows -> @platforms//os:windows
  • @bazel_tools//src/conditions:darwin -> @platforms//os:macos
  • @bazel_tools//src/conditions:freebsd -> @platforms//os:freebsd

llvm/config.bzl has a non-trivial OS+CPU selection config, so that is omitted from this patch. There is intentionally no equivalent for that in @platforms because every project will have their own opinions about what a platform is, and it is not feasible for the bazel selection list to include every possible combination. The recommended idiom there is for projects to define their own supported platforms list, e.g. in a separate BUILD file or platform mapping.

Diff Detail

Event Timeline

rupprecht created this revision.Apr 10 2023, 9:03 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 10 2023, 9:03 AM
rupprecht requested review of this revision.Apr 10 2023, 9:03 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 10 2023, 9:03 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B224590: Diff 512170.Apr 10 2023, 9:34 AM
rupprecht edited the summary of this revision. (Show Details)Apr 10 2023, 9:53 AM
Herald added subscribers: krytarowski, arichardson, emaste. · View Herald TranscriptApr 10 2023, 9:53 AM
GMNGeoffrey accepted this revision.Apr 10 2023, 11:12 AM
This revision is now accepted and ready to land.Apr 10 2023, 11:12 AM
Closed by commit rG5e57f1bf5283: [bazel][NFC] Replace @bazel_tools//src/conditions with equivalent @platforms… (authored by rupprecht). · Explain WhyApr 10 2023, 11:43 AM
This revision was automatically updated to reflect the committed changes.
rupprecht added a commit: rG5e57f1bf5283: [bazel][NFC] Replace @bazel_tools//src/conditions with equivalent @platforms….

Revision Contents

PathSize
utils/
bazel/
llvm-project-overlay/
clang/
6 lines
unittests/
2 lines
llvm/
38 lines
8 lines
third-party/
unittest/
2 lines
2 lines

Diff 512205

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

Show First 20 Lines • Show All 1,372 Lines • ▼ Show 20 Linescc_library(
copts = ["$(STACK_FRAME_UNLIMITED)"], copts = ["$(STACK_FRAME_UNLIMITED)"],
includes = [ includes = [
"include", "include",
# TODO: This is likely a layering issue, but files in Arch are currently # TODO: This is likely a layering issue, but files in Arch are currently
# directly #including "Tools.h". # directly #including "Tools.h".
"lib/Driver", "lib/Driver",
], ],
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": ["version.lib"], "@platforms//os:windows": ["version.lib"],
"//conditions:default": [], "//conditions:default": [],
}), }),
textual_hdrs = glob([ textual_hdrs = glob([
"include/clang/Driver/*.def", "include/clang/Driver/*.def",
]), ]),
deps = [ deps = [
":ast", ":ast",
":basic", ":basic",
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
cc_plugin_library( cc_plugin_library(
name = "libclang", name = "libclang",
srcs = glob([ srcs = glob([
"tools/libclang/*.cpp", "tools/libclang/*.cpp",
"tools/libclang/*.h", "tools/libclang/*.h",
]), ]),
hdrs = glob(["include/clang-c/*.h"]), hdrs = glob(["include/clang-c/*.h"]),
copts = select({ copts = select({
"@bazel_tools//src/conditions:windows": ["-D_CINDEX_LIB_"], "@platforms//os:windows": ["-D_CINDEX_LIB_"],
"//conditions:default": [], "//conditions:default": [],
}), }),
strip_include_prefix = "include", strip_include_prefix = "include",
deps = [ deps = [
":arc_migrate", ":arc_migrate",
":ast", ":ast",
":basic", ":basic",
":codegen", ":codegen",
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Linescc_binary(
], ],
) )
cc_binary( cc_binary(
name = "c-arcmt-test", name = "c-arcmt-test",
testonly = 1, testonly = 1,
srcs = ["tools/c-arcmt-test/c-arcmt-test.c"], srcs = ["tools/c-arcmt-test/c-arcmt-test.c"],
copts = select({ copts = select({
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"//conditions:default": ["-std=gnu99"], "//conditions:default": ["-std=gnu99"],
}), }),
stamp = 0, stamp = 0,
deps = [ deps = [
":codegen", ":codegen",
":libclang", ":libclang",
"//llvm:MC", "//llvm:MC",
"//llvm:Support", "//llvm:Support",
▲ Show 20 Lines • Show All 284 Lines • Show Last 20 Lines

utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel

Show First 20 Lines • Show All 525 Lines • ▼ Show 20 Linescc_test(
size = "small", size = "small",
srcs = glob( srcs = glob(
["libclang/*.cpp"], ["libclang/*.cpp"],
allow_empty = False, allow_empty = False,
) + [ ) + [
"libclang/TestUtils.h", "libclang/TestUtils.h",
], ],
args = select({ args = select({
"@bazel_tools//src/conditions:windows": [ "@platforms//os:windows": [
# Need to disable the VFS tests that don't use Windows friendly # Need to disable the VFS tests that don't use Windows friendly
# paths. These are also disabled on Windows in the CMake build. # paths. These are also disabled on Windows in the CMake build.
"--gtest_filter=-*VirtualFileOverlay*", "--gtest_filter=-*VirtualFileOverlay*",
], ],
"//conditions:default": [], "//conditions:default": [],
}), }),
deps = [ deps = [
"//clang:libclang", "//clang:libclang",
"//llvm:Support", "//llvm:Support",
"//third-party/unittest:gtest", "//third-party/unittest:gtest",
"//third-party/unittest:gtest_main", "//third-party/unittest:gtest_main",
], ],
) )

utils/bazel/llvm-project-overlay/llvm/BUILD.bazel

Show First 20 Lines • Show All 185 Lines • ▼ Show 20 Linescc_library(
srcs = glob([ srcs = glob([
"lib/Support/*.c", "lib/Support/*.c",
"lib/Support/*.cpp", "lib/Support/*.cpp",
"lib/Support/*.h", "lib/Support/*.h",
"lib/Support/*.inc", "lib/Support/*.inc",
# To avoid a dependency cycle. # To avoid a dependency cycle.
"include/llvm/Option/*.h", "include/llvm/Option/*.h",
]) + select({ ]) + select({
"@bazel_tools//src/conditions:windows": glob([ "@platforms//os:windows": glob([
"lib/Support/Windows/*.h", "lib/Support/Windows/*.h",
"lib/Support/Windows/*.inc", "lib/Support/Windows/*.inc",
]), ]),
"//conditions:default": glob([ "//conditions:default": glob([
"lib/Support/Unix/*.h", "lib/Support/Unix/*.h",
"lib/Support/Unix/*.inc", "lib/Support/Unix/*.inc",
]), ]),
}) + [ }) + [
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines defines = select({
"BLAKE3_NO_AVX2", "BLAKE3_NO_AVX2",
"BLAKE3_NO_AVX512", "BLAKE3_NO_AVX512",
"BLAKE3_NO_SSE2", "BLAKE3_NO_SSE2",
"BLAKE3_NO_SSE41", "BLAKE3_NO_SSE41",
], ],
}), }),
includes = ["include"], includes = ["include"],
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:freebsd": [ "@platforms//os:freebsd": [
"-pthread", "-pthread",
"-lexecinfo", "-lexecinfo",
"-ldl", "-ldl",
"-lm", "-lm",
], ],
"//conditions:default": [ "//conditions:default": [
"-pthread", "-pthread",
"-ldl", "-ldl",
▲ Show 20 Lines • Show All 851 Lines • ▼ Show 20 Lines
) )
cc_library( cc_library(
name = "TargetParser", name = "TargetParser",
srcs = glob([ srcs = glob([
"lib/TargetParser/*.cpp", "lib/TargetParser/*.cpp",
"lib/TargetParser/*.h", "lib/TargetParser/*.h",
]) + select({ ]) + select({
"@bazel_tools//src/conditions:windows": glob([ "@platforms//os:windows": glob([
"lib/TargetParser/Windows/*.h", "lib/TargetParser/Windows/*.h",
"lib/TargetParser/Windows/*.inc", "lib/TargetParser/Windows/*.inc",
]), ]),
"//conditions:default": glob([ "//conditions:default": glob([
"lib/TargetParser/Unix/*.h", "lib/TargetParser/Unix/*.h",
"lib/TargetParser/Unix/*.inc", "lib/TargetParser/Unix/*.inc",
]), ]),
}), }),
▲ Show 20 Lines • Show All 964 Lines • ▼ Show 20 Lines[[
[gentbl( [gentbl(
name = target["name"] + "CommonTableGen", name = target["name"] + "CommonTableGen",
strip_include_prefix = "lib/Target/" + target["name"], strip_include_prefix = "lib/Target/" + target["name"],
tbl_outs = target["tbl_outs"], tbl_outs = target["tbl_outs"],
tblgen = ":llvm-tblgen", tblgen = ":llvm-tblgen",
# MSVC isn't happy with long string literals, while other compilers # MSVC isn't happy with long string literals, while other compilers
# which support them get significant compile time improvements with # which support them get significant compile time improvements with
# them enabled. Ideally this flag would only be enabled on Windows via # them enabled. Ideally this flag would only be enabled on Windows via
# a select() on `@bazel_tools//src/conditions:windows,`, but that would # a select() on `@platforms//os:windows,`, but that would
# require refactoring gentbl from a macro into a rule. # require refactoring gentbl from a macro into a rule.
# TODO(#92): Refactor gentbl to support this use # TODO(#92): Refactor gentbl to support this use
tblgen_args = "--long-string-literals=0", tblgen_args = "--long-string-literals=0",
td_file = "lib/Target/" + target["name"] + "/" + target["short_name"] + ".td", td_file = "lib/Target/" + target["name"] + "/" + target["short_name"] + ".td",
td_srcs = [ td_srcs = [
":common_target_td_sources", ":common_target_td_sources",
] + glob([ ] + glob([
"lib/Target/" + target["name"] + "/*.td", "lib/Target/" + target["name"] + "/*.td",
▲ Show 20 Lines • Show All 459 Lines • ▼ Show 20 Linescc_library(
]) + [ ]) + [
"include/llvm-c/LLJIT.h", "include/llvm-c/LLJIT.h",
"include/llvm-c/Orc.h", "include/llvm-c/Orc.h",
"include/llvm-c/OrcEE.h", "include/llvm-c/OrcEE.h",
], ],
copts = llvm_copts, copts = llvm_copts,
linkopts = select({ linkopts = select({
"@platforms//os:android": [], "@platforms//os:android": [],
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:freebsd": [], "@platforms//os:freebsd": [],
"@bazel_tools//src/conditions:darwin": [], "@platforms//os:macos": [],
"//conditions:default": [ "//conditions:default": [
"-lrt", "-lrt",
], ],
}), }),
deps = [ deps = [
":Analysis", ":Analysis",
":BinaryFormat", ":BinaryFormat",
":BitReader", ":BitReader",
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines srcs = glob([
"lib/ExecutionEngine/Orc/TargetProcess/*.h", "lib/ExecutionEngine/Orc/TargetProcess/*.h",
]), ]),
hdrs = glob([ hdrs = glob([
"include/llvm/ExecutionEngine/Orc/TargetProcess/*.h", "include/llvm/ExecutionEngine/Orc/TargetProcess/*.h",
]), ]),
copts = llvm_copts, copts = llvm_copts,
linkopts = select({ linkopts = select({
"@platforms//os:android": [], "@platforms//os:android": [],
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:freebsd": [], "@platforms//os:freebsd": [],
"@bazel_tools//src/conditions:darwin": [], "@platforms//os:macos": [],
"//conditions:default": [ "//conditions:default": [
"-lrt", "-lrt",
], ],
}), }),
deps = [ deps = [
":BinaryFormat", ":BinaryFormat",
":CodeGen", ":CodeGen",
":Core", ":Core",
▲ Show 20 Lines • Show All 346 Lines • ▼ Show 20 Linescc_binary(
srcs = glob([ srcs = glob([
"tools/lli/*.cpp", "tools/lli/*.cpp",
"tools/lli/*.h", "tools/lli/*.h",
]), ]),
copts = llvm_copts, copts = llvm_copts,
# ll scripts rely on symbols from dependent # ll scripts rely on symbols from dependent
# libraries being resolvable. # libraries being resolvable.
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:darwin": [], "@platforms//os:macos": [],
"//conditions:default": [ "//conditions:default": [
"-Wl,--undefined=_ZTIi", "-Wl,--undefined=_ZTIi",
"-Wl,--export-dynamic-symbol=_ZTIi", "-Wl,--export-dynamic-symbol=_ZTIi",
"-Wl,--export-dynamic-symbol=__cxa_begin_catch", "-Wl,--export-dynamic-symbol=__cxa_begin_catch",
"-Wl,--export-dynamic-symbol=__cxa_end_catch", "-Wl,--export-dynamic-symbol=__cxa_end_catch",
"-Wl,--export-dynamic-symbol=__gxx_personality_v0", "-Wl,--export-dynamic-symbol=__gxx_personality_v0",
"-Wl,--export-dynamic-symbol=__cxa_allocate_exception", "-Wl,--export-dynamic-symbol=__cxa_allocate_exception",
"-Wl,--export-dynamic-symbol=__cxa_throw", "-Wl,--export-dynamic-symbol=__cxa_throw",
▲ Show 20 Lines • Show All 491 Lines • ▼ Show 20 Linescc_binary(
name = "llvm-jitlink", name = "llvm-jitlink",
srcs = glob([ srcs = glob([
"tools/llvm-jitlink/*.cpp", "tools/llvm-jitlink/*.cpp",
"tools/llvm-jitlink/*.h", "tools/llvm-jitlink/*.h",
]), ]),
copts = llvm_copts, copts = llvm_copts,
# Make symbols from the standard library dynamically resolvable. # Make symbols from the standard library dynamically resolvable.
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:darwin": [], "@platforms//os:macos": [],
"//conditions:default": [ "//conditions:default": [
"-Wl,--undefined=_ZTIi", "-Wl,--undefined=_ZTIi",
"-Wl,--export-dynamic-symbol=_ZTIi", "-Wl,--export-dynamic-symbol=_ZTIi",
"-Wl,--export-dynamic-symbol=__cxa_begin_catch", "-Wl,--export-dynamic-symbol=__cxa_begin_catch",
"-Wl,--export-dynamic-symbol=__cxa_end_catch", "-Wl,--export-dynamic-symbol=__cxa_end_catch",
"-Wl,--export-dynamic-symbol=__gxx_personality_v0", "-Wl,--export-dynamic-symbol=__gxx_personality_v0",
"-Wl,--export-dynamic-symbol=__cxa_allocate_exception", "-Wl,--export-dynamic-symbol=__cxa_allocate_exception",
"-Wl,--export-dynamic-symbol=__cxa_throw", "-Wl,--export-dynamic-symbol=__cxa_throw",
▲ Show 20 Lines • Show All 932 Lines • ▼ Show 20 Lines
cc_binary( cc_binary(
name = "opt", name = "opt",
srcs = glob([ srcs = glob([
"tools/opt/*.cpp", "tools/opt/*.cpp",
"tools/opt/*.h", "tools/opt/*.h",
]), ]),
copts = llvm_copts, copts = llvm_copts,
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:darwin": [], "@platforms//os:macos": [],
"//conditions:default": ["-Wl,--export-dynamic"], "//conditions:default": ["-Wl,--export-dynamic"],
}), }),
stamp = 0, stamp = 0,
deps = [ deps = [
":AllTargetsAsmParsers", ":AllTargetsAsmParsers",
":AllTargetsCodeGens", ":AllTargetsCodeGens",
":Analysis", ":Analysis",
":AsmParser", ":AsmParser",
▲ Show 20 Lines • Show All 212 Lines • ▼ Show 20 Lines srcs = glob([
"tools/lli/ChildTarget/*.h", "tools/lli/ChildTarget/*.h",
]), ]),
copts = llvm_copts, copts = llvm_copts,
# The tests load code into this binary that expect to see symbols # The tests load code into this binary that expect to see symbols
# from libstdc++ such as __cxa_begin_catch and _ZTIi. The latter # from libstdc++ such as __cxa_begin_catch and _ZTIi. The latter
# isn't even used in the main binary, so we also need to force it # isn't even used in the main binary, so we also need to force it
# to be included. # to be included.
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [], "@platforms//os:windows": [],
"@bazel_tools//src/conditions:darwin": [], "@platforms//os:macos": [],
"//conditions:default": [ "//conditions:default": [
"-rdynamic", "-rdynamic",
"-u_ZTIi", "-u_ZTIi",
], ],
}), }),
stamp = 0, stamp = 0,
deps = [ deps = [
":OrcJIT", ":OrcJIT",
▲ Show 20 Lines • Show All 270 Lines • Show Last 20 Lines

utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl

Show All 37 Lines for impl_name in [dll_name, dylib_name, so_name]:
features = features, features = features,
tags = ["manual"] + tags, tags = ["manual"] + tags,
testonly = testonly, testonly = testonly,
**kwargs **kwargs
) )
native.filegroup( native.filegroup(
name = interface_output_name, name = interface_output_name,
srcs = select({ srcs = select({
"@bazel_tools//src/conditions:windows": [":" + dll_name], "@platforms//os:windows": [":" + dll_name],
"@bazel_tools//src/conditions:darwin": [":" + dylib_name], "@platforms//os:macos": [":" + dylib_name],
"//conditions:default": [":" + so_name], "//conditions:default": [":" + so_name],
}), }),
output_group = "interface_library", output_group = "interface_library",
) )
cc_import( cc_import(
name = import_name, name = import_name,
interface_library = ":" + interface_output_name, interface_library = ":" + interface_output_name,
shared_library = select({ shared_library = select({
"@bazel_tools//src/conditions:windows": ":" + dll_name, "@platforms//os:windows": ":" + dll_name,
"@bazel_tools//src/conditions:darwin": ":" + dylib_name, "@platforms//os:macos": ":" + dylib_name,
"//conditions:default": ":" + so_name, "//conditions:default": ":" + so_name,
}), }),
alwayslink = alwayslink, alwayslink = alwayslink,
features = features, features = features,
tags = tags, tags = tags,
testonly = testonly, testonly = testonly,
) )
cc_library( cc_library(
Show All 10 Lines

utils/bazel/llvm-project-overlay/third-party/unittest/BUILD.bazel

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Linescc_library(
], ],
hdrs = ["googletest/include/gtest/gtest.h", "googletest/include/gtest/gtest-spi.h"], hdrs = ["googletest/include/gtest/gtest.h", "googletest/include/gtest/gtest-spi.h"],
copts = llvm_copts, copts = llvm_copts,
defines = [ defines = [
"GTEST_HAS_RTTI=0", "GTEST_HAS_RTTI=0",
"__STDC_LIMIT_MACROS", "__STDC_LIMIT_MACROS",
"__STDC_CONSTANT_MACROS", "__STDC_CONSTANT_MACROS",
] + select({ ] + select({
"@bazel_tools//src/conditions:windows": ["GTEST_USE_OWN_TR1_TUPLE=0"], "@platforms//os:windows": ["GTEST_USE_OWN_TR1_TUPLE=0"],
"//conditions:default": ["GTEST_USE_OWN_TR1_TUPLE=1"], "//conditions:default": ["GTEST_USE_OWN_TR1_TUPLE=1"],
}), }),
includes = [ includes = [
"googletest/include", "googletest/include",
"include", "include",
], ],
textual_hdrs = [ textual_hdrs = [
"googletest/include/gtest/gtest_pred_impl.h", "googletest/include/gtest/gtest_pred_impl.h",
Show All 40 Lines

utils/bazel/vulkan_sdk.bzl

Show All 13 Linesdef _impl(repository_ctx):
if "VULKAN_SDK" in repository_ctx.os.environ: if "VULKAN_SDK" in repository_ctx.os.environ:
sdk_path = repository_ctx.os.environ["VULKAN_SDK"] sdk_path = repository_ctx.os.environ["VULKAN_SDK"]
repository_ctx.symlink(sdk_path, "vulkan-sdk") repository_ctx.symlink(sdk_path, "vulkan-sdk")
repository_ctx.file("BUILD", """ repository_ctx.file("BUILD", """
cc_library( cc_library(
name = "sdk", name = "sdk",
srcs = select({ srcs = select({
"@bazel_tools//src/conditions:windows": [ "@platforms//os:windows": [
"vulkan-sdk/Lib/vulkan-1.lib" "vulkan-sdk/Lib/vulkan-1.lib"
], ],
"//conditions:default": [ "//conditions:default": [
"vulkan-sdk/lib/libvulkan.so.1", "vulkan-sdk/lib/libvulkan.so.1",
], ],
}), }),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
)""") )""")
Show All 13 Lines