Skip to content

Commit c97922d

Browse files
committed
Auto merge of rust-lang#99443 - jam1garner:mips-virt-feature, r=nagisa
Add support for MIPS VZ ISA extension [Link to relevant LLVM line where virt extension is specified](https://github.com/llvm/llvm-project/blob/83fab8cee9d6b9fa911195c20325b4512a7a22ef/llvm/lib/Target/Mips/Mips.td#L172-L173) This has been tested on mips-unknown-linux-musl with a target-cpu that is >= MIPS32 5 and `target-features=+virt`. The example was checked in a disassembler to ensure the correct assembly sequence was being generated using the virtualization instructions. Needed additional work: * MIPS is missing from [the Rust reference CPU feature lists](https://doc.rust-lang.org/reference/attributes/codegen.html#available-features) Example docs for later: ```md #### `mips` or `mips64` This platform requires that `#[target_feature]` is only applied to [`unsafe` functions][unsafe function]. This target's feature support is currently unstable and must be enabled by `#![feature(mips_target_feature)]` ([Issue rust-lang#44839]) [Issue rust-lang#44839]: rust-lang#44839 Further documentation on these features can be found in the [MIPS Instruction Set Reference Manual], or elsewhere on [mips.com]. [MIPS Instruction Set Reference Manual]: https://s3-eu-west-1.amazonaws.com/downloads-mips/documents/MD00086-2B-MIPS32BIS-AFP-6.06.pdf [developer.arm.com]: https://www.mips.com/products/architectures/ase/ Feature | Implicitly Enables | Description ---------------|--------------------|------------------- `fp64` | | 64-bit Floating Point `msa` | | "MIPS SIMD Architecture" `virt` | | Virtualization instructions (VZ ASE) ``` If the above is good I can also submit a PR for that if there's interest in documenting it while it's still unstable. Otherwise that can be dropped, I just wrote it before realizing it was possibly not a good idea. Relevant to rust-lang#44839
2 parents a0d1df4 + bec3a54 commit c97922d

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

compiler/rustc_codegen_llvm/src/llvm_util.rs

+4
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ pub fn time_trace_profiler_finish(file_name: &Path) {
154154
//
155155
// To find a list of LLVM's names, check llvm-project/llvm/include/llvm/Support/*TargetParser.def
156156
// where the * matches the architecture's name
157+
//
158+
// For targets not present in the above location, see llvm-project/llvm/lib/Target/{ARCH}/*.td
159+
// where `{ARCH}` is the architecture name. Look for instances of `SubtargetFeature`.
160+
//
157161
// Beware to not use the llvm github project for this, but check the git submodule
158162
// found in src/llvm-project
159163
// Though note that Rust can also be build with an external precompiled version of LLVM

compiler/rustc_codegen_ssa/src/target_features.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,11 @@ const POWERPC_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
210210
("vsx", Some(sym::powerpc_target_feature)),
211211
];
212212

213-
const MIPS_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] =
214-
&[("fp64", Some(sym::mips_target_feature)), ("msa", Some(sym::mips_target_feature))];
213+
const MIPS_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
214+
("fp64", Some(sym::mips_target_feature)),
215+
("msa", Some(sym::mips_target_feature)),
216+
("virt", Some(sym::mips_target_feature)),
217+
];
215218

216219
const RISCV_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
217220
("m", Some(sym::riscv_target_feature)),

0 commit comments

Comments
 (0)