Skip to content

Commit dc0b1f9

Browse files
authored
Rollup merge of #120661 - xen0n:loong-medium-cmodel, r=heiher,Nilstrieb
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][1] in the "Code Model" section of LoongArch ELF psABI spec v20231219, 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. [1]: https://github.com/loongson/la-abi-specs/blob/v2.30/laelf.adoc#code-models
2 parents 13ea09b + 35dad14 commit dc0b1f9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
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 fn target() -> Target {
44
Target {
@@ -7,6 +7,7 @@ pub fn target() -> Target {
77
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(),
88
arch: "loongarch64".into(),
99
options: TargetOptions {
10+
code_model: Some(CodeModel::Medium),
1011
cpu: "generic".into(),
1112
features: "+f,+d".into(),
1213
llvm_abiname: "lp64d".into(),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616
max_atomic_width: Some(64),
1717
relocation_model: RelocModel::Static,
1818
panic_strategy: PanicStrategy::Abort,
19-
code_model: Some(CodeModel::Small),
19+
code_model: Some(CodeModel::Medium),
2020
..Default::default()
2121
},
2222
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
max_atomic_width: Some(64),
1818
relocation_model: RelocModel::Static,
1919
panic_strategy: PanicStrategy::Abort,
20-
code_model: Some(CodeModel::Small),
20+
code_model: Some(CodeModel::Medium),
2121
..Default::default()
2222
},
2323
}

0 commit comments

Comments
 (0)