Skip to content

Commit 63050af

Browse files
committed
Stop using the avx512er and avx512pf x86 target features
They are no longer supported by LLVM 19. Fixes #125492
1 parent 213ad10 commit 63050af

File tree

6 files changed

+2
-22
lines changed

6 files changed

+2
-22
lines changed

compiler/rustc_target/src/target_features.rs

-2
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,9 @@ const X86_ALLOWED_FEATURES: &[(&str, Stability)] = &[
199199
("avx512bw", Unstable(sym::avx512_target_feature)),
200200
("avx512cd", Unstable(sym::avx512_target_feature)),
201201
("avx512dq", Unstable(sym::avx512_target_feature)),
202-
("avx512er", Unstable(sym::avx512_target_feature)),
203202
("avx512f", Unstable(sym::avx512_target_feature)),
204203
("avx512fp16", Unstable(sym::avx512_target_feature)),
205204
("avx512ifma", Unstable(sym::avx512_target_feature)),
206-
("avx512pf", Unstable(sym::avx512_target_feature)),
207205
("avx512vbmi", Unstable(sym::avx512_target_feature)),
208206
("avx512vbmi2", Unstable(sym::avx512_target_feature)),
209207
("avx512vl", Unstable(sym::avx512_target_feature)),

library/std/tests/run-time-detect.rs

-2
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,8 @@ fn x86_all() {
121121
println!("avx512bw: {:?}", is_x86_feature_detected!("avx512bw"));
122122
println!("avx512cd: {:?}", is_x86_feature_detected!("avx512cd"));
123123
println!("avx512dq: {:?}", is_x86_feature_detected!("avx512dq"));
124-
println!("avx512er: {:?}", is_x86_feature_detected!("avx512er"));
125124
println!("avx512f: {:?}", is_x86_feature_detected!("avx512f"));
126125
println!("avx512ifma: {:?}", is_x86_feature_detected!("avx512ifma"));
127-
println!("avx512pf: {:?}", is_x86_feature_detected!("avx512pf"));
128126
println!("avx512vbmi2: {:?}", is_x86_feature_detected!("avx512vbmi2"));
129127
println!("avx512vbmi: {:?}", is_x86_feature_detected!("avx512vbmi"));
130128
println!("avx512vl: {:?}", is_x86_feature_detected!("avx512vl"));

src/tools/rustfmt/tests/target/cfg_if/detect/arch/x86.rs

-10
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
/// * `"avx2"`
5555
/// * `"avx512f"`
5656
/// * `"avx512cd"`
57-
/// * `"avx512er"`
58-
/// * `"avx512pf"`
5957
/// * `"avx512bw"`
6058
/// * `"avx512dq"`
6159
/// * `"avx512vl"`
@@ -144,14 +142,6 @@ macro_rules! is_x86_feature_detected {
144142
cfg!(target_feature = "avx512cd")
145143
|| $crate::detect::check_for($crate::detect::Feature::avx512cd)
146144
};
147-
("avx512er") => {
148-
cfg!(target_feature = "avx512er")
149-
|| $crate::detect::check_for($crate::detect::Feature::avx512er)
150-
};
151-
("avx512pf") => {
152-
cfg!(target_feature = "avx512pf")
153-
|| $crate::detect::check_for($crate::detect::Feature::avx512pf)
154-
};
155145
("avx512bw") => {
156146
cfg!(target_feature = "avx512bw")
157147
|| $crate::detect::check_for($crate::detect::Feature::avx512bw)

src/tools/rustfmt/tests/target/cfg_if/detect/os/x86.rs

-6
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ fn detect_features() -> cache::Initializer {
209209
enable(extended_features_ebx, 16, Feature::avx512f);
210210
enable(extended_features_ebx, 17, Feature::avx512dq);
211211
enable(extended_features_ebx, 21, Feature::avx512_ifma);
212-
enable(extended_features_ebx, 26, Feature::avx512pf);
213-
enable(extended_features_ebx, 27, Feature::avx512er);
214212
enable(extended_features_ebx, 28, Feature::avx512cd);
215213
enable(extended_features_ebx, 30, Feature::avx512bw);
216214
enable(extended_features_ebx, 31, Feature::avx512vl);
@@ -272,8 +270,6 @@ mod tests {
272270
println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
273271
println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
274272
println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
275-
println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
276-
println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
277273
println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
278274
println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
279275
println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
@@ -323,8 +319,6 @@ mod tests {
323319
assert_eq!(is_x86_feature_detected!("avx2"), information.avx2());
324320
assert_eq!(is_x86_feature_detected!("avx512f"), information.avx512f());
325321
assert_eq!(is_x86_feature_detected!("avx512cd"), information.avx512cd());
326-
assert_eq!(is_x86_feature_detected!("avx512er"), information.avx512er());
327-
assert_eq!(is_x86_feature_detected!("avx512pf"), information.avx512pf());
328322
assert_eq!(is_x86_feature_detected!("avx512bw"), information.avx512bw());
329323
assert_eq!(is_x86_feature_detected!("avx512dq"), information.avx512dq());
330324
assert_eq!(is_x86_feature_detected!("avx512vl"), information.avx512vl());

tests/ui/check-cfg/mix.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ warning: unexpected `cfg` condition value: `zebra`
251251
LL | cfg!(target_feature = "zebra");
252252
| ^^^^^^^^^^^^^^^^^^^^^^^^
253253
|
254-
= note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, and `bmi2` and 188 more
254+
= note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2`, `bti`, and `bulk-memory` and 186 more
255255
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
256256

257257
warning: 27 warnings emitted

tests/ui/check-cfg/well-known-values.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
165165
LL | target_feature = "_UNEXPECTED_VALUE",
166166
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
167167
|
168-
= note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2`, `bti`, `bulk-memory`, `c`, `cache`, `cmpxchg16b`, `crc`, `crt-static`, `d`, `d32`, `dit`, `doloop`, `dotprod`, `dpb`, `dpb2`, `dsp`, `dsp1e2`, `dspe60`, `e`, `e1`, `e2`, `edsp`, `elrw`, `ermsb`, `exception-handling`, `extended-const`, `f`, `f16c`, `f32mm`, `f64mm`, `fcma`, `fdivdu`, `fhm`, `flagm`, `float1e2`, `float1e3`, `float3e4`, `float7e60`, `floate1`, `fma`, `fp-armv8`, `fp16`, `fp64`, `fpuv2_df`, `fpuv2_sf`, `fpuv3_df`, `fpuv3_hf`, `fpuv3_hi`, `fpuv3_sf`, `frecipe`, `frintts`, `fxsr`, `gfni`, `hard-float`, `hard-float-abi`, `hard-tp`, `high-registers`, `hvx`, `hvx-length128b`, `hwdiv`, `i8mm`, `jsconv`, `lahfsahf`, `lasx`, `lbt`, `lor`, `lse`, `lsx`, `lvz`, `lzcnt`, `m`, `mclass`, `movbe`, `mp`, `mp1e2`, `msa`, `mte`, `multivalue`, `mutable-globals`, `neon`, `nontrapping-fptoint`, `nvic`, `paca`, `pacg`, `pan`, `pclmulqdq`, `pmuv3`, `popcnt`, `power10-vector`, `power8-altivec`, `power8-vector`, `power9-altivec`, `power9-vector`, `prfchw`, `rand`, `ras`, `rclass`, `rcpc`, `rcpc2`, `rdm`, `rdrand`, `rdseed`, `reference-types`, `relax`, `relaxed-simd`, `rtm`, `sb`, `sha`, `sha2`, `sha3`, `sign-ext`, `simd128`, `sm4`, `spe`, `ssbs`, `sse`, `sse2`, `sse3`, `sse4.1`, `sse4.2`, `sse4a`, `ssse3`, `sve`, `sve2`, `sve2-aes`, `sve2-bitperm`, `sve2-sha3`, `sve2-sm4`, `tbm`, `thumb-mode`, `thumb2`, `tme`, `trust`, `trustzone`, `ual`, `unaligned-scalar-mem`, `v`, `v5te`, `v6`, `v6k`, `v6t2`, `v7`, `v8`, `v8.1a`, `v8.2a`, `v8.3a`, `v8.4a`, `v8.5a`, `v8.6a`, `v8.7a`, `vaes`, `vdsp2e60f`, `vdspv1`, `vdspv2`, `vfp2`, `vfp3`, `vfp4`, `vh`, `virt`, `virtualization`, `vpclmulqdq`, `vsx`, `xsave`, `xsavec`, `xsaveopt`, `xsaves`, `zba`, `zbb`, `zbc`, `zbkb`, `zbkc`, `zbkx`, `zbs`, `zdinx`, `zfh`, `zfhmin`, `zfinx`, `zhinx`, `zhinxmin`, `zk`, `zkn`, `zknd`, `zkne`, `zknh`, `zkr`, `zks`, `zksed`, `zksh`, and `zkt`
168+
= note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2`, `bti`, `bulk-memory`, `c`, `cache`, `cmpxchg16b`, `crc`, `crt-static`, `d`, `d32`, `dit`, `doloop`, `dotprod`, `dpb`, `dpb2`, `dsp`, `dsp1e2`, `dspe60`, `e`, `e1`, `e2`, `edsp`, `elrw`, `ermsb`, `exception-handling`, `extended-const`, `f`, `f16c`, `f32mm`, `f64mm`, `fcma`, `fdivdu`, `fhm`, `flagm`, `float1e2`, `float1e3`, `float3e4`, `float7e60`, `floate1`, `fma`, `fp-armv8`, `fp16`, `fp64`, `fpuv2_df`, `fpuv2_sf`, `fpuv3_df`, `fpuv3_hf`, `fpuv3_hi`, `fpuv3_sf`, `frecipe`, `frintts`, `fxsr`, `gfni`, `hard-float`, `hard-float-abi`, `hard-tp`, `high-registers`, `hvx`, `hvx-length128b`, `hwdiv`, `i8mm`, `jsconv`, `lahfsahf`, `lasx`, `lbt`, `lor`, `lse`, `lsx`, `lvz`, `lzcnt`, `m`, `mclass`, `movbe`, `mp`, `mp1e2`, `msa`, `mte`, `multivalue`, `mutable-globals`, `neon`, `nontrapping-fptoint`, `nvic`, `paca`, `pacg`, `pan`, `pclmulqdq`, `pmuv3`, `popcnt`, `power10-vector`, `power8-altivec`, `power8-vector`, `power9-altivec`, `power9-vector`, `prfchw`, `rand`, `ras`, `rclass`, `rcpc`, `rcpc2`, `rdm`, `rdrand`, `rdseed`, `reference-types`, `relax`, `relaxed-simd`, `rtm`, `sb`, `sha`, `sha2`, `sha3`, `sign-ext`, `simd128`, `sm4`, `spe`, `ssbs`, `sse`, `sse2`, `sse3`, `sse4.1`, `sse4.2`, `sse4a`, `ssse3`, `sve`, `sve2`, `sve2-aes`, `sve2-bitperm`, `sve2-sha3`, `sve2-sm4`, `tbm`, `thumb-mode`, `thumb2`, `tme`, `trust`, `trustzone`, `ual`, `unaligned-scalar-mem`, `v`, `v5te`, `v6`, `v6k`, `v6t2`, `v7`, `v8`, `v8.1a`, `v8.2a`, `v8.3a`, `v8.4a`, `v8.5a`, `v8.6a`, `v8.7a`, `vaes`, `vdsp2e60f`, `vdspv1`, `vdspv2`, `vfp2`, `vfp3`, `vfp4`, `vh`, `virt`, `virtualization`, `vpclmulqdq`, `vsx`, `xsave`, `xsavec`, `xsaveopt`, `xsaves`, `zba`, `zbb`, `zbc`, `zbkb`, `zbkc`, `zbkx`, `zbs`, `zdinx`, `zfh`, `zfhmin`, `zfinx`, `zhinx`, `zhinxmin`, `zk`, `zkn`, `zknd`, `zkne`, `zknh`, `zkr`, `zks`, `zksed`, `zksh`, and `zkt`
169169
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
170170

171171
warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`

0 commit comments

Comments
 (0)