Skip to content

Commit b87155b

Browse files
committed
rustc_target: RISC-V: add base "I"-related important extensions
Of RISC-V features defined in stdarch, 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 ("Zihintpause"). This is based on the latest ratified ISA Manuals (version 20240411). Additional (1): One of those, "Zicsr", is a dependency of many other ISA extensions and this commit adds correct dependencies to "Zicsr" except "V" (due to an ongoing PR). 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 targets with either "riscv32gc" or "riscv64gc" are updated accordingly.
1 parent 7290b04 commit b87155b

13 files changed

+24
-14
lines changed

Diff for: compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs

+1-1
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]),

Diff for: compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs

+1-1
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]),

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_freebsd.rs

+1-1
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()

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_fuchsia.rs

+1-1
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;

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_hermit.rs

+1-1
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,

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs

+1-1
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]),

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs

+1-1
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]),

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_netbsd.rs

+1-1
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
mcount: "__mcount".into(),

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_none_elf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn target() -> Target {
2222
llvm_abiname: "lp64d".into(),
2323
cpu: "generic-rv64".into(),
2424
max_atomic_width: Some(64),
25-
features: "+m,+a,+f,+d,+c".into(),
25+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2626
panic_strategy: PanicStrategy::Abort,
2727
relocation_model: RelocModel::Static,
2828
code_model: Some(CodeModel::Medium),

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_nuttx_elf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub(crate) fn target() -> Target {
2424
llvm_abiname: "lp64d".into(),
2525
cpu: "generic-rv64".into(),
2626
max_atomic_width: Some(64),
27-
features: "+m,+a,+f,+d,+c".into(),
27+
features: "+m,+a,+f,+d,+c,+zicsr,+zifencei".into(),
2828
panic_strategy: PanicStrategy::Abort,
2929
relocation_model: RelocModel::Static,
3030
code_model: Some(CodeModel::Medium),

Diff for: compiler/rustc_target/src/spec/targets/riscv64gc_unknown_openbsd.rs

+1-1
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::openbsd::opts()

Diff for: compiler/rustc_target/src/target_features.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
488488
("c", Stable, &[]),
489489
("d", Unstable(sym::riscv_target_feature), &["f"]),
490490
("e", Unstable(sym::riscv_target_feature), &[]),
491-
("f", Unstable(sym::riscv_target_feature), &[]),
491+
("f", Unstable(sym::riscv_target_feature), &["zicsr"]),
492492
(
493493
"forced-atomics",
494494
Stability::Forbidden { reason: "unsound because it changes the ABI of atomic operations" },
@@ -516,15 +516,20 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
516516
("zdinx", Unstable(sym::riscv_target_feature), &["zfinx"]),
517517
("zfh", Unstable(sym::riscv_target_feature), &["zfhmin"]),
518518
("zfhmin", Unstable(sym::riscv_target_feature), &["f"]),
519-
("zfinx", Unstable(sym::riscv_target_feature), &[]),
519+
("zfinx", Unstable(sym::riscv_target_feature), &["zicsr"]),
520520
("zhinx", Unstable(sym::riscv_target_feature), &["zhinxmin"]),
521521
("zhinxmin", Unstable(sym::riscv_target_feature), &["zfinx"]),
522+
("zicntr", Unstable(sym::riscv_target_feature), &["zicsr"]),
523+
("zicsr", Unstable(sym::riscv_target_feature), &[]),
524+
("zifencei", Unstable(sym::riscv_target_feature), &[]),
525+
("zihintpause", Unstable(sym::riscv_target_feature), &[]),
526+
("zihpm", Unstable(sym::riscv_target_feature), &["zicsr"]),
522527
("zk", Stable, &["zkn", "zkr", "zkt"]),
523528
("zkn", Stable, &["zbkb", "zbkc", "zbkx", "zkne", "zknd", "zknh"]),
524529
("zknd", Stable, &[]),
525530
("zkne", Stable, &[]),
526531
("zknh", Stable, &[]),
527-
("zkr", Stable, &[]),
532+
("zkr", Stable, &["zicsr"]),
528533
("zks", Stable, &["zbkb", "zbkc", "zbkx", "zksed", "zksh"]),
529534
("zksed", Stable, &[]),
530535
("zksh", Stable, &[]),

Diff for: tests/ui/check-cfg/target_feature.stderr

+5
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,11 @@ LL | cfg!(target_feature = "_UNEXPECTED_VALUE");
317317
`zfinx`
318318
`zhinx`
319319
`zhinxmin`
320+
`zicntr`
321+
`zicsr`
322+
`zifencei`
323+
`zihintpause`
324+
`zihpm`
320325
`zk`
321326
`zkn`
322327
`zknd`

0 commit comments

Comments
 (0)