From f59d7f20005a2d1920905edb3a615a2aa1b363b2 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@chromium.org>
Date: Fri, 24 May 2024 18:54:31 +0200
Subject: [PATCH] undo the src/tools/rustfmt/tests/ changes

---
 .../rustfmt/tests/target/cfg_if/detect/arch/x86.rs     | 10 ++++++++++
 src/tools/rustfmt/tests/target/cfg_if/detect/os/x86.rs |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/src/tools/rustfmt/tests/target/cfg_if/detect/arch/x86.rs b/src/tools/rustfmt/tests/target/cfg_if/detect/arch/x86.rs
index c9831d2e66b30..47210cae2aaa0 100644
--- a/src/tools/rustfmt/tests/target/cfg_if/detect/arch/x86.rs
+++ b/src/tools/rustfmt/tests/target/cfg_if/detect/arch/x86.rs
@@ -54,6 +54,8 @@
 /// * `"avx2"`
 /// * `"avx512f"`
 /// * `"avx512cd"`
+/// * `"avx512er"`
+/// * `"avx512pf"`
 /// * `"avx512bw"`
 /// * `"avx512dq"`
 /// * `"avx512vl"`
@@ -142,6 +144,14 @@ macro_rules! is_x86_feature_detected {
         cfg!(target_feature = "avx512cd")
             || $crate::detect::check_for($crate::detect::Feature::avx512cd)
     };
+    ("avx512er") => {
+        cfg!(target_feature = "avx512er")
+            || $crate::detect::check_for($crate::detect::Feature::avx512er)
+    };
+    ("avx512pf") => {
+        cfg!(target_feature = "avx512pf")
+            || $crate::detect::check_for($crate::detect::Feature::avx512pf)
+    };
     ("avx512bw") => {
         cfg!(target_feature = "avx512bw")
             || $crate::detect::check_for($crate::detect::Feature::avx512bw)
diff --git a/src/tools/rustfmt/tests/target/cfg_if/detect/os/x86.rs b/src/tools/rustfmt/tests/target/cfg_if/detect/os/x86.rs
index 08da33678999c..2e228aa374527 100644
--- a/src/tools/rustfmt/tests/target/cfg_if/detect/os/x86.rs
+++ b/src/tools/rustfmt/tests/target/cfg_if/detect/os/x86.rs
@@ -209,6 +209,8 @@ fn detect_features() -> cache::Initializer {
                         enable(extended_features_ebx, 16, Feature::avx512f);
                         enable(extended_features_ebx, 17, Feature::avx512dq);
                         enable(extended_features_ebx, 21, Feature::avx512_ifma);
+                        enable(extended_features_ebx, 26, Feature::avx512pf);
+                        enable(extended_features_ebx, 27, Feature::avx512er);
                         enable(extended_features_ebx, 28, Feature::avx512cd);
                         enable(extended_features_ebx, 30, Feature::avx512bw);
                         enable(extended_features_ebx, 31, Feature::avx512vl);
@@ -270,6 +272,8 @@ mod tests {
         println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
         println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
         println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
+        println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
+        println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
         println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
         println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
         println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
@@ -319,6 +323,8 @@ mod tests {
         assert_eq!(is_x86_feature_detected!("avx2"), information.avx2());
         assert_eq!(is_x86_feature_detected!("avx512f"), information.avx512f());
         assert_eq!(is_x86_feature_detected!("avx512cd"), information.avx512cd());
+        assert_eq!(is_x86_feature_detected!("avx512er"), information.avx512er());
+        assert_eq!(is_x86_feature_detected!("avx512pf"), information.avx512pf());
         assert_eq!(is_x86_feature_detected!("avx512bw"), information.avx512bw());
         assert_eq!(is_x86_feature_detected!("avx512dq"), information.avx512dq());
         assert_eq!(is_x86_feature_detected!("avx512vl"), information.avx512vl());