check if minimumnum works with LLVM 21

Author: RalfJung

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -192,10 +192,7 @@ impl<'ll, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
             | sym::maximum_number_nsz_f16
             | sym::maximum_number_nsz_f32
             | sym::maximum_number_nsz_f64
-            | sym::maximum_number_nsz_f128
-                // Need at least LLVM 22 for `min/maximumnum` to not crash LLVM.
-                if crate::llvm_util::get_version() >= (22, 0, 0) =>
-            {
+            | sym::maximum_number_nsz_f128 => {
                 let intrinsic_name = if name.as_str().starts_with("min") {
                     "llvm.minimumnum"
                 } else {

library/coretests/tests/floats/mod.rs

@@ -687,15 +687,10 @@ float_test! {
         assert_biteq!(flt(9.0).min(black_box(Float::NAN)), 9.0);
         assert_biteq!(black_box(flt(-9.0)).min(Float::NAN), -9.0);
         assert!(Float::NAN.min(Float::NAN).is_nan());
-        // FIXME(llvm21): LLVM miscompiles the fallback impl on aarch64 and likely other targets
-        // (https://github.com/llvm/llvm-project/issues/176624). When we require LLVM 22,
-        // remove the ui test `tests/ui/float/minmax.rs` and unconditionally enable the test here.
-        if cfg!(miri) {
-            assert_biteq!(Float::SNAN.min(black_box(9.0)), 9.0);
-            assert_biteq!(black_box(Float::SNAN).min(-9.0), -9.0);
-            assert_biteq!(flt(9.0).min(black_box(Float::SNAN)), 9.0);
-            assert_biteq!(black_box(flt(-9.0)).min(Float::SNAN), -9.0);
-        }
+        assert_biteq!(Float::SNAN.min(black_box(9.0)), 9.0);
+        assert_biteq!(black_box(Float::SNAN).min(-9.0), -9.0);
+        assert_biteq!(flt(9.0).min(black_box(Float::SNAN)), 9.0);
+        assert_biteq!(black_box(flt(-9.0)).min(Float::SNAN), -9.0);
         assert!(Float::SNAN.min(Float::SNAN).is_nan());
     }
 }
@@ -729,15 +724,10 @@ float_test! {
         assert_biteq!(flt(9.0).max(black_box(Float::NAN)), 9.0);
         assert_biteq!(black_box(flt(-9.0)).max(Float::NAN), -9.0);
         assert!(Float::NAN.max(Float::NAN).is_nan());
-        // FIXME(llvm21): LLVM miscompiles the fallback impl on aarch64 and likely other targets
-        // (https://github.com/llvm/llvm-project/issues/176624). When we require LLVM 22,
-        // remove the ui test `tests/ui/float/minmax.rs` and unconditionally enable the test here.
-        if cfg!(miri) {
-            assert_biteq!(Float::SNAN.max(black_box(9.0)), 9.0);
-            assert_biteq!(black_box(Float::SNAN).max(-9.0), -9.0);
-            assert_biteq!(flt(9.0).max(black_box(Float::SNAN)), 9.0);
-            assert_biteq!(black_box(flt(-9.0)).max(Float::SNAN), -9.0);
-        }
+        assert_biteq!(Float::SNAN.max(black_box(9.0)), 9.0);
+        assert_biteq!(black_box(Float::SNAN).max(-9.0), -9.0);
+        assert_biteq!(flt(9.0).max(black_box(Float::SNAN)), 9.0);
+        assert_biteq!(black_box(flt(-9.0)).max(Float::SNAN), -9.0);
         assert!(Float::SNAN.max(Float::SNAN).is_nan());
     }
 }