nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 23:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add compiler support for LLVM's x86 ERMSB feature

Browse Source 
This change is needed for compiler-builtins to check for this feature
when implementing memcpy/memset. See:
  https://github.com/rust-lang/compiler-builtins/pull/365

The change just does compile-time detection. I think that runtime
detection will have to come in a follow-up CL to std-detect.

Like all the CPU feature flags, this just references #44839

Signed-off-by: Joe Richey <joerichey@google.com>
This commit is contained in:
Joe Richey 2020-10-26 03:46:54 -07:00
parent 8e6f69afc9
commit ad552bc17e
No known key found for this signature in database
GPG Key ID: 1DD6D05AA306C53F
6 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_codegen_ssa/src/target_features.rs
View File

@ -63,6 +63,7 @@ const X86_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
("bmi1", None), ("bmi1", None),
("bmi2", None), ("bmi2", None),
("cmpxchg16b", Some(sym::cmpxchg16b_target_feature)), ("cmpxchg16b", Some(sym::cmpxchg16b_target_feature)),
("ermsb", Some(sym::ermsb_target_feature)),
("f16c", Some(sym::f16c_target_feature)), ("f16c", Some(sym::f16c_target_feature)),
("fma", None), ("fma", None),
("fxsr", None), ("fxsr", None),

1
compiler/rustc_feature/src/active.rs
View File

@ -238,6 +238,7 @@ declare_features! (
(active, rtm_target_feature, "1.35.0", Some(44839), None), (active, rtm_target_feature, "1.35.0", Some(44839), None),
(active, f16c_target_feature, "1.36.0", Some(44839), None), (active, f16c_target_feature, "1.36.0", Some(44839), None),
(active, riscv_target_feature, "1.45.0", Some(44839), None), (active, riscv_target_feature, "1.45.0", Some(44839), None),
(active, ermsb_target_feature, "1.49.0", Some(44839), None),
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// feature-group-end: actual feature gates (target features) // feature-group-end: actual feature gates (target features)

1
compiler/rustc_span/src/symbol.rs
View File

@ -467,6 +467,7 @@ symbols! {
encode, encode,
env, env,
eq, eq,
ermsb_target_feature,
err, err,
exact_div, exact_div,
except, except,

1
compiler/rustc_typeck/src/collect.rs
View File

@ -2414,6 +2414,7 @@ fn from_target_feature(
Some(sym::movbe_target_feature) => rust_features.movbe_target_feature, Some(sym::movbe_target_feature) => rust_features.movbe_target_feature,
Some(sym::rtm_target_feature) => rust_features.rtm_target_feature, Some(sym::rtm_target_feature) => rust_features.rtm_target_feature,
Some(sym::f16c_target_feature) => rust_features.f16c_target_feature, Some(sym::f16c_target_feature) => rust_features.f16c_target_feature,
Some(sym::ermsb_target_feature) => rust_features.ermsb_target_feature,
Some(name) => bug!("unknown target feature gate {}", name), Some(name) => bug!("unknown target feature gate {}", name),
None => true, None => true,
}; };

1
src/test/ui/target-feature/gate.rs
View File

@ -26,6 +26,7 @@
// gate-test-rtm_target_feature // gate-test-rtm_target_feature
// gate-test-f16c_target_feature // gate-test-f16c_target_feature
// gate-test-riscv_target_feature // gate-test-riscv_target_feature
// gate-test-ermsb_target_feature
#[target_feature(enable = "avx512bw")] #[target_feature(enable = "avx512bw")]
//~^ ERROR: currently unstable //~^ ERROR: currently unstable

2
src/test/ui/target-feature/gate.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: the target feature `avx512bw` is currently unstable error[E0658]: the target feature `avx512bw` is currently unstable
--> $DIR/gate.rs:30:18 --> $DIR/gate.rs:31:18
| |
LL | #[target_feature(enable = "avx512bw")] LL | #[target_feature(enable = "avx512bw")]
| ^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^