Skip to content

Commit a6f4ab1

Browse files
committed
Auto merge of #154525 - GuillaumeGomez:rollup-hLPbuqn, r=GuillaumeGomez
Rollup of 9 pull requests Successful merges: - rust-lang/rust#153380 (stabilize new RangeFrom type and iterator) - rust-lang/rust#153834 (Merge `fabsf16/32/64/128` into `fabs::<F>`) - rust-lang/rust#154043 (simd_fmin/fmax: make semantics and name consistent with scalar intrinsics) - rust-lang/rust#154494 (triagebot: add reminder for bumping CI LLVM stamp) - rust-lang/rust#153374 (Fix LegacyKeyValueFormat report from docker build: dist-x86_64) - rust-lang/rust#154320 (`trim_prefix` for paths) - rust-lang/rust#154453 (Fix ice in rustdoc of private reexport) - rust-lang/rust#154504 (move many tests from `structs-enums` to `structs` or `enum`) - rust-lang/rust#154515 (Notify stdarch maintainers on changes in std_detect)
2 parents 5054a1d + 5a74b4d commit a6f4ab1

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

tests/pass/float_nan.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,10 @@ fn test_simd() {
513513
F32::from(unsafe { simd_div(f32x4::splat(0.0), f32x4::splat(0.0)) }[0])
514514
});
515515
check_all_outcomes([F32::nan(Pos, Quiet, 0), F32::nan(Neg, Quiet, 0)], || {
516-
F32::from(unsafe { simd_fmin(f32x4::splat(nan), f32x4::splat(nan)) }[0])
516+
F32::from(unsafe { simd_minimum_number_nsz(f32x4::splat(nan), f32x4::splat(nan)) }[0])
517517
});
518518
check_all_outcomes([F32::nan(Pos, Quiet, 0), F32::nan(Neg, Quiet, 0)], || {
519-
F32::from(unsafe { simd_fmax(f32x4::splat(nan), f32x4::splat(nan)) }[0])
519+
F32::from(unsafe { simd_maximum_number_nsz(f32x4::splat(nan), f32x4::splat(nan)) }[0])
520520
});
521521
check_all_outcomes([F32::nan(Pos, Quiet, 0), F32::nan(Neg, Quiet, 0)], || {
522522
F32::from(unsafe { simd_fma(f32x4::splat(nan), f32x4::splat(nan), f32x4::splat(nan)) }[0])

tests/pass/intrinsics/portable-simd.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ fn simd_ops_f16() {
9090
assert_eq!(simd_rem(a, b), f16x4::from_array([0.0, 0.0, 1.0, 2.0]));
9191
assert_eq!(simd_fabs(b), f16x4::from_array([1.0, 2.0, 3.0, 4.0]));
9292
assert_eq!(
93-
simd_fmax(a, simd_mul(b, f16x4::splat(4.0))),
93+
simd_maximum_number_nsz(a, simd_mul(b, f16x4::splat(4.0))),
9494
f16x4::from_array([10.0, 10.0, 12.0, 10.0])
9595
);
9696
assert_eq!(
97-
simd_fmin(a, simd_mul(b, f16x4::splat(4.0))),
97+
simd_minimum_number_nsz(a, simd_mul(b, f16x4::splat(4.0))),
9898
f16x4::from_array([4.0, 8.0, 10.0, -16.0])
9999
);
100100

@@ -134,13 +134,13 @@ fn simd_ops_f16() {
134134
assert_eq!(simd_reduce_min(b), -4.0f16);
135135

136136
assert_eq!(
137-
simd_fmax(f16x2::from_array([0.0, f16::NAN]), f16x2::from_array([f16::NAN, 0.0])),
137+
simd_maximum_number_nsz(f16x2::from_array([0.0, f16::NAN]), f16x2::from_array([f16::NAN, 0.0])),
138138
f16x2::from_array([0.0, 0.0])
139139
);
140140
assert_eq!(simd_reduce_max(f16x2::from_array([0.0, f16::NAN])), 0.0f16);
141141
assert_eq!(simd_reduce_max(f16x2::from_array([f16::NAN, 0.0])), 0.0f16);
142142
assert_eq!(
143-
simd_fmin(f16x2::from_array([0.0, f16::NAN]), f16x2::from_array([f16::NAN, 0.0])),
143+
simd_minimum_number_nsz(f16x2::from_array([0.0, f16::NAN]), f16x2::from_array([f16::NAN, 0.0])),
144144
f16x2::from_array([0.0, 0.0])
145145
);
146146
assert_eq!(simd_reduce_min(f16x2::from_array([0.0, f16::NAN])), 0.0f16);
@@ -304,11 +304,11 @@ fn simd_ops_f128() {
304304
assert_eq!(simd_rem(a, b), f128x4::from_array([0.0, 0.0, 1.0, 2.0]));
305305
assert_eq!(simd_fabs(b), f128x4::from_array([1.0, 2.0, 3.0, 4.0]));
306306
assert_eq!(
307-
simd_fmax(a, simd_mul(b, f128x4::splat(4.0))),
307+
simd_maximum_number_nsz(a, simd_mul(b, f128x4::splat(4.0))),
308308
f128x4::from_array([10.0, 10.0, 12.0, 10.0])
309309
);
310310
assert_eq!(
311-
simd_fmin(a, simd_mul(b, f128x4::splat(4.0))),
311+
simd_minimum_number_nsz(a, simd_mul(b, f128x4::splat(4.0))),
312312
f128x4::from_array([4.0, 8.0, 10.0, -16.0])
313313
);
314314

@@ -348,13 +348,13 @@ fn simd_ops_f128() {
348348
assert_eq!(simd_reduce_min(b), -4.0f128);
349349

350350
assert_eq!(
351-
simd_fmax(f128x2::from_array([0.0, f128::NAN]), f128x2::from_array([f128::NAN, 0.0])),
351+
simd_maximum_number_nsz(f128x2::from_array([0.0, f128::NAN]), f128x2::from_array([f128::NAN, 0.0])),
352352
f128x2::from_array([0.0, 0.0])
353353
);
354354
assert_eq!(simd_reduce_max(f128x2::from_array([0.0, f128::NAN])), 0.0f128);
355355
assert_eq!(simd_reduce_max(f128x2::from_array([f128::NAN, 0.0])), 0.0f128);
356356
assert_eq!(
357-
simd_fmin(f128x2::from_array([0.0, f128::NAN]), f128x2::from_array([f128::NAN, 0.0])),
357+
simd_minimum_number_nsz(f128x2::from_array([0.0, f128::NAN]), f128x2::from_array([f128::NAN, 0.0])),
358358
f128x2::from_array([0.0, 0.0])
359359
);
360360
assert_eq!(simd_reduce_min(f128x2::from_array([0.0, f128::NAN])), 0.0f128);

0 commit comments

Comments
 (0)