Skip to content

Commit ddb3704

Browse files
authored
Unrolled build for #146737
Rollup merge of #146737 - RalfJung:f16-f128-miri, r=tgross35 f16_f128: enable some more tests in Miri For some reason, a bunch of tests were disabled in Miri that don't use any fancy intrinsics. Let's enable them. I verified this with `./x miri library/core --no-doc -- float`. r? `@tgross35`
2 parents 7cfd7d3 + f509dff commit ddb3704

File tree

1 file changed

+15
-17
lines changed
  • library/coretests/tests/floats

1 file changed

+15
-17
lines changed

library/coretests/tests/floats/mod.rs

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,15 +1180,12 @@ float_test! {
11801180
}
11811181
}
11821182

1183-
// FIXME(f16_f128,miri): many of these have to be disabled since miri does not yet support
1184-
// the intrinsics.
1185-
11861183
float_test! {
11871184
name: sqrt_domain,
11881185
attrs: {
11891186
const: #[cfg(false)],
1190-
f16: #[cfg(all(not(miri), target_has_reliable_f16_math))],
1191-
f128: #[cfg(all(not(miri), target_has_reliable_f128_math))],
1187+
f16: #[cfg(any(miri, target_has_reliable_f16_math))],
1188+
f128: #[cfg(any(miri, target_has_reliable_f128_math))],
11921189
},
11931190
test<Float> {
11941191
assert!(Float::NAN.sqrt().is_nan());
@@ -1246,8 +1243,8 @@ float_test! {
12461243
float_test! {
12471244
name: total_cmp,
12481245
attrs: {
1249-
f16: #[cfg(all(not(miri), target_has_reliable_f16_math))],
1250-
f128: #[cfg(all(not(miri), target_has_reliable_f128_math))],
1246+
f16: #[cfg(any(miri, target_has_reliable_f16_math))],
1247+
f128: #[cfg(any(miri, target_has_reliable_f128_math))],
12511248
},
12521249
test<Float> {
12531250
use core::cmp::Ordering;
@@ -1355,8 +1352,8 @@ float_test! {
13551352
name: total_cmp_s_nan,
13561353
attrs: {
13571354
const: #[cfg(false)],
1358-
f16: #[cfg(false)],
1359-
f128: #[cfg(all(not(miri), target_has_reliable_f128_math))],
1355+
f16: #[cfg(miri)],
1356+
f128: #[cfg(any(miri, target_has_reliable_f128_math))],
13601357
},
13611358
test<Float> {
13621359
use core::cmp::Ordering;
@@ -1432,6 +1429,7 @@ float_test! {
14321429
name: powi,
14331430
attrs: {
14341431
const: #[cfg(false)],
1432+
// FIXME(f16_f128): `powi` does not work in Miri for these types
14351433
f16: #[cfg(all(not(miri), target_has_reliable_f16_math))],
14361434
f128: #[cfg(all(not(miri), target_has_reliable_f128_math))],
14371435
},
@@ -1452,8 +1450,8 @@ float_test! {
14521450
float_test! {
14531451
name: to_degrees,
14541452
attrs: {
1455-
f16: #[cfg(target_has_reliable_f16)],
1456-
f128: #[cfg(target_has_reliable_f128)],
1453+
f16: #[cfg(any(miri, target_has_reliable_f16))],
1454+
f128: #[cfg(any(miri, target_has_reliable_f128))],
14571455
},
14581456
test<Float> {
14591457
let pi: Float = Float::PI;
@@ -1473,8 +1471,8 @@ float_test! {
14731471
float_test! {
14741472
name: to_radians,
14751473
attrs: {
1476-
f16: #[cfg(target_has_reliable_f16)],
1477-
f128: #[cfg(target_has_reliable_f128)],
1474+
f16: #[cfg(any(miri, target_has_reliable_f16))],
1475+
f128: #[cfg(any(miri, target_has_reliable_f128))],
14781476
},
14791477
test<Float> {
14801478
let pi: Float = Float::PI;
@@ -1494,8 +1492,8 @@ float_test! {
14941492
float_test! {
14951493
name: to_algebraic,
14961494
attrs: {
1497-
f16: #[cfg(target_has_reliable_f16)],
1498-
f128: #[cfg(target_has_reliable_f128)],
1495+
f16: #[cfg(any(miri, target_has_reliable_f16))],
1496+
f128: #[cfg(any(miri, target_has_reliable_f128))],
14991497
},
15001498
test<Float> {
15011499
let a: Float = 123.0;
@@ -1518,8 +1516,8 @@ float_test! {
15181516
float_test! {
15191517
name: to_bits_conv,
15201518
attrs: {
1521-
f16: #[cfg(target_has_reliable_f16)],
1522-
f128: #[cfg(target_has_reliable_f128)],
1519+
f16: #[cfg(any(miri, target_has_reliable_f16))],
1520+
f128: #[cfg(any(miri, target_has_reliable_f128))],
15231521
},
15241522
test<Float> {
15251523
assert_biteq!(flt(1.0), Float::RAW_1);

0 commit comments

Comments
 (0)