Skip to content

Commit c8ccedf

Browse files
authored
Unrolled build for rust-lang#130266
Rollup merge of rust-lang#130266 - heiher:loong-medium-cmodel, r=compiler-errors target: default to the medium code model on LoongArch targets The Rust LoongArch targets have been using the default LLVM code model so far, which is "small" in LLVM-speak and "normal" in LoongArch-speak. As described in the "Code Model" section of LoongArch ELF psABI spec v20231219 [1], one can only make function calls as far as ±128MiB with the "normal" code model; this is insufficient for very large software containing Rust components that needs to be linked into the big text section, such as Chromium. Because: * we do not want to ask users to recompile std if they are to build such software, * objects compiled with larger code models can be linked with those with smaller code models without problems, and * the "medium" code model is comparable to the "small"/"normal" one performance-wise (same data access pattern; each function call becomes 2-insn long and indirect, but this may be relaxed back into the direct 1-insn form in a future LLVM version), but is able to perform function calls within ±128GiB, it is better to just switch the targets to the "medium" code model, which is also "medium" in LLVM-speak. Relands [2]: rust-lang#120661 [1]: https://github.com/loongson/la-abi-specs/blob/v2.30/laelf.adoc#code-models [2]: rust-lang#121289 (comment)
2 parents 0307e40 + 82777a9 commit c8ccedf

4 files changed

+6
-4
lines changed

compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_gnu.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{base, Target, TargetOptions};
1+
use crate::spec::{base, CodeModel, Target, TargetOptions};
22

33
pub(crate) fn target() -> Target {
44
Target {
@@ -13,6 +13,7 @@ pub(crate) fn target() -> Target {
1313
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
1414
arch: "loongarch64".into(),
1515
options: TargetOptions {
16+
code_model: Some(CodeModel::Medium),
1617
cpu: "generic".into(),
1718
features: "+f,+d".into(),
1819
llvm_abiname: "lp64d".into(),

compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{base, Target, TargetOptions};
1+
use crate::spec::{base, CodeModel, Target, TargetOptions};
22

33
pub(crate) fn target() -> Target {
44
Target {
@@ -13,6 +13,7 @@ pub(crate) fn target() -> Target {
1313
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
1414
arch: "loongarch64".into(),
1515
options: TargetOptions {
16+
code_model: Some(CodeModel::Medium),
1617
cpu: "generic".into(),
1718
features: "+f,+d".into(),
1819
llvm_abiname: "lp64d".into(),

compiler/rustc_target/src/spec/targets/loongarch64_unknown_none.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub(crate) fn target() -> Target {
2323
max_atomic_width: Some(64),
2424
relocation_model: RelocModel::Static,
2525
panic_strategy: PanicStrategy::Abort,
26-
code_model: Some(CodeModel::Small),
26+
code_model: Some(CodeModel::Medium),
2727
..Default::default()
2828
},
2929
}

compiler/rustc_target/src/spec/targets/loongarch64_unknown_none_softfloat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(crate) fn target() -> Target {
2424
max_atomic_width: Some(64),
2525
relocation_model: RelocModel::Static,
2626
panic_strategy: PanicStrategy::Abort,
27-
code_model: Some(CodeModel::Small),
27+
code_model: Some(CodeModel::Medium),
2828
..Default::default()
2929
},
3030
}

0 commit comments

Comments
 (0)