Skip to content

Commit 1be9f75

Browse files
sayantnsayantn
committed
Stabilize avx512_target_feature 
1 parent 14eb919 commit 1be9f75

16 files changed

+38
-45
lines changed

‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ declare_features! (
8282
(accepted, attr_literals, "1.30.0", Some(34981)),
8383
/// Allows overloading augmented assignment operations like `a += b`.
8484
(accepted, augmented_assignments, "1.8.0", Some(28235)),
85+
/// Allows using `avx512*` target features
86+
(accepted, avx512_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
8587
/// Allows mixing bind-by-move in patterns and references to those identifiers in guards.
8688
(accepted, bind_by_move_pattern_guards, "1.39.0", Some(15287)),
8789
/// Allows bindings in the subpattern of a binding pattern.

‎compiler/rustc_feature/src/unstable.rs

-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ declare_features! (
315315
(unstable, aarch64_unstable_target_feature, "1.82.0", Some(44839)),
316316
(unstable, aarch64_ver_target_feature, "1.27.0", Some(44839)),
317317
(unstable, arm_target_feature, "1.27.0", Some(44839)),
318-
(unstable, avx512_target_feature, "1.27.0", Some(44839)),
319318
(unstable, bpf_target_feature, "1.54.0", Some(44839)),
320319
(unstable, csky_target_feature, "1.73.0", Some(44839)),
321320
(unstable, ermsb_target_feature, "1.49.0", Some(44839)),

‎compiler/rustc_target/src/target_features.rs

+22-22
Original file line numberDiff line numberDiff line change
@@ -387,33 +387,33 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
387387
("amx-tile", Unstable(sym::x86_amx_intrinsics), &[]),
388388
("avx", Stable, &["sse4.2"]),
389389
("avx2", Stable, &["avx"]),
390-
("avx512bf16", Unstable(sym::avx512_target_feature), &["avx512bw"]),
391-
("avx512bitalg", Unstable(sym::avx512_target_feature), &["avx512bw"]),
392-
("avx512bw", Unstable(sym::avx512_target_feature), &["avx512f"]),
393-
("avx512cd", Unstable(sym::avx512_target_feature), &["avx512f"]),
394-
("avx512dq", Unstable(sym::avx512_target_feature), &["avx512f"]),
395-
("avx512f", Unstable(sym::avx512_target_feature), &["avx2", "fma", "f16c"]),
396-
("avx512fp16", Unstable(sym::avx512_target_feature), &["avx512bw", "avx512vl", "avx512dq"]),
397-
("avx512ifma", Unstable(sym::avx512_target_feature), &["avx512f"]),
398-
("avx512vbmi", Unstable(sym::avx512_target_feature), &["avx512bw"]),
399-
("avx512vbmi2", Unstable(sym::avx512_target_feature), &["avx512bw"]),
400-
("avx512vl", Unstable(sym::avx512_target_feature), &["avx512f"]),
401-
("avx512vnni", Unstable(sym::avx512_target_feature), &["avx512f"]),
402-
("avx512vp2intersect", Unstable(sym::avx512_target_feature), &["avx512f"]),
403-
("avx512vpopcntdq", Unstable(sym::avx512_target_feature), &["avx512f"]),
404-
("avxifma", Unstable(sym::avx512_target_feature), &["avx2"]),
405-
("avxneconvert", Unstable(sym::avx512_target_feature), &["avx2"]),
406-
("avxvnni", Unstable(sym::avx512_target_feature), &["avx2"]),
407-
("avxvnniint16", Unstable(sym::avx512_target_feature), &["avx2"]),
408-
("avxvnniint8", Unstable(sym::avx512_target_feature), &["avx2"]),
390+
("avx512bf16", Stable, &["avx512bw"]),
391+
("avx512bitalg", Stable, &["avx512bw"]),
392+
("avx512bw", Stable, &["avx512f"]),
393+
("avx512cd", Stable, &["avx512f"]),
394+
("avx512dq", Stable, &["avx512f"]),
395+
("avx512f", Stable, &["avx2", "fma", "f16c"]),
396+
("avx512fp16", Stable, &["avx512bw", "avx512vl", "avx512dq"]),
397+
("avx512ifma", Stable, &["avx512f"]),
398+
("avx512vbmi", Stable, &["avx512bw"]),
399+
("avx512vbmi2", Stable, &["avx512bw"]),
400+
("avx512vl", Stable, &["avx512f"]),
401+
("avx512vnni", Stable, &["avx512f"]),
402+
("avx512vp2intersect", Stable, &["avx512f"]),
403+
("avx512vpopcntdq", Stable, &["avx512f"]),
404+
("avxifma", Stable, &["avx2"]),
405+
("avxneconvert", Stable, &["avx2"]),
406+
("avxvnni", Stable, &["avx2"]),
407+
("avxvnniint16", Stable, &["avx2"]),
408+
("avxvnniint8", Stable, &["avx2"]),
409409
("bmi1", Stable, &[]),
410410
("bmi2", Stable, &[]),
411411
("cmpxchg16b", Stable, &[]),
412412
("ermsb", Unstable(sym::ermsb_target_feature), &[]),
413413
("f16c", Stable, &["avx"]),
414414
("fma", Stable, &["avx"]),
415415
("fxsr", Stable, &[]),
416-
("gfni", Unstable(sym::avx512_target_feature), &["sse2"]),
416+
("gfni", Stable, &["sse2"]),
417417
("kl", Unstable(sym::keylocker_x86), &["sse2"]),
418418
("lahfsahf", Unstable(sym::lahfsahf_target_feature), &[]),
419419
("lzcnt", Stable, &[]),
@@ -439,8 +439,8 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
439439
("sse4a", Unstable(sym::sse4a_target_feature), &["sse3"]),
440440
("ssse3", Stable, &["sse3"]),
441441
("tbm", Unstable(sym::tbm_target_feature), &[]),
442-
("vaes", Unstable(sym::avx512_target_feature), &["avx2", "aes"]),
443-
("vpclmulqdq", Unstable(sym::avx512_target_feature), &["avx", "pclmulqdq"]),
442+
("vaes", Stable, &["avx2", "aes"]),
443+
("vpclmulqdq", Stable, &["avx", "pclmulqdq"]),
444444
("widekl", Unstable(sym::keylocker_x86), &["kl"]),
445445
("x87", Unstable(sym::x87_target_feature), &[]),
446446
("xop", Unstable(sym::xop_target_feature), &[/*"fma4", */ "avx", "sse4a"]),

‎library/core/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@
189189
//
190190
// Target features:
191191
// tidy-alphabetical-start
192+
#![cfg_attr(bootstrap, feature(avx512_target_feature))]
192193
#![feature(aarch64_unstable_target_feature)]
193194
#![feature(arm_target_feature)]
194-
#![feature(avx512_target_feature)]
195195
#![feature(hexagon_target_feature)]
196196
#![feature(keylocker_x86)]
197197
#![feature(loongarch_target_feature)]

‎library/stdarch

Submodule stdarch updated 26 files

‎tests/ui/abi/homogenous-floats-target-feature-mixup.rs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
//@ run-pass
88
//@ needs-subprocess
99

10-
#![feature(avx512_target_feature)]
11-
1210
#![allow(overflowing_literals)]
1311
#![allow(unused_variables)]
1412

‎tests/ui/abi/simd-abi-checks-avx.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//@ ignore-pass (test emits codegen-time warnings)
44
//@ compile-flags: -C target-feature=-avx
55

6-
#![feature(avx512_target_feature)]
76
#![feature(portable_simd)]
87
#![feature(simd_ffi)]
98
#![allow(improper_ctypes_definitions)]

‎tests/ui/asm/x86_64/evex512-implicit-feature.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//@ only-x86_64
33
//@ compile-flags: --crate-type=lib -C target-cpu=skylake
44

5-
#![feature(avx512_target_feature)]
65
#![feature(stdarch_x86_avx512)]
76

87
use std::arch::x86_64::*;

‎tests/ui/asm/x86_64/target-feature-attr.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Set the base cpu explicitly, in case the default has been changed.
33
//@ compile-flags: -C target-cpu=x86-64
44

5-
#![feature(avx512_target_feature)]
6-
75
use std::arch::asm;
86

97
#[target_feature(enable = "avx")]

‎tests/ui/asm/x86_64/target-feature-attr.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: register class `ymm_reg` requires the `avx` target feature
2-
--> $DIR/target-feature-attr.rs:20:40
2+
--> $DIR/target-feature-attr.rs:18:40
33
|
44
LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
55
| ^^^^^^^^^^^^^
66

77
error: register class `ymm_reg` requires the `avx` target feature
8-
--> $DIR/target-feature-attr.rs:20:55
8+
--> $DIR/target-feature-attr.rs:18:55
99
|
1010
LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
1111
| ^^^^^^^^^^^^^
1212

1313
error: register class `ymm_reg` requires the `avx` target feature
14-
--> $DIR/target-feature-attr.rs:20:70
14+
--> $DIR/target-feature-attr.rs:18:70
1515
|
1616
LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
1717
| ^^^^^^^^^^^^^^^^^^
1818

1919
error: register class `kreg` requires at least one of the following target features: avx512bw, avx512f
20-
--> $DIR/target-feature-attr.rs:35:23
20+
--> $DIR/target-feature-attr.rs:33:23
2121
|
2222
LL | asm!("/* {0} */", in(kreg) x);
2323
| ^^^^^^^^^^

‎tests/ui/simd/target-feature-mixup.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//@ ignore-fuchsia must translate zircon signal to SIGILL, FIXME (#58590)
88

99
#![feature(repr_simd, target_feature, cfg_target_feature)]
10-
#![feature(avx512_target_feature)]
1110

1211
use std::process::{Command, ExitStatus};
1312
use std::env;

‎tests/ui/target-feature/auxiliary/using-target-feature-unstable.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#![feature(avx512_target_feature)]
1+
#![feature(cmpxchg16b_target_feature)]
22

33
#[inline]
4-
#[target_feature(enable = "avx512ifma")]
4+
#[target_feature(enable = "cmpxchg16b")]
55
pub unsafe fn foo() {}

‎tests/ui/target-feature/gate.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//
33
// gate-test-sse4a_target_feature
44
// gate-test-powerpc_target_feature
5-
// gate-test-avx512_target_feature
65
// gate-test-tbm_target_feature
76
// gate-test-arm_target_feature
87
// gate-test-hexagon_target_feature
@@ -27,7 +26,7 @@
2726
// gate-test-x87_target_feature
2827
// gate-test-m68k_target_feature
2928

30-
#[target_feature(enable = "avx512bw")]
29+
#[target_feature(enable = "cmpxchg16b")]
3130
//~^ ERROR: currently unstable
3231
unsafe fn foo() {}
3332

‎tests/ui/target-feature/gate.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0658]: the target feature `avx512bw` is currently unstable
22
--> $DIR/gate.rs:30:18
33
|
4-
LL | #[target_feature(enable = "avx512bw")]
5-
| ^^^^^^^^^^^^^^^^^^^
4+
LL | #[target_feature(enable = "cmpxchg16b")]
5+
| ^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: see issue #44839 <https://github.com/rust-lang/rust/issues/44839> for more information
8-
= help: add `#![feature(avx512_target_feature)]` to the crate attributes to enable
8+
= help: add `#![feature(cmpxchg16b_target_feature)]` to the crate attributes to enable
99
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1010

1111
error: aborting due to 1 previous error

‎tests/ui/target-feature/unstable-feature.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ compile-flags: -Ctarget-feature=+vaes --crate-type=rlib --target=x86_64-unknown-linux-gnu
1+
//@ compile-flags: -Ctarget-feature=+cmpxchg16b --crate-type=rlib --target=x86_64-unknown-linux-gnu
22
//@ build-pass
33
//@ needs-llvm-components: x86
44

‎tests/ui/target-feature/unstable-feature.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
warning: unstable feature specified for `-Ctarget-feature`: `vaes`
1+
warning: unstable feature specified for `-Ctarget-feature`: `cmpxchg16b`
22
|
33
= note: this feature is not stably supported; its behavior can change in the future
44

0 commit comments

Comments
 (0)