Skip to content

Add first class cuda-compile action #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keith wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add first class cuda-compile action #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cc/action_names.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ C_COMPILE_ACTION_NAME = "c-compile"
# Name of the C++ compilation action.
CPP_COMPILE_ACTION_NAME = "c++-compile"

# Name of the Cuda compilation action.
CUDA_COMPILE_ACTION_NAME = "cuda-compile"

# Name of the linkstamp-compile action.
LINKSTAMP_COMPILE_ACTION_NAME = "linkstamp-compile"

Expand Down Expand Up @@ -115,6 +118,7 @@ DWP = "dwp"
ACTION_NAMES = struct(
c_compile = C_COMPILE_ACTION_NAME,
cpp_compile = CPP_COMPILE_ACTION_NAME,
cuda_compile = CUDA_COMPILE_ACTION_NAME,
linkstamp_compile = LINKSTAMP_COMPILE_ACTION_NAME,
cc_flags_make_variable = CC_FLAGS_MAKE_VARIABLE_ACTION_NAME,
cpp_module_codegen = CPP_MODULE_CODEGEN_ACTION_NAME,
Expand Down Expand Up @@ -152,6 +156,7 @@ ACTION_NAMES = struct(
ALL_CPP_COMPILE_ACTION_NAMES = [
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
Expand Down
1 change: 1 addition & 0 deletions cc/common/cc_helper.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ def _create_cc_instrumented_files_info(ctx, cc_config, cc_toolchain, metadata_fi
source_extensions = extensions.CC_SOURCE + \
extensions.C_SOURCE + \
extensions.CC_HEADER + \
extensions.CUDA_SOURCE + \
extensions.ASSEMBLER_WITH_C_PREPROCESSOR + \
extensions.ASSEMBLER
coverage_environment = {}
Expand Down
3 changes: 3 additions & 0 deletions cc/common/cc_helper_internal.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ PRIVATE_STARLARKIFICATION_ALLOWLIST = [

_CC_SOURCE = [".cc", ".cpp", ".cxx", ".c++", ".C", ".cu", ".cl"]
_C_SOURCE = [".c"]
_CUDA_SOURCE = [".cu"]
_OBJC_SOURCE = [".m"]
_OBJCPP_SOURCE = [".mm"]
_CLIF_INPUT_PROTO = [".ipb"]
Expand All @@ -115,6 +116,7 @@ _LTO_INDEXING_OBJECT_FILE = [".indexing.o"]
_CC_AND_OBJC = []
_CC_AND_OBJC.extend(_CC_SOURCE)
_CC_AND_OBJC.extend(_C_SOURCE)
_CC_AND_OBJC.extend(_CUDA_SOURCE)
_CC_AND_OBJC.extend(_OBJC_SOURCE)
_CC_AND_OBJC.extend(_OBJCPP_SOURCE)
_CC_AND_OBJC.extend(_CC_HEADER)
Expand All @@ -134,6 +136,7 @@ _DISALLOWED_HDRS_FILES.extend(_PIC_OBJECT_FILE)
extensions = struct(
CC_SOURCE = _CC_SOURCE,
C_SOURCE = _C_SOURCE,
CUDA_SOURCE = _CUDA_SOURCE,
OBJC_SOURCE = _OBJC_SOURCE,
OBJCPP_SOURCE = _OBJCPP_SOURCE,
CC_HEADER = _CC_HEADER,
Expand Down
11 changes: 7 additions & 4 deletions cc/private/compile/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ SOURCE_CATEGORY_CC = set(
extensions.CC_SOURCE +
extensions.CC_HEADER +
extensions.C_SOURCE +
extensions.CUDA_SOURCE +
extensions.ASSEMBLER +
extensions.ASSESMBLER_WITH_C_PREPROCESSOR +
extensions.CLIF_INPUT_PROTO,
Expand All @@ -81,6 +82,7 @@ SOURCE_CATEGORY_CC = set(
SOURCE_CATEGORY_CC_AND_OBJC = set(
extensions.CC_SOURCE +
extensions.CC_HEADER +
extensions.CUDA_SOURCE +
extensions.OBJC_SOURCE +
extensions.OBJCPP_SOURCE +
extensions.C_SOURCE +
Expand All @@ -90,7 +92,7 @@ SOURCE_CATEGORY_CC_AND_OBJC = set(
# LINT.ThenChange(https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java:cc_and_objc_file_types)

# Filetypes that generate LLVM bitcode when -flto is specified.
LTO_SOURCE_EXTENSIONS = set(extensions.CC_SOURCE + extensions.C_SOURCE)
LTO_SOURCE_EXTENSIONS = set(extensions.CC_SOURCE + extensions.C_SOURCE + extensions.CUDA_SOURCE)

# LINT.IfChange(compile_api)
def compile(
Expand Down Expand Up @@ -874,7 +876,7 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_input_file = None

# Only C++ compilation unit will be compiled with C++20 Modules.
if "." + source_artifact.extension in extensions.CC_SOURCE:
if "." + source_artifact.extension in extensions.CC_SOURCE + extensions.CUDA_SOURCE:
modmap_file = _get_compile_output_file(
action_construction_context,
label,
Expand Down Expand Up @@ -1764,9 +1766,10 @@ def _create_temps_action(
extension = filename[filename.find("."):]
c_source = extension in extensions.C_SOURCE
cpp_source = extension in extensions.CC_SOURCE
cuda_source = extension in extensions.CUDA_SOURCE
objc_source = extension in extensions.OBJC_SOURCE
objcpp_source = extension in extensions.OBJCPP_SOURCE
if not c_source and not cpp_source and not objc_source and not objcpp_source:
if not c_source and not cpp_source and not objc_source and not objcpp_source and not cuda_source:
return []

category = artifact_category.PREPROCESSED_C_SOURCE if c_source else artifact_category.PREPROCESSED_CPP_SOURCE
Expand Down Expand Up @@ -2155,7 +2158,7 @@ def _use_dotd_file(feature_configuration, source_file):
header_discover_required = extension not in (extensions.ASSEMBLER + extensions.CPP_MODULE)
use_header_modules = (
feature_configuration.is_enabled("use_header_modules") and
extension in extensions.CC_SOURCE + extensions.CC_HEADER + extensions.CPP_MODULE_MAP
extension in extensions.CC_SOURCE + extensions.CC_HEADER + extensions.CPP_MODULE_MAP + extensions.CUDA_SOURCE
)
return header_discover_required and not use_header_modules

Expand Down
1 change: 1 addition & 0 deletions cc/private/compile/compile_build_variables.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ def get_specific_compile_build_variables(
_SOURCE_TYPES_FOR_CXXOPTS = set(
extensions.CC_SOURCE +
extensions.CC_HEADER +
extensions.CUDA_SOURCE +
extensions.CLIF_INPUT_PROTO +
extensions.CPP_MODULE_MAP +
extensions.OBJCPP_SOURCE,
Expand Down
1 change: 1 addition & 0 deletions cc/private/rules_impl/cc_binary_impl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ ALLOWED_SRC_FILES = []
ALLOWED_SRC_FILES.extend(cc_helper.extensions.CC_SOURCE)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.C_SOURCE)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.CC_HEADER)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.CUDA_SOURCE)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.ASSEMBLER_WITH_C_PREPROCESSOR)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.ASSEMBLER)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.ARCHIVE)
Expand Down
2 changes: 2 additions & 0 deletions cc/private/rules_impl/cc_library_impl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ ALLOWED_SRC_FILES = []
ALLOWED_SRC_FILES.extend(cc_helper.extensions.CC_SOURCE)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.C_SOURCE)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.CC_HEADER)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.CUDA_SOURCE)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.ASSEMBLER_WITH_C_PREPROCESSOR)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.ASSEMBLER)
ALLOWED_SRC_FILES.extend(cc_helper.extensions.ARCHIVE)
Expand All @@ -546,6 +547,7 @@ ALLOWED_SRC_FILES.extend(cc_helper.extensions.SHARED_LIBRARY)
SRCS_FOR_COMPILATION = []
SRCS_FOR_COMPILATION.extend(cc_helper.extensions.CC_SOURCE)
SRCS_FOR_COMPILATION.extend(cc_helper.extensions.C_SOURCE)
SRCS_FOR_COMPILATION.extend(cc_helper.extensions.CUDA_SOURCE)
SRCS_FOR_COMPILATION.extend(cc_helper.extensions.ASSEMBLER_WITH_C_PREPROCESSOR)
SRCS_FOR_COMPILATION.extend(cc_helper.extensions.ASSEMBLER)

Expand Down
3 changes: 3 additions & 0 deletions cc/private/toolchain/bsd_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfig
all_compile_actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.assemble,
ACTION_NAMES.preprocess_assemble,
Expand All @@ -42,6 +43,7 @@ all_compile_actions = [

all_cpp_compile_actions = [
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
Expand Down Expand Up @@ -208,6 +210,7 @@ def _impl(ctx):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.cpp_header_parsing,
Expand Down
30 changes: 27 additions & 3 deletions cc/private/toolchain/unix_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def layering_check_features(compiler, extra_flags_per_feature, is_macos):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
],
Expand Down Expand Up @@ -81,6 +82,7 @@ def layering_check_features(compiler, extra_flags_per_feature, is_macos):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
],
Expand Down Expand Up @@ -154,6 +156,7 @@ def parse_headers_support(parse_headers_tool_path):
all_compile_actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.assemble,
ACTION_NAMES.preprocess_assemble,
Expand All @@ -169,6 +172,7 @@ all_compile_actions = [

all_cpp_compile_actions = [
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
Expand All @@ -182,6 +186,7 @@ all_cpp_compile_actions = [
preprocessor_compile_actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.cpp_header_parsing,
Expand All @@ -194,6 +199,7 @@ preprocessor_compile_actions = [
codegen_compile_actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.assemble,
ACTION_NAMES.preprocess_assemble,
Expand Down Expand Up @@ -503,6 +509,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
Expand Down Expand Up @@ -533,6 +540,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
ACTION_NAMES.cpp_module_deps_scanning,
Expand Down Expand Up @@ -574,6 +582,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_codegen,
Expand Down Expand Up @@ -620,7 +629,7 @@ def _impl(ctx):
name = "fdo_optimize",
flag_sets = [
flag_set(
actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile],
actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile, ACTION_NAMES.cuda_compile],
flag_groups = [
flag_group(
flags = [
Expand Down Expand Up @@ -714,6 +723,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_module_codegen,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp20_module_compile,
Expand All @@ -736,6 +746,7 @@ def _impl(ctx):
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_module_codegen,
ACTION_NAMES.cpp20_module_codegen,
],
Expand All @@ -759,6 +770,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_deps_scanning,
Expand Down Expand Up @@ -800,7 +812,7 @@ def _impl(ctx):
name = "autofdo",
flag_sets = [
flag_set(
actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile],
actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile, ACTION_NAMES.cuda_compile],
flag_groups = [
flag_group(
flags = [
Expand Down Expand Up @@ -981,6 +993,7 @@ def _impl(ctx):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_module_codegen,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_deps_scanning,
Expand All @@ -1007,6 +1020,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_deps_scanning,
Expand All @@ -1033,6 +1047,7 @@ def _impl(ctx):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
] + all_link_actions + lto_index_actions,
flag_groups = [
flag_group(
Expand All @@ -1055,6 +1070,7 @@ def _impl(ctx):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.lto_backend,
] + all_link_actions + lto_index_actions,
flag_groups = [
Expand All @@ -1080,6 +1096,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_deps_scanning,
Expand Down Expand Up @@ -1115,6 +1132,7 @@ def _impl(ctx):
ACTION_NAMES.linkstamp_compile,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.cpp_module_deps_scanning,
Expand Down Expand Up @@ -1332,6 +1350,7 @@ def _impl(ctx):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.lto_backend,
],
flag_groups = [
Expand Down Expand Up @@ -1483,6 +1502,7 @@ def _impl(ctx):
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.objc_compile,
ACTION_NAMES.objcpp_compile,
Expand Down Expand Up @@ -1510,6 +1530,7 @@ def _impl(ctx):
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_module_compile,
ACTION_NAMES.objc_compile,
ACTION_NAMES.objcpp_compile,
Expand Down Expand Up @@ -1598,6 +1619,7 @@ def _impl(ctx):
ACTION_NAMES.preprocess_assemble,
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp_header_parsing,
ACTION_NAMES.cpp_module_compile,
],
Expand Down Expand Up @@ -1629,6 +1651,7 @@ def _impl(ctx):
actions = [
ACTION_NAMES.c_compile,
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
] + all_link_actions + lto_index_actions,
flag_groups = [
flag_group(flags = ["-flto=thin"]),
Expand Down Expand Up @@ -1689,7 +1712,7 @@ def _impl(ctx):
name = "treat_warnings_as_errors",
flag_sets = [
flag_set(
actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile],
actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile, ACTION_NAMES.cuda_compile],
flag_groups = [flag_group(flags = ["-Werror"])],
),
flag_set(
Expand Down Expand Up @@ -1783,6 +1806,7 @@ def _impl(ctx):
flag_set(
actions = [
ACTION_NAMES.cpp_compile,
ACTION_NAMES.cuda_compile,
ACTION_NAMES.cpp20_module_compile,
ACTION_NAMES.cpp20_module_codegen,
],
Expand Down
Loading