Skip to content
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.

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

Added codegen_units flag for setting Rustc resource sets #3112

Merged
merged 2 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions docs/src/rust_settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,23 @@ Note that this setting is actually called `clippy.toml`.



<a id="codegen_units"></a>

## codegen_units

<pre>
--@rules_rust//rust/settings:codegen_units
</pre>

The default value for `--codegen-units` which also affects resource allocation for rustc actions.

Note that any value 0 or less will prevent this flag from being passed by Bazel and allow rustc to
perform it's default behavior.

https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units



<a id="error_format"></a>

## error_format
Expand Down
32 changes: 26 additions & 6 deletions rust/private/rustc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ load(
"CPP_LINK_NODEPS_DYNAMIC_LIBRARY_ACTION_NAME",
"CPP_LINK_STATIC_LIBRARY_ACTION_NAME",
)
load("//rust/private:common.bzl", "rust_common")
load("//rust/private:compat.bzl", "abs")
load("//rust/private:lto.bzl", "construct_lto_arguments")
load("//rust/private:providers.bzl", "RustcOutputDiagnosticsInfo", _BuildInfo = "BuildInfo")
load("//rust/private:stamp.bzl", "is_stamping_enabled")
load(":common.bzl", "rust_common")
load(":compat.bzl", "abs")
load(":lto.bzl", "construct_lto_arguments")
load(":providers.bzl", "RustcOutputDiagnosticsInfo", _BuildInfo = "BuildInfo")
load(":rustc_resource_set.bzl", "get_rustc_resource_set", "is_codegen_units_enabled")
load(":stamp.bzl", "is_stamping_enabled")
load(
"//rust/private:utils.bzl",
":utils.bzl",
"expand_dict_value_locations",
"expand_list_element_locations",
"find_cc_toolchain",
Expand Down Expand Up @@ -792,6 +793,7 @@ def collect_inputs(
return compile_inputs, out_dir, build_env_files, build_flags_files, linkstamp_outs, ambiguous_libs

def construct_arguments(
*,
ctx,
attr,
file,
Expand Down Expand Up @@ -1000,6 +1002,7 @@ def construct_arguments(

add_edition_flags(rustc_flags, crate_info)
_add_lto_flags(ctx, toolchain, rustc_flags, crate_info)
_add_codegen_units_flags(toolchain, rustc_flags)

# Link!
if ("link" in emit and crate_info.type not in ["rlib", "lib"]) or add_flags_for_binary:
Expand Down Expand Up @@ -1124,6 +1127,7 @@ def construct_arguments(
return args, env

def rustc_compile_action(
*,
ctx,
attr,
toolchain,
Expand Down Expand Up @@ -1337,6 +1341,7 @@ def rustc_compile_action(
len(crate_info.srcs.to_list()),
),
toolchain = "@rules_rust//rust:toolchain_type",
resource_set = get_rustc_resource_set(toolchain),
)
if args_metadata:
ctx.actions.run(
Expand Down Expand Up @@ -1372,6 +1377,7 @@ def rustc_compile_action(
len(crate_info.srcs.to_list()),
),
toolchain = "@rules_rust//rust:toolchain_type",
resource_set = get_rustc_resource_set(toolchain),
)
else:
fail("No process wrapper was defined for {}".format(ctx.label))
Expand Down Expand Up @@ -1597,6 +1603,20 @@ def _add_lto_flags(ctx, toolchain, args, crate):
lto_args = construct_lto_arguments(ctx, toolchain, crate)
args.add_all(lto_args)

def _add_codegen_units_flags(toolchain, args):
"""Adds flags to an Args object to configure codgen_units for 'rustc'.

https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units

Args:
toolchain (rust_toolchain): The current target's `rust_toolchain`.
args (Args): A reference to an Args object
"""
if not is_codegen_units_enabled(toolchain):
return

args.add("-Ccodegen-units={}".format(toolchain._codegen_units))

def establish_cc_info(ctx, attr, crate_info, toolchain, cc_toolchain, feature_configuration, interface_library):
"""If the produced crate is suitable yield a CcInfo to allow for interop with cc rules

Expand Down
Loading
Loading