Skip to content

Commit 4f2d7b4

Browse files
committed
Auto merge of rust-lang#140652 - Zalathar:perf-revert-139675, r=<try>
[DO NOT MERGE] Check the perf impact of reverting rust-lang#139675 According to rust-lang#140633 (comment), the changes in rust-lang#139675 caused many measurable perf regressions. We can double-check that result by benchmarking a revert. --- This reverts commit ed7590f, reversing changes made to 3559e0a. r? ghost
2 parents cd55868 + a2c30dc commit 4f2d7b4

File tree

8 files changed

+1
-48
lines changed

8 files changed

+1
-48
lines changed

compiler/rustc_codegen_llvm/src/llvm_util.rs

-3
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,6 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea
301301
None
302302
}
303303
("x86", "movrs") if get_version().0 < 20 => None,
304-
("x86", "avx10.1") => Some(LLVMFeature::new("avx10.1-512")),
305-
("x86", "avx10.2") if get_version().0 < 20 => None,
306-
("x86", "avx10.2") if get_version().0 >= 20 => Some(LLVMFeature::new("avx10.2-512")),
307304
(_, s) => Some(LLVMFeature::new(s)),
308305
}
309306
}

compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ declare_features! (
393393
(unstable, async_for_loop, "1.77.0", Some(118898)),
394394
/// Allows `async` trait bound modifier.
395395
(unstable, async_trait_bounds, "1.85.0", Some(62290)),
396-
/// Allows using Intel AVX10 target features and intrinsics
397-
(unstable, avx10_target_feature, "CURRENT_RUSTC_VERSION", Some(138843)),
398396
/// Allows using C-variadics.
399397
(unstable, c_variadic, "1.34.0", Some(44930)),
400398
/// Allows the use of `#[cfg(contract_checks)` to check if contract checks are enabled.

compiler/rustc_span/src/symbol.rs

-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ symbols! {
531531
autodiff,
532532
automatically_derived,
533533
avx,
534-
avx10_target_feature,
535534
avx512_target_feature,
536535
avx512bw,
537536
avx512f,

compiler/rustc_target/src/target_features.rs

-20
Original file line numberDiff line numberDiff line change
@@ -394,26 +394,6 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
394394
("amx-tile", Unstable(sym::x86_amx_intrinsics), &[]),
395395
("amx-transpose", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
396396
("avx", Stable, &["sse4.2"]),
397-
(
398-
"avx10.1",
399-
Unstable(sym::avx10_target_feature),
400-
&[
401-
"avx512bf16",
402-
"avx512bitalg",
403-
"avx512bw",
404-
"avx512cd",
405-
"avx512dq",
406-
"avx512f",
407-
"avx512fp16",
408-
"avx512ifma",
409-
"avx512vbmi",
410-
"avx512vbmi2",
411-
"avx512vl",
412-
"avx512vnni",
413-
"avx512vpopcntdq",
414-
],
415-
),
416-
("avx10.2", Unstable(sym::avx10_target_feature), &["avx10.1"]),
417397
("avx2", Stable, &["avx"]),
418398
("avx512bf16", Unstable(sym::avx512_target_feature), &["avx512bw"]),
419399
("avx512bitalg", Unstable(sym::avx512_target_feature), &["avx512bw"]),

tests/ui/check-cfg/and-more-diagnostic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//@ no-auto-check-cfg
66
//@ compile-flags: --check-cfg=cfg()
77
//@ normalize-stderr: "and \d+ more" -> "and X more"
8-
//@ normalize-stderr: "`[a-zA-Z0-9_\.-]+`" -> "`xxx`"
8+
//@ normalize-stderr: "`[a-zA-Z0-9_-]+`" -> "`xxx`"
99

1010
fn main() {
1111
cfg!(target_feature = "zebra");

tests/ui/check-cfg/target_feature.stderr

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ LL | cfg!(target_feature = "_UNEXPECTED_VALUE");
2929
`amx-transpose`
3030
`atomics`
3131
`avx`
32-
`avx10.1`
33-
`avx10.2`
3432
`avx2`
3533
`avx512bf16`
3634
`avx512bitalg`

tests/ui/feature-gates/feature-gate-avx10_target_feature.rs

-6
This file was deleted.

tests/ui/feature-gates/feature-gate-avx10_target_feature.stderr

-13
This file was deleted.

0 commit comments

Comments
 (0)