bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Refactor and fill out target feature lists

Browse source
This commit is contained in:
Caleb Zulawski 2024-08-02 00:20:49 -04:00
parent 3c48f6548b
commit fbd618d4aa
5 changed files with 293 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_gcc/src/gcc_util.rs
View file

@ -65,8 +65,8 @@ pub(crate) fn global_gcc_features(sess: &Session, diagnostics: bool) -> Vec<Stri
let feature = backend_feature_name(s)?; let feature = backend_feature_name(s)?;
// Warn against use of GCC specific feature names on the CLI. // Warn against use of GCC specific feature names on the CLI.
if diagnostics && !supported_features.iter().any(|&(v, _)| v == feature) { if diagnostics && !supported_features.iter().any(|&(v, _, _)| v == feature) {
let rust_feature = supported_features.iter().find_map(|&(rust_feature, _)| { let rust_feature = supported_features.iter().find_map(|&(rust_feature, _, _)| {
let gcc_features = to_gcc_features(sess, rust_feature); let gcc_features = to_gcc_features(sess, rust_feature);
if gcc_features.contains(&feature) && !gcc_features.contains(&rust_feature) { if gcc_features.contains(&feature) && !gcc_features.contains(&rust_feature) {
Some(rust_feature) Some(rust_feature)

2
compiler/rustc_codegen_gcc/src/lib.rs
View file

@ -486,7 +486,7 @@ pub fn target_features(
sess.target sess.target
.supported_target_features() .supported_target_features()
.iter() .iter()
.filter_map(|&(feature, gate)| { .filter_map(|&(feature, gate, _)| {
if sess.is_nightly_build() || allow_unstable || gate.is_stable() { if sess.is_nightly_build() || allow_unstable || gate.is_stable() {
Some(feature) Some(feature)
} else { } else {

28
compiler/rustc_codegen_llvm/src/llvm_util.rs
View file

@ -312,7 +312,7 @@ pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> {
sess.target sess.target
.supported_target_features() .supported_target_features()
.iter() .iter()
.filter_map(|&(feature, gate)| { .filter_map(|&(feature, gate, _)| {
if sess.is_nightly_build() || allow_unstable || gate.is_stable() { if sess.is_nightly_build() || allow_unstable || gate.is_stable() {
Some(feature) Some(feature)
} else { } else {
@ -386,7 +386,7 @@ fn print_target_features(out: &mut String, sess: &Session, tm: &llvm::TargetMach
.target .target
.supported_target_features() .supported_target_features()
.iter() .iter()
.map(|(feature, _gate)| { .map(|(feature, _gate, _implied)| {
// LLVM asserts that these are sorted. LLVM and Rust both use byte comparison for these strings. // LLVM asserts that these are sorted. LLVM and Rust both use byte comparison for these strings.
let llvm_feature = to_llvm_features(sess, *feature).llvm_feature_name; let llvm_feature = to_llvm_features(sess, *feature).llvm_feature_name;
let desc = let desc =
@ -571,17 +571,19 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
let feature = backend_feature_name(sess, s)?; let feature = backend_feature_name(sess, s)?;
// Warn against use of LLVM specific feature names and unstable features on the CLI. // Warn against use of LLVM specific feature names and unstable features on the CLI.
if diagnostics { if diagnostics {
let feature_state = supported_features.iter().find(|&&(v, _)| v == feature); let feature_state = supported_features.iter().find(|&&(v, _, _)| v == feature);
if feature_state.is_none() { if feature_state.is_none() {
let rust_feature = supported_features.iter().find_map(|&(rust_feature, _)| { let rust_feature =
let llvm_features = to_llvm_features(sess, rust_feature); supported_features.iter().find_map(|&(rust_feature, _, _)| {
if llvm_features.contains(feature) && !llvm_features.contains(rust_feature) let llvm_features = to_llvm_features(sess, rust_feature);
{ if llvm_features.contains(feature)
Some(rust_feature) && !llvm_features.contains(rust_feature)
} else { {
None Some(rust_feature)
} } else {
}); None
}
});
let unknown_feature = if let Some(rust_feature) = rust_feature { let unknown_feature = if let Some(rust_feature) = rust_feature {
UnknownCTargetFeature { UnknownCTargetFeature {
feature, feature,
@ -592,7 +594,7 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
}; };
sess.dcx().emit_warn(unknown_feature); sess.dcx().emit_warn(unknown_feature);
} else if feature_state } else if feature_state
.is_some_and(|(_name, feature_gate)| !feature_gate.is_stable()) .is_some_and(|(_name, feature_gate, _implied)| !feature_gate.is_stable())
{ {
// An unstable feature. Warn about using it. // An unstable feature. Warn about using it.
sess.dcx().emit_warn(UnstableCTargetFeature { feature }); sess.dcx().emit_warn(UnstableCTargetFeature { feature });

6
compiler/rustc_codegen_ssa/src/target_features.rs
View file

@ -160,7 +160,7 @@ pub(crate) fn provide(providers: &mut Providers) {
.target .target
.supported_target_features() .supported_target_features()
.iter() .iter()
.map(|&(a, b)| (a.to_string(), b.as_feature_name())) .map(|&(a, b, _)| (a.to_string(), b.as_feature_name()))
.collect() .collect()
} }
}, },
@ -168,9 +168,9 @@ pub(crate) fn provide(providers: &mut Providers) {
let implied_features = tcx let implied_features = tcx
.sess .sess
.target .target
.implied_target_features() .supported_target_features()
.iter() .iter()
.map(|(f, i)| (Symbol::intern(f), i)) .map(|(f, _, i)| (Symbol::intern(f), i))
.collect::<FxHashMap<_, _>>(); .collect::<FxHashMap<_, _>>();
// implied target features have their own implied target features, so we traverse the // implied target features have their own implied target features, so we traverse the

613
compiler/rustc_target/src/target_features.rs
View file

@ -53,136 +53,146 @@ impl Stability {
// //
// Stabilizing a target feature requires t-lang approval. // Stabilizing a target feature requires t-lang approval.
const ARM_ALLOWED_FEATURES: &[(&str, Stability)] = &[ type ImpliedFeatures = &'static [&'static str];
const ARM_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("aclass", Unstable(sym::arm_target_feature)), ("aclass", Unstable(sym::arm_target_feature), &[]),
("aes", Unstable(sym::arm_target_feature)), ("aes", Unstable(sym::arm_target_feature), &["neon"]),
("crc", Unstable(sym::arm_target_feature)), ("crc", Unstable(sym::arm_target_feature), &[]),
("d32", Unstable(sym::arm_target_feature)), ("d32", Unstable(sym::arm_target_feature), &[]),
("dotprod", Unstable(sym::arm_target_feature)), ("dotprod", Unstable(sym::arm_target_feature), &["neon"]),
("dsp", Unstable(sym::arm_target_feature)), ("dsp", Unstable(sym::arm_target_feature), &[]),
("fp-armv8", Unstable(sym::arm_target_feature)), ("fp-armv8", Unstable(sym::arm_target_feature), &["vfp4"]),
("i8mm", Unstable(sym::arm_target_feature)), ("i8mm", Unstable(sym::arm_target_feature), &["neon"]),
("mclass", Unstable(sym::arm_target_feature)), ("mclass", Unstable(sym::arm_target_feature), &[]),
("neon", Unstable(sym::arm_target_feature)), ("neon", Unstable(sym::arm_target_feature), &["vfp3"]),
("rclass", Unstable(sym::arm_target_feature)), ("rclass", Unstable(sym::arm_target_feature), &[]),
("sha2", Unstable(sym::arm_target_feature)), ("sha2", Unstable(sym::arm_target_feature), &["neon"]),
// This is needed for inline assembly, but shouldn't be stabilized as-is // This is needed for inline assembly, but shouldn't be stabilized as-is
// since it should be enabled per-function using #[instruction_set], not // since it should be enabled per-function using #[instruction_set], not
// #[target_feature]. // #[target_feature].
("thumb-mode", Unstable(sym::arm_target_feature)), ("thumb-mode", Unstable(sym::arm_target_feature), &[]),
("thumb2", Unstable(sym::arm_target_feature)), ("thumb2", Unstable(sym::arm_target_feature), &[]),
("trustzone", Unstable(sym::arm_target_feature)), ("trustzone", Unstable(sym::arm_target_feature), &[]),
("v5te", Unstable(sym::arm_target_feature)), ("v5te", Unstable(sym::arm_target_feature), &[]),
("v6", Unstable(sym::arm_target_feature)), ("v6", Unstable(sym::arm_target_feature), &["v5te"]),
("v6k", Unstable(sym::arm_target_feature)), ("v6k", Unstable(sym::arm_target_feature), &["v6"]),
("v6t2", Unstable(sym::arm_target_feature)), ("v6t2", Unstable(sym::arm_target_feature), &["v6k", "thumb2"]),
("v7", Unstable(sym::arm_target_feature)), ("v7", Unstable(sym::arm_target_feature), &["v6t2"]),
("v8", Unstable(sym::arm_target_feature)), ("v8", Unstable(sym::arm_target_feature), &["v7"]),
("vfp2", Unstable(sym::arm_target_feature)), ("vfp2", Unstable(sym::arm_target_feature), &[]),
("vfp3", Unstable(sym::arm_target_feature)), ("vfp3", Unstable(sym::arm_target_feature), &["vfp2", "d32"]),
("vfp4", Unstable(sym::arm_target_feature)), ("vfp4", Unstable(sym::arm_target_feature), &["vfp3"]),
("virtualization", Unstable(sym::arm_target_feature)), ("virtualization", Unstable(sym::arm_target_feature), &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const AARCH64_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const AARCH64_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
// FEAT_AES & FEAT_PMULL // FEAT_AES & FEAT_PMULL
("aes", Stable), ("aes", Stable, &["neon"]),
// FEAT_BF16 // FEAT_BF16
("bf16", Stable), ("bf16", Stable, &[]),
// FEAT_BTI // FEAT_BTI
("bti", Stable), ("bti", Stable, &[]),
// FEAT_CRC // FEAT_CRC
("crc", Stable), ("crc", Stable, &[]),
// FEAT_DIT // FEAT_DIT
("dit", Stable), ("dit", Stable, &[]),
// FEAT_DotProd // FEAT_DotProd
("dotprod", Stable), ("dotprod", Stable, &["neon"]),
// FEAT_DPB // FEAT_DPB
("dpb", Stable), ("dpb", Stable, &[]),
// FEAT_DPB2 // FEAT_DPB2
("dpb2", Stable), ("dpb2", Stable, &["dpb"]),
// FEAT_F32MM // FEAT_F32MM
("f32mm", Stable), ("f32mm", Stable, &["sve"]),
// FEAT_F64MM // FEAT_F64MM
("f64mm", Stable), ("f64mm", Stable, &["sve"]),
// FEAT_FCMA // FEAT_FCMA
("fcma", Stable), ("fcma", Stable, &["neon"]),
// FEAT_FHM // FEAT_FHM
("fhm", Stable), ("fhm", Stable, &["fp16"]),
// FEAT_FLAGM // FEAT_FLAGM
("flagm", Stable), ("flagm", Stable, &[]),
// FEAT_FP16 // FEAT_FP16
("fp16", Stable), ("fp16", Stable, &[]),
// FEAT_FRINTTS // FEAT_FRINTTS
("frintts", Stable), ("frintts", Stable, &[]),
// FEAT_I8MM // FEAT_I8MM
("i8mm", Stable), ("i8mm", Stable, &[]),
// FEAT_JSCVT // FEAT_JSCVT
("jsconv", Stable), ("jsconv", Stable, &[]),
// FEAT_LOR // FEAT_LOR
("lor", Stable), ("lor", Stable, &[]),
// FEAT_LSE // FEAT_LSE
("lse", Stable), ("lse", Stable, &[]),
// FEAT_MTE & FEAT_MTE2 // FEAT_MTE & FEAT_MTE2
("mte", Stable), ("mte", Stable, &[]),
// FEAT_AdvSimd & FEAT_FP // FEAT_AdvSimd & FEAT_FP
("neon", Stable), ("neon", Stable, &[]),
// FEAT_PAUTH (address authentication) // FEAT_PAUTH (address authentication)
("paca", Stable), ("paca", Stable, &[]),
// FEAT_PAUTH (generic authentication) // FEAT_PAUTH (generic authentication)
("pacg", Stable), ("pacg", Stable, &[]),
// FEAT_PAN // FEAT_PAN
("pan", Stable), ("pan", Stable, &[]),
// FEAT_PMUv3 // FEAT_PMUv3
("pmuv3", Stable), ("pmuv3", Stable, &[]),
// FEAT_RAND // FEAT_RAND
("rand", Stable), ("rand", Stable, &[]),
// FEAT_RAS & FEAT_RASv1p1 // FEAT_RAS & FEAT_RASv1p1
("ras", Stable), ("ras", Stable, &[]),
// FEAT_RCPC // FEAT_RCPC
("rcpc", Stable), ("rcpc", Stable, &[]),
// FEAT_RCPC2 // FEAT_RCPC2
("rcpc2", Stable), ("rcpc2", Stable, &["rcpc"]),
// FEAT_RDM // FEAT_RDM
("rdm", Stable), ("rdm", Stable, &["neon"]),
// FEAT_SB // FEAT_SB
("sb", Stable), ("sb", Stable, &[]),
// FEAT_SHA1 & FEAT_SHA256 // FEAT_SHA1 & FEAT_SHA256
("sha2", Stable), ("sha2", Stable, &["neon"]),
// FEAT_SHA512 & FEAT_SHA3 // FEAT_SHA512 & FEAT_SHA3
("sha3", Stable), ("sha3", Stable, &["sha2"]),
// FEAT_SM3 & FEAT_SM4 // FEAT_SM3 & FEAT_SM4
("sm4", Stable), ("sm4", Stable, &["neon"]),
// FEAT_SPE // FEAT_SPE
("spe", Stable), ("spe", Stable, &[]),
// FEAT_SSBS & FEAT_SSBS2 // FEAT_SSBS & FEAT_SSBS2
("ssbs", Stable), ("ssbs", Stable, &[]),
// FEAT_SVE // FEAT_SVE
("sve", Stable), ("sve", Stable, &[]),
// FEAT_SVE2 // FEAT_SVE2
("sve2", Stable), ("sve2", Stable, &["sve"]),
// FEAT_SVE2_AES // FEAT_SVE2_AES
("sve2-aes", Stable), ("sve2-aes", Stable, &["sve2", "aes"]),
// FEAT_SVE2_BitPerm // FEAT_SVE2_BitPerm
("sve2-bitperm", Stable), ("sve2-bitperm", Stable, &["sve2"]),
// FEAT_SVE2_SHA3 // FEAT_SVE2_SHA3
("sve2-sha3", Stable), ("sve2-sha3", Stable, &["sve2", "sha3"]),
// FEAT_SVE2_SM4 // FEAT_SVE2_SM4
("sve2-sm4", Stable), ("sve2-sm4", Stable, &["sve2", "sm4"]),
// FEAT_TME // FEAT_TME
("tme", Stable), ("tme", Stable, &[]),
("v8.1a", Unstable(sym::aarch64_ver_target_feature)), (
("v8.2a", Unstable(sym::aarch64_ver_target_feature)), "v8.1a",
("v8.3a", Unstable(sym::aarch64_ver_target_feature)), Unstable(sym::aarch64_ver_target_feature),
("v8.4a", Unstable(sym::aarch64_ver_target_feature)), &["crc", "lse", "rdm", "pan", "lor", "vh"],
("v8.5a", Unstable(sym::aarch64_ver_target_feature)), ),
("v8.6a", Unstable(sym::aarch64_ver_target_feature)), ("v8.2a", Unstable(sym::aarch64_ver_target_feature), &["v8.1a", "ras", "dpb"]),
("v8.7a", Unstable(sym::aarch64_ver_target_feature)), (
"v8.3a",
Unstable(sym::aarch64_ver_target_feature),
&["v8.2a", "rcpc", "paca", "pacg", "jsconv"],
),
("v8.4a", Unstable(sym::aarch64_ver_target_feature), &["v8.3a", "dotprod", "dit", "flagm"]),
("v8.5a", Unstable(sym::aarch64_ver_target_feature), &["v8.4a", "ssbs", "sb", "dpb2", "bti"]),
("v8.6a", Unstable(sym::aarch64_ver_target_feature), &["v8.5a", "bf16", "i8mm"]),
("v8.7a", Unstable(sym::aarch64_ver_target_feature), &[]),
// FEAT_VHE // FEAT_VHE
("vh", Stable), ("vh", Stable, &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
@ -190,295 +200,223 @@ const AARCH64_TIED_FEATURES: &[&[&str]] = &[
&["paca", "pacg"], // Together these represent `pauth` in LLVM &["paca", "pacg"], // Together these represent `pauth` in LLVM
]; ];
const X86_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const X86_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("adx", Stable), ("adx", Stable, &[]),
("aes", Stable), ("aes", Stable, &["sse2"]),
("amx-bf16", Unstable(sym::x86_amx_intrinsics)), ("amx-bf16", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
("amx-complex", Unstable(sym::x86_amx_intrinsics)), ("amx-complex", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
("amx-fp16", Unstable(sym::x86_amx_intrinsics)), ("amx-fp16", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
("amx-int8", Unstable(sym::x86_amx_intrinsics)), ("amx-int8", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
("amx-tile", Unstable(sym::x86_amx_intrinsics)), ("amx-tile", Unstable(sym::x86_amx_intrinsics), &[]),
("avx", Stable), ("avx", Stable, &["sse4.2"]),
("avx2", Stable), ("avx2", Stable, &["avx"]),
("avx512bf16", Unstable(sym::avx512_target_feature)), ("avx512bf16", Unstable(sym::avx512_target_feature), &["avx512bw"]),
("avx512bitalg", Unstable(sym::avx512_target_feature)), ("avx512bitalg", Unstable(sym::avx512_target_feature), &["avx512bw"]),
("avx512bw", Unstable(sym::avx512_target_feature)), ("avx512bw", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512cd", Unstable(sym::avx512_target_feature)), ("avx512cd", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512dq", Unstable(sym::avx512_target_feature)), ("avx512dq", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512f", Unstable(sym::avx512_target_feature)), ("avx512f", Unstable(sym::avx512_target_feature), &["avx2", "fma", "f16c"]),
("avx512fp16", Unstable(sym::avx512_target_feature)), ("avx512fp16", Unstable(sym::avx512_target_feature), &["avx512bw", "avx512vl", "avx512dq"]),
("avx512ifma", Unstable(sym::avx512_target_feature)), ("avx512ifma", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512vbmi", Unstable(sym::avx512_target_feature)), ("avx512vbmi", Unstable(sym::avx512_target_feature), &["avx512bw"]),
("avx512vbmi2", Unstable(sym::avx512_target_feature)), ("avx512vbmi2", Unstable(sym::avx512_target_feature), &["avx512bw"]),
("avx512vl", Unstable(sym::avx512_target_feature)), ("avx512vl", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512vnni", Unstable(sym::avx512_target_feature)), ("avx512vnni", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512vp2intersect", Unstable(sym::avx512_target_feature)), ("avx512vp2intersect", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avx512vpopcntdq", Unstable(sym::avx512_target_feature)), ("avx512vpopcntdq", Unstable(sym::avx512_target_feature), &["avx512f"]),
("avxifma", Unstable(sym::avx512_target_feature)), ("avxifma", Unstable(sym::avx512_target_feature), &["avx2"]),
("avxneconvert", Unstable(sym::avx512_target_feature)), ("avxneconvert", Unstable(sym::avx512_target_feature), &["avx2"]),
("avxvnni", Unstable(sym::avx512_target_feature)), ("avxvnni", Unstable(sym::avx512_target_feature), &["avx2"]),
("avxvnniint16", Unstable(sym::avx512_target_feature)), ("avxvnniint16", Unstable(sym::avx512_target_feature), &["avx2"]),
("avxvnniint8", Unstable(sym::avx512_target_feature)), ("avxvnniint8", Unstable(sym::avx512_target_feature), &["avx2"]),
("bmi1", Stable), ("bmi1", Stable, &[]),
("bmi2", Stable), ("bmi2", Stable, &[]),
("cmpxchg16b", Stable), ("cmpxchg16b", Stable, &[]),
("ermsb", Unstable(sym::ermsb_target_feature)), ("ermsb", Unstable(sym::ermsb_target_feature), &[]),
("f16c", Stable), ("f16c", Stable, &["avx"]),
("fma", Stable), ("fma", Stable, &["avx"]),
("fxsr", Stable), ("fxsr", Stable, &[]),
("gfni", Unstable(sym::avx512_target_feature)), ("gfni", Unstable(sym::avx512_target_feature), &["sse2"]),
("lahfsahf", Unstable(sym::lahfsahf_target_feature)), ("lahfsahf", Unstable(sym::lahfsahf_target_feature), &[]),
("lzcnt", Stable), ("lzcnt", Stable, &[]),
("movbe", Stable), ("movbe", Stable, &[]),
("pclmulqdq", Stable), ("pclmulqdq", Stable, &[]),
("popcnt", Stable), ("popcnt", Stable, &[]),
("prfchw", Unstable(sym::prfchw_target_feature)), ("prfchw", Unstable(sym::prfchw_target_feature), &[]),
("rdrand", Stable), ("rdrand", Stable, &[]),
("rdseed", Stable), ("rdseed", Stable, &[]),
("rtm", Unstable(sym::rtm_target_feature)), ("rtm", Unstable(sym::rtm_target_feature), &[]),
("sha", Stable), ("sha", Stable, &["sse2"]),
("sha512", Unstable(sym::sha512_sm_x86)), ("sha512", Unstable(sym::sha512_sm_x86), &["avx2"]),
("sm3", Unstable(sym::sha512_sm_x86)), ("sm3", Unstable(sym::sha512_sm_x86), &["avx"]),
("sm4", Unstable(sym::sha512_sm_x86)), ("sm4", Unstable(sym::sha512_sm_x86), &["avx2"]),
("sse", Stable), ("sse", Stable, &[]),
("sse2", Stable), ("sse2", Stable, &["sse"]),
("sse3", Stable), ("sse3", Stable, &["sse2"]),
("sse4.1", Stable), ("sse4.1", Stable, &["ssse3"]),
("sse4.2", Stable), ("sse4.2", Stable, &["sse4.1"]),
("sse4a", Unstable(sym::sse4a_target_feature)), ("sse4a", Unstable(sym::sse4a_target_feature), &["sse3"]),
("ssse3", Stable), ("ssse3", Stable, &["sse3"]),
("tbm", Unstable(sym::tbm_target_feature)), ("tbm", Unstable(sym::tbm_target_feature), &[]),
("vaes", Unstable(sym::avx512_target_feature)), ("vaes", Unstable(sym::avx512_target_feature), &["avx2", "aes"]),
("vpclmulqdq", Unstable(sym::avx512_target_feature)), ("vpclmulqdq", Unstable(sym::avx512_target_feature), &["avx", "pclmulqdq"]),
("xop", Unstable(sym::xop_target_feature)), ("xop", Unstable(sym::xop_target_feature), &[/*"fma4", */ "avx", "sse4a"]),
("xsave", Stable), ("xsave", Stable, &[]),
("xsavec", Stable), ("xsavec", Stable, &["xsave"]),
("xsaveopt", Stable), ("xsaveopt", Stable, &["xsave"]),
("xsaves", Stable), ("xsaves", Stable, &["xsave"]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const HEXAGON_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const HEXAGON_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("hvx", Unstable(sym::hexagon_target_feature)), ("hvx", Unstable(sym::hexagon_target_feature), &[]),
("hvx-length128b", Unstable(sym::hexagon_target_feature)), ("hvx-length128b", Unstable(sym::hexagon_target_feature), &["hvx"]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const POWERPC_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const POWERPC_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("altivec", Unstable(sym::powerpc_target_feature)), ("altivec", Unstable(sym::powerpc_target_feature), &[]),
("power10-vector", Unstable(sym::powerpc_target_feature)), ("power10-vector", Unstable(sym::powerpc_target_feature), &["power9-vector"]),
("power8-altivec", Unstable(sym::powerpc_target_feature)), ("power8-altivec", Unstable(sym::powerpc_target_feature), &["altivec"]),
("power8-vector", Unstable(sym::powerpc_target_feature)), ("power8-vector", Unstable(sym::powerpc_target_feature), &["vsx", "power8-altivec"]),
("power9-altivec", Unstable(sym::powerpc_target_feature)), ("power9-altivec", Unstable(sym::powerpc_target_feature), &["power8-altivec"]),
("power9-vector", Unstable(sym::powerpc_target_feature)), ("power9-vector", Unstable(sym::powerpc_target_feature), &["power8-vector", "power9-altivec"]),
("vsx", Unstable(sym::powerpc_target_feature)), ("vsx", Unstable(sym::powerpc_target_feature), &["altivec"]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const MIPS_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const MIPS_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("fp64", Unstable(sym::mips_target_feature)), ("fp64", Unstable(sym::mips_target_feature), &[]),
("msa", Unstable(sym::mips_target_feature)), ("msa", Unstable(sym::mips_target_feature), &[]),
("virt", Unstable(sym::mips_target_feature)), ("virt", Unstable(sym::mips_target_feature), &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const RISCV_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const RISCV_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("a", Stable), ("a", Stable, &[]),
("c", Stable), ("c", Stable, &[]),
("d", Unstable(sym::riscv_target_feature)), ("d", Unstable(sym::riscv_target_feature), &["f"]),
("e", Unstable(sym::riscv_target_feature)), ("e", Unstable(sym::riscv_target_feature), &[]),
("f", Unstable(sym::riscv_target_feature)), ("f", Unstable(sym::riscv_target_feature), &[]),
("m", Stable), ("m", Stable, &[]),
("relax", Unstable(sym::riscv_target_feature)), ("relax", Unstable(sym::riscv_target_feature), &[]),
("unaligned-scalar-mem", Unstable(sym::riscv_target_feature)), ("unaligned-scalar-mem", Unstable(sym::riscv_target_feature), &[]),
("v", Unstable(sym::riscv_target_feature)), ("v", Unstable(sym::riscv_target_feature), &[]),
("zba", Stable), ("zba", Stable, &[]),
("zbb", Stable), ("zbb", Stable, &[]),
("zbc", Stable), ("zbc", Stable, &[]),
("zbkb", Stable), ("zbkb", Stable, &[]),
("zbkc", Stable), ("zbkc", Stable, &[]),
("zbkx", Stable), ("zbkx", Stable, &[]),
("zbs", Stable), ("zbs", Stable, &[]),
("zdinx", Unstable(sym::riscv_target_feature)), ("zdinx", Unstable(sym::riscv_target_feature), &["zfinx"]),
("zfh", Unstable(sym::riscv_target_feature)), ("zfh", Unstable(sym::riscv_target_feature), &["zfhmin"]),
("zfhmin", Unstable(sym::riscv_target_feature)), ("zfhmin", Unstable(sym::riscv_target_feature), &["f"]),
("zfinx", Unstable(sym::riscv_target_feature)), ("zfinx", Unstable(sym::riscv_target_feature), &[]),
("zhinx", Unstable(sym::riscv_target_feature)), ("zhinx", Unstable(sym::riscv_target_feature), &["zhinxmin"]),
("zhinxmin", Unstable(sym::riscv_target_feature)), ("zhinxmin", Unstable(sym::riscv_target_feature), &["zfinx"]),
("zk", Stable), ("zk", Stable, &["zkn", "zkr", "zkt"]),
("zkn", Stable), ("zkn", Stable, &["zbkb", "zbkc", "zbkx", "zkne", "zknd", "zknh"]),
("zknd", Stable), ("zknd", Stable, &[]),
("zkne", Stable), ("zkne", Stable, &[]),
("zknh", Stable), ("zknh", Stable, &[]),
("zkr", Stable), ("zkr", Stable, &[]),
("zks", Stable), ("zks", Stable, &["zbkb", "bzkc", "zbkx", "zksed", "zksh"]),
("zksed", Stable), ("zksed", Stable, &[]),
("zksh", Stable), ("zksh", Stable, &[]),
("zkt", Stable), ("zkt", Stable, &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const WASM_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const WASM_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("atomics", Unstable(sym::wasm_target_feature)), ("atomics", Unstable(sym::wasm_target_feature), &[]),
("bulk-memory", Stable), ("bulk-memory", Stable, &[]),
("exception-handling", Unstable(sym::wasm_target_feature)), ("exception-handling", Unstable(sym::wasm_target_feature), &[]),
("extended-const", Stable), ("extended-const", Stable, &[]),
("multivalue", Unstable(sym::wasm_target_feature)), ("multivalue", Unstable(sym::wasm_target_feature), &[]),
("mutable-globals", Stable), ("mutable-globals", Stable, &[]),
("nontrapping-fptoint", Stable), ("nontrapping-fptoint", Stable, &[]),
("reference-types", Unstable(sym::wasm_target_feature)), ("reference-types", Unstable(sym::wasm_target_feature), &[]),
("relaxed-simd", Stable), ("relaxed-simd", Stable, &["simd128"]),
("sign-ext", Stable), ("sign-ext", Stable, &[]),
("simd128", Stable), ("simd128", Stable, &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const BPF_ALLOWED_FEATURES: &[(&str, Stability)] = &[("alu32", Unstable(sym::bpf_target_feature))]; const BPF_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] =
&[("alu32", Unstable(sym::bpf_target_feature), &[])];
const CSKY_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const CSKY_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("10e60", Unstable(sym::csky_target_feature)), ("10e60", Unstable(sym::csky_target_feature), &["7e10"]),
("2e3", Unstable(sym::csky_target_feature)), ("2e3", Unstable(sym::csky_target_feature), &["e2"]),
("3e3r1", Unstable(sym::csky_target_feature)), ("3e3r1", Unstable(sym::csky_target_feature), &[]),
("3e3r2", Unstable(sym::csky_target_feature)), ("3e3r2", Unstable(sym::csky_target_feature), &["3e3r1", "doloop"]),
("3e3r3", Unstable(sym::csky_target_feature)), ("3e3r3", Unstable(sym::csky_target_feature), &["doloop"]),
("3e7", Unstable(sym::csky_target_feature)), ("3e7", Unstable(sym::csky_target_feature), &["2e3"]),
("7e10", Unstable(sym::csky_target_feature)), ("7e10", Unstable(sym::csky_target_feature), &["3e7"]),
("cache", Unstable(sym::csky_target_feature)), ("cache", Unstable(sym::csky_target_feature), &[]),
("doloop", Unstable(sym::csky_target_feature)), ("doloop", Unstable(sym::csky_target_feature), &[]),
("dsp1e2", Unstable(sym::csky_target_feature)), ("dsp1e2", Unstable(sym::csky_target_feature), &[]),
("dspe60", Unstable(sym::csky_target_feature)), ("dspe60", Unstable(sym::csky_target_feature), &[]),
("e1", Unstable(sym::csky_target_feature)), ("e1", Unstable(sym::csky_target_feature), &["elrw"]),
("e2", Unstable(sym::csky_target_feature)), ("e2", Unstable(sym::csky_target_feature), &["e2"]),
("edsp", Unstable(sym::csky_target_feature)), ("edsp", Unstable(sym::csky_target_feature), &[]),
("elrw", Unstable(sym::csky_target_feature)), ("elrw", Unstable(sym::csky_target_feature), &[]),
("float1e2", Unstable(sym::csky_target_feature)), ("float1e2", Unstable(sym::csky_target_feature), &[]),
("float1e3", Unstable(sym::csky_target_feature)), ("float1e3", Unstable(sym::csky_target_feature), &[]),
("float3e4", Unstable(sym::csky_target_feature)), ("float3e4", Unstable(sym::csky_target_feature), &[]),
("float7e60", Unstable(sym::csky_target_feature)), ("float7e60", Unstable(sym::csky_target_feature), &[]),
("floate1", Unstable(sym::csky_target_feature)), ("floate1", Unstable(sym::csky_target_feature), &[]),
("hard-tp", Unstable(sym::csky_target_feature)), ("hard-tp", Unstable(sym::csky_target_feature), &[]),
("high-registers", Unstable(sym::csky_target_feature)), ("high-registers", Unstable(sym::csky_target_feature), &[]),
("hwdiv", Unstable(sym::csky_target_feature)), ("hwdiv", Unstable(sym::csky_target_feature), &[]),
("mp", Unstable(sym::csky_target_feature)), ("mp", Unstable(sym::csky_target_feature), &["2e3"]),
("mp1e2", Unstable(sym::csky_target_feature)), ("mp1e2", Unstable(sym::csky_target_feature), &["3e7"]),
("nvic", Unstable(sym::csky_target_feature)), ("nvic", Unstable(sym::csky_target_feature), &[]),
("trust", Unstable(sym::csky_target_feature)), ("trust", Unstable(sym::csky_target_feature), &[]),
("vdsp2e60f", Unstable(sym::csky_target_feature)), ("vdsp2e60f", Unstable(sym::csky_target_feature), &[]),
("vdspv1", Unstable(sym::csky_target_feature)), ("vdspv1", Unstable(sym::csky_target_feature), &[]),
("vdspv2", Unstable(sym::csky_target_feature)), ("vdspv2", Unstable(sym::csky_target_feature), &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
//fpu //fpu
// tidy-alphabetical-start // tidy-alphabetical-start
("fdivdu", Unstable(sym::csky_target_feature)), ("fdivdu", Unstable(sym::csky_target_feature), &[]),
("fpuv2_df", Unstable(sym::csky_target_feature)), ("fpuv2_df", Unstable(sym::csky_target_feature), &[]),
("fpuv2_sf", Unstable(sym::csky_target_feature)), ("fpuv2_sf", Unstable(sym::csky_target_feature), &[]),
("fpuv3_df", Unstable(sym::csky_target_feature)), ("fpuv3_df", Unstable(sym::csky_target_feature), &[]),
("fpuv3_hf", Unstable(sym::csky_target_feature)), ("fpuv3_hf", Unstable(sym::csky_target_feature), &[]),
("fpuv3_hi", Unstable(sym::csky_target_feature)), ("fpuv3_hi", Unstable(sym::csky_target_feature), &[]),
("fpuv3_sf", Unstable(sym::csky_target_feature)), ("fpuv3_sf", Unstable(sym::csky_target_feature), &[]),
("hard-float", Unstable(sym::csky_target_feature)), ("hard-float", Unstable(sym::csky_target_feature), &[]),
("hard-float-abi", Unstable(sym::csky_target_feature)), ("hard-float-abi", Unstable(sym::csky_target_feature), &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const LOONGARCH_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const LOONGARCH_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("d", Unstable(sym::loongarch_target_feature)), ("d", Unstable(sym::loongarch_target_feature), &["f"]),
("f", Unstable(sym::loongarch_target_feature)), ("f", Unstable(sym::loongarch_target_feature), &[]),
("frecipe", Unstable(sym::loongarch_target_feature)), ("frecipe", Unstable(sym::loongarch_target_feature), &[]),
("lasx", Unstable(sym::loongarch_target_feature)), ("lasx", Unstable(sym::loongarch_target_feature), &["lsx"]),
("lbt", Unstable(sym::loongarch_target_feature)), ("lbt", Unstable(sym::loongarch_target_feature), &[]),
("lsx", Unstable(sym::loongarch_target_feature)), ("lsx", Unstable(sym::loongarch_target_feature), &["d"]),
("lvz", Unstable(sym::loongarch_target_feature)), ("lvz", Unstable(sym::loongarch_target_feature), &[]),
("relax", Unstable(sym::loongarch_target_feature)), ("relax", Unstable(sym::loongarch_target_feature), &[]),
("ual", Unstable(sym::loongarch_target_feature)), ("ual", Unstable(sym::loongarch_target_feature), &[]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
const IBMZ_ALLOWED_FEATURES: &[(&str, Stability)] = &[ const IBMZ_ALLOWED_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
// tidy-alphabetical-start // tidy-alphabetical-start
("backchain", Unstable(sym::s390x_target_feature)), ("backchain", Unstable(sym::s390x_target_feature), &[]),
("vector", Unstable(sym::s390x_target_feature)), ("vector", Unstable(sym::s390x_target_feature), &[]),
// tidy-alphabetical-end
];
const X86_IMPLIED_FEATURES: &[(&str, &[&str])] = &[
// tidy-alphabetical-start
("aes", &["sse2"]),
("avx", &["sse4.2"]),
("avx2", &["avx"]),
("avx512bf16", &["avx512bw"]),
("avx512bitalg", &["avx512bw"]),
("avx512bw", &["avx512f"]),
("avx512cd", &["avx512f"]),
("avx512dq", &["avx512f"]),
("avx512f", &["avx2"]),
("avx512fp16", &["avx512bw", "avx512vl", "avx512dq"]),
("avx512vbmi", &["avx512bw"]),
("avx512vbmi2", &["avx512bw"]),
("avx512vl", &["avx512f"]),
("avx512vnni", &["avx512f"]),
("avx512vp2intersect", &["avx512f"]),
("avx512vpopcntdq", &["avx512f"]),
("f16c", &["avx"]),
("fma", &["avx"]),
("gfni", &["sse2"]),
("pclmulqdq", &["sse2"]),
("sha", &["sse2"]),
("sse2", &["sse"]),
("sse3", &["sse2"]),
("sse4.1", &["ssse3"]),
("sse4.2", &["sse4.1"]),
("ssse3", &["sse3"]),
("vaes", &["avx", "aes"]),
("vpclmulqdq", &["avx", "pclmulqdq"]),
("xsavec", &["xsave"]),
("xsaveopt", &["xsave"]),
("xsaves", &["xsave"]),
// tidy-alphabetical-end
];
const AARCH64_IMPLIED_FEATURES: &[(&str, &[&str])] = &[
// tidy-alphabetical-start
("aes", &["neon"]),
("f32mm", &["sve"]),
("f64mm", &["sve"]),
("fcma", &["neon"]),
("fhm", &["fp16"]),
("fp16", &["neon"]),
("jsconv", &["neon"]),
("rcpc2", &["rcpc"]),
("sha2", &["neon"]),
("sha3", &["sha2"]),
("sm4", &["neon"]),
("sve", &["fp16"]),
("sve2", &["sve"]),
("sve2-aes", &["sve2", "aes"]),
("sve2-bitperm", &["sve2"]),
("sve2-sha3", &["sve2", "sha3"]),
("sve2-sm4", &["sve2", "sm4"]),
// tidy-alphabetical-end
];
const RISCV_IMPLIED_FEATURES: &[(&str, &[&str])] = &[
// tidy-alphabetical-start
("zb", &["zba", "zbc", "zbs"]),
("zk", &["zkn", "zkr", "zks", "zkt", "zbkb", "zbkc", "zkbx"]),
("zkn", &["zknd", "zkne", "zknh", "zbkb", "zbkc", "zkbx"]),
("zks", &["zksed", "zksh", "zbkb", "zbkc", "zkbx"]),
// tidy-alphabetical-end
];
const WASM_IMPLIED_FEATURES: &[(&str, &[&str])] = &[
// tidy-alphabetical-start
("relaxed-simd", &["simd128"]),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];
@ -501,10 +439,13 @@ pub fn all_known_features() -> impl Iterator<Item = (&'static str, Stability)> {
.chain(LOONGARCH_ALLOWED_FEATURES) .chain(LOONGARCH_ALLOWED_FEATURES)
.chain(IBMZ_ALLOWED_FEATURES) .chain(IBMZ_ALLOWED_FEATURES)
.cloned() .cloned()
.map(|(f, s, _)| (f, s))
} }
impl super::spec::Target { impl super::spec::Target {
pub fn supported_target_features(&self) -> &'static [(&'static str, Stability)] { pub fn supported_target_features(
&self,
) -> &'static [(&'static str, Stability, ImpliedFeatures)] {
match &*self.arch { match &*self.arch {
"arm" => ARM_ALLOWED_FEATURES, "arm" => ARM_ALLOWED_FEATURES,
"aarch64" | "arm64ec" => AARCH64_ALLOWED_FEATURES, "aarch64" | "arm64ec" => AARCH64_ALLOWED_FEATURES,
@ -528,14 +469,4 @@ impl super::spec::Target {
_ => &[], _ => &[],
} }
} }
pub fn implied_target_features(&self) -> &'static [(&'static str, &'static [&'static str])] {
match &*self.arch {
"aarch4" => AARCH64_IMPLIED_FEATURES,
"riscv32" | "riscv64" => RISCV_IMPLIED_FEATURES,
"x86" | "x86_64" => X86_IMPLIED_FEATURES,
"wasm32" | "wasm64" => WASM_IMPLIED_FEATURES,
_ => &[],
}
}
} }