Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 6aec7de

Browse files
authored
Rollup merge of rust-lang#138823 - a4lg:riscv-feature-addition-base-i, r=Amanieu
rustc_target: RISC-V: add base `I`-related important extensions Of ratified RISC-V features defined, this commit adds extensions satisfying following criteria: * Formerly a part of the `I` extension and splitted thereafter (now ratified as `I` + `Zifencei` + `Zicsr` + `Zicntr` + `Zihpm`) or * Dicoverable from newer versions of the Linux kernel and implemented as a part of `std_detect`'s feature (`Zihintpause`) and * Available on LLVM 18. This is based on [the latest ratified ISA Manuals (version 20240411)](https://lf-riscv.atlassian.net/wiki/spaces/HOME/pages/16154769/RISC-V+Technical+Specifications). LLVM Definitions: * [`Zifencei`](https://github.com/llvm/llvm-project/blob/llvmorg-20.1.0/llvm/lib/Target/RISCV/RISCVFeatures.td#L133-L137) * [`Zicsr`](https://github.com/llvm/llvm-project/blob/llvmorg-20.1.0/llvm/lib/Target/RISCV/RISCVFeatures.td#L116-L120) * [`Zicntr`](https://github.com/llvm/llvm-project/blob/llvmorg-20.1.0/llvm/lib/Target/RISCV/RISCVFeatures.td#L122-L124) * [`Zihpm`](https://github.com/llvm/llvm-project/blob/llvmorg-20.1.0/llvm/lib/Target/RISCV/RISCVFeatures.td#L153-L155) * [`Zihintpause`](https://github.com/llvm/llvm-project/blob/llvmorg-20.1.0/llvm/lib/Target/RISCV/RISCVFeatures.td#L139-L144) Additional (1): One of those, `Zicsr`, is a dependency of many other ISA extensions and this commit adds correct dependencies to `Zicsr`. Additional (2): In RISC-V, `G` is an abbreviation of following extensions: * `I` * `M` * `A` * `F` * `D` * `Zicsr` (although implied by `F`) * `Zifencei` and all RISC-V targets with the `G` abbreviation and targets for Android / VxWorks are updated accordingly. Note: Android will require RVA22 (likely RVA22U64) and some more extensions, which is a superset of RV64GC. For VxWorks, all BSPs currently distributed by Wind River are for boards with RV64GC (this commit also updates `riscv32-wrs-vxworks` though). -------- This is the version 4. `Ztso` in the original proposal is removed on the PR version 2 due to the minimum LLVM version (non-experimental `Ztso` requires LLVM 19 while minimum LLVM version of Rust is 18). This is not back in PR version 3 and 4 after noticing adding `Ztso` is possible by checking host LLVM version because PR version 3 introduces compiler target changes (and adding more extensions would complicate the problems; sorry `Zihintpause`). Version 4: * Fixed some commit messages, * Added Android / VxWorks targets to imply `G` and * Added an implication from `Zve32x` to `Zicsr` (which makes all vector extension subsets to imply `Zicsr`) since rust-lang#138742 is now merged. Related: * rust-lang#44839 (`riscv_target_feature`) * rust-lang#114544 (This PR can be a prerequisite of resolving a part of that tracking issue) * rust-lang#138742 (Touches the same place and vector extensions depend on `Zicsr`) NOT Related but linked: * rust-lang#132618 (This PR won't be blocked by this issue since none of those extensions do not change the ABI) `@rustbot` r? `@Amanieu` `@rustbot` label +T-compiler +O-riscv +A-target-feature
2 parents 5b0f658 + 6f40f0c commit 6aec7de

16 files changed

+28
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
1616
cpu: "generic-rv32".into(),
1717
llvm_abiname: "ilp32d".into(),
1818
max_atomic_width: Some(32),
19-
features: "+m,+a,+f,+d,+c".into(),
19+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2020
stack_probes: StackProbeType::Inline,
2121
..base::vxworks::opts()
2222
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
options: TargetOptions {
1818
code_model: Some(CodeModel::Medium),
1919
cpu: "generic-rv32".into(),
20-
features: "+m,+a,+f,+d,+c".into(),
20+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2121
llvm_abiname: "ilp32d".into(),
2222
max_atomic_width: Some(32),
2323
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
1919
options: TargetOptions {
2020
code_model: Some(CodeModel::Medium),
2121
cpu: "generic-rv32".into(),
22-
features: "+m,+a,+f,+d,+c".into(),
22+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2323
llvm_abiname: "ilp32d".into(),
2424
max_atomic_width: Some(32),
2525
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
1919
options: TargetOptions {
2020
code_model: Some(CodeModel::Medium),
2121
cpu: "generic-rv64".into(),
22-
features: "+m,+a,+f,+d,+c,+zba,+zbb,+zbs,+v".into(),
22+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei,+zba,+zbb,+zbs,+v".into(),
2323
llvm_abiname: "lp64d".into(),
2424
supported_sanitizers: SanitizerSet::ADDRESS,
2525
max_atomic_width: Some(64),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
1616
cpu: "generic-rv64".into(),
1717
llvm_abiname: "lp64d".into(),
1818
max_atomic_width: Some(64),
19-
features: "+m,+a,+f,+d,+c".into(),
19+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2020
stack_probes: StackProbeType::Inline,
2121
..base::vxworks::opts()
2222
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
1515
options: TargetOptions {
1616
code_model: Some(CodeModel::Medium),
1717
cpu: "generic-rv64".into(),
18-
features: "+m,+a,+f,+d,+c".into(),
18+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
1919
llvm_abiname: "lp64d".into(),
2020
max_atomic_width: Some(64),
2121
..base::freebsd::opts()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub(crate) fn target() -> Target {
44
let mut base = base::fuchsia::opts();
55
base.code_model = Some(CodeModel::Medium);
66
base.cpu = "generic-rv64".into();
7-
base.features = "+m,+a,+f,+d,+c".into();
7+
base.features = "+m,+a,+f,+d,+c,+zicsr,+zifencei".into();
88
base.llvm_abiname = "lp64d".into();
99
base.max_atomic_width = Some(64);
1010
base.stack_probes = StackProbeType::Inline;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub(crate) fn target() -> Target {
1414
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
1515
options: TargetOptions {
1616
cpu: "generic-rv64".into(),
17-
features: "+m,+a,+f,+d,+c".into(),
17+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
1818
relocation_model: RelocModel::Pic,
1919
code_model: Some(CodeModel::Medium),
2020
tls_model: TlsModel::LocalExec,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
options: TargetOptions {
1818
code_model: Some(CodeModel::Medium),
1919
cpu: "generic-rv64".into(),
20-
features: "+m,+a,+f,+d,+c".into(),
20+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2121
llvm_abiname: "lp64d".into(),
2222
max_atomic_width: Some(64),
2323
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) fn target() -> Target {
1717
options: TargetOptions {
1818
code_model: Some(CodeModel::Medium),
1919
cpu: "generic-rv64".into(),
20-
features: "+m,+a,+f,+d,+c".into(),
20+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2121
llvm_abiname: "lp64d".into(),
2222
max_atomic_width: Some(64),
2323
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),

0 commit comments

Comments
 (0)