Skip to content

Commit df0fe92

Browse files
RalfJungRalfJung
committed
rustup
1 parent e8b3d56 commit df0fe92

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e7a9c1141698bc4557b9da3d3fce2bf75339427f
1+
41419e70366962c9a878bfe673ef4df38db6f7f1

‎tests/pass/portable-simd.rs

+28-28
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ fn simd_ops_f32() {
1313
assert_eq!(a / f32x4::splat(2.0), f32x4::splat(5.0));
1414
assert_eq!(a % b, f32x4::from_array([0.0, 0.0, 1.0, 2.0]));
1515
assert_eq!(b.abs(), f32x4::from_array([1.0, 2.0, 3.0, 4.0]));
16-
assert_eq!(a.max(b * f32x4::splat(4.0)), f32x4::from_array([10.0, 10.0, 12.0, 10.0]));
17-
assert_eq!(a.min(b * f32x4::splat(4.0)), f32x4::from_array([4.0, 8.0, 10.0, -16.0]));
16+
assert_eq!(a.simd_max(b * f32x4::splat(4.0)), f32x4::from_array([10.0, 10.0, 12.0, 10.0]));
17+
assert_eq!(a.simd_min(b * f32x4::splat(4.0)), f32x4::from_array([4.0, 8.0, 10.0, -16.0]));
1818

1919
assert_eq!(a.mul_add(b, a), (a * b) + a);
2020
assert_eq!(b.mul_add(b, a), (b * b) + a);
2121
assert_eq!((a * a).sqrt(), a);
2222
assert_eq!((b * b).sqrt(), b.abs());
2323

24-
assert_eq!(a.lanes_eq(f32x4::splat(5.0) * b), Mask::from_array([false, true, false, false]));
25-
assert_eq!(a.lanes_ne(f32x4::splat(5.0) * b), Mask::from_array([true, false, true, true]));
26-
assert_eq!(a.lanes_le(f32x4::splat(5.0) * b), Mask::from_array([false, true, true, false]));
27-
assert_eq!(a.lanes_lt(f32x4::splat(5.0) * b), Mask::from_array([false, false, true, false]));
28-
assert_eq!(a.lanes_ge(f32x4::splat(5.0) * b), Mask::from_array([true, true, false, true]));
29-
assert_eq!(a.lanes_gt(f32x4::splat(5.0) * b), Mask::from_array([true, false, false, true]));
24+
assert_eq!(a.simd_eq(f32x4::splat(5.0) * b), Mask::from_array([false, true, false, false]));
25+
assert_eq!(a.simd_ne(f32x4::splat(5.0) * b), Mask::from_array([true, false, true, true]));
26+
assert_eq!(a.simd_le(f32x4::splat(5.0) * b), Mask::from_array([false, true, true, false]));
27+
assert_eq!(a.simd_lt(f32x4::splat(5.0) * b), Mask::from_array([false, false, true, false]));
28+
assert_eq!(a.simd_ge(f32x4::splat(5.0) * b), Mask::from_array([true, true, false, true]));
29+
assert_eq!(a.simd_gt(f32x4::splat(5.0) * b), Mask::from_array([true, false, false, true]));
3030

3131
assert_eq!(a.reduce_sum(), 40.0);
3232
assert_eq!(b.reduce_sum(), 2.0);
@@ -38,13 +38,13 @@ fn simd_ops_f32() {
3838
assert_eq!(b.reduce_min(), -4.0);
3939

4040
assert_eq!(
41-
f32x2::from_array([0.0, f32::NAN]).max(f32x2::from_array([f32::NAN, 0.0])),
41+
f32x2::from_array([0.0, f32::NAN]).simd_max(f32x2::from_array([f32::NAN, 0.0])),
4242
f32x2::from_array([0.0, 0.0])
4343
);
4444
assert_eq!(f32x2::from_array([0.0, f32::NAN]).reduce_max(), 0.0);
4545
assert_eq!(f32x2::from_array([f32::NAN, 0.0]).reduce_max(), 0.0);
4646
assert_eq!(
47-
f32x2::from_array([0.0, f32::NAN]).min(f32x2::from_array([f32::NAN, 0.0])),
47+
f32x2::from_array([0.0, f32::NAN]).simd_min(f32x2::from_array([f32::NAN, 0.0])),
4848
f32x2::from_array([0.0, 0.0])
4949
);
5050
assert_eq!(f32x2::from_array([0.0, f32::NAN]).reduce_min(), 0.0);
@@ -62,20 +62,20 @@ fn simd_ops_f64() {
6262
assert_eq!(a / f64x4::splat(2.0), f64x4::splat(5.0));
6363
assert_eq!(a % b, f64x4::from_array([0.0, 0.0, 1.0, 2.0]));
6464
assert_eq!(b.abs(), f64x4::from_array([1.0, 2.0, 3.0, 4.0]));
65-
assert_eq!(a.max(b * f64x4::splat(4.0)), f64x4::from_array([10.0, 10.0, 12.0, 10.0]));
66-
assert_eq!(a.min(b * f64x4::splat(4.0)), f64x4::from_array([4.0, 8.0, 10.0, -16.0]));
65+
assert_eq!(a.simd_max(b * f64x4::splat(4.0)), f64x4::from_array([10.0, 10.0, 12.0, 10.0]));
66+
assert_eq!(a.simd_min(b * f64x4::splat(4.0)), f64x4::from_array([4.0, 8.0, 10.0, -16.0]));
6767

6868
assert_eq!(a.mul_add(b, a), (a * b) + a);
6969
assert_eq!(b.mul_add(b, a), (b * b) + a);
7070
assert_eq!((a * a).sqrt(), a);
7171
assert_eq!((b * b).sqrt(), b.abs());
7272

73-
assert_eq!(a.lanes_eq(f64x4::splat(5.0) * b), Mask::from_array([false, true, false, false]));
74-
assert_eq!(a.lanes_ne(f64x4::splat(5.0) * b), Mask::from_array([true, false, true, true]));
75-
assert_eq!(a.lanes_le(f64x4::splat(5.0) * b), Mask::from_array([false, true, true, false]));
76-
assert_eq!(a.lanes_lt(f64x4::splat(5.0) * b), Mask::from_array([false, false, true, false]));
77-
assert_eq!(a.lanes_ge(f64x4::splat(5.0) * b), Mask::from_array([true, true, false, true]));
78-
assert_eq!(a.lanes_gt(f64x4::splat(5.0) * b), Mask::from_array([true, false, false, true]));
73+
assert_eq!(a.simd_eq(f64x4::splat(5.0) * b), Mask::from_array([false, true, false, false]));
74+
assert_eq!(a.simd_ne(f64x4::splat(5.0) * b), Mask::from_array([true, false, true, true]));
75+
assert_eq!(a.simd_le(f64x4::splat(5.0) * b), Mask::from_array([false, true, true, false]));
76+
assert_eq!(a.simd_lt(f64x4::splat(5.0) * b), Mask::from_array([false, false, true, false]));
77+
assert_eq!(a.simd_ge(f64x4::splat(5.0) * b), Mask::from_array([true, true, false, true]));
78+
assert_eq!(a.simd_gt(f64x4::splat(5.0) * b), Mask::from_array([true, false, false, true]));
7979

8080
assert_eq!(a.reduce_sum(), 40.0);
8181
assert_eq!(b.reduce_sum(), 2.0);
@@ -87,13 +87,13 @@ fn simd_ops_f64() {
8787
assert_eq!(b.reduce_min(), -4.0);
8888

8989
assert_eq!(
90-
f64x2::from_array([0.0, f64::NAN]).max(f64x2::from_array([f64::NAN, 0.0])),
90+
f64x2::from_array([0.0, f64::NAN]).simd_max(f64x2::from_array([f64::NAN, 0.0])),
9191
f64x2::from_array([0.0, 0.0])
9292
);
9393
assert_eq!(f64x2::from_array([0.0, f64::NAN]).reduce_max(), 0.0);
9494
assert_eq!(f64x2::from_array([f64::NAN, 0.0]).reduce_max(), 0.0);
9595
assert_eq!(
96-
f64x2::from_array([0.0, f64::NAN]).min(f64x2::from_array([f64::NAN, 0.0])),
96+
f64x2::from_array([0.0, f64::NAN]).simd_min(f64x2::from_array([f64::NAN, 0.0])),
9797
f64x2::from_array([0.0, 0.0])
9898
);
9999
assert_eq!(f64x2::from_array([0.0, f64::NAN]).reduce_min(), 0.0);
@@ -113,8 +113,8 @@ fn simd_ops_i32() {
113113
assert_eq!(a % b, i32x4::from_array([0, 0, 1, 2]));
114114
assert_eq!(i32x2::splat(i32::MIN) % i32x2::splat(-1), i32x2::splat(0));
115115
assert_eq!(b.abs(), i32x4::from_array([1, 2, 3, 4]));
116-
assert_eq!(a.max(b * i32x4::splat(4)), i32x4::from_array([10, 10, 12, 10]));
117-
assert_eq!(a.min(b * i32x4::splat(4)), i32x4::from_array([4, 8, 10, -16]));
116+
assert_eq!(a.simd_max(b * i32x4::splat(4)), i32x4::from_array([10, 10, 12, 10]));
117+
assert_eq!(a.simd_min(b * i32x4::splat(4)), i32x4::from_array([4, 8, 10, -16]));
118118

119119
assert_eq!(
120120
i8x4::from_array([i8::MAX, -23, 23, i8::MIN]).saturating_add(i8x4::from_array([
@@ -160,12 +160,12 @@ fn simd_ops_i32() {
160160
assert_eq!(b | i32x4::splat(2), i32x4::from_array([3, 2, 3, -2]));
161161
assert_eq!(b ^ i32x4::splat(2), i32x4::from_array([3, 0, 1, -2]));
162162

163-
assert_eq!(a.lanes_eq(i32x4::splat(5) * b), Mask::from_array([false, true, false, false]));
164-
assert_eq!(a.lanes_ne(i32x4::splat(5) * b), Mask::from_array([true, false, true, true]));
165-
assert_eq!(a.lanes_le(i32x4::splat(5) * b), Mask::from_array([false, true, true, false]));
166-
assert_eq!(a.lanes_lt(i32x4::splat(5) * b), Mask::from_array([false, false, true, false]));
167-
assert_eq!(a.lanes_ge(i32x4::splat(5) * b), Mask::from_array([true, true, false, true]));
168-
assert_eq!(a.lanes_gt(i32x4::splat(5) * b), Mask::from_array([true, false, false, true]));
163+
assert_eq!(a.simd_eq(i32x4::splat(5) * b), Mask::from_array([false, true, false, false]));
164+
assert_eq!(a.simd_ne(i32x4::splat(5) * b), Mask::from_array([true, false, true, true]));
165+
assert_eq!(a.simd_le(i32x4::splat(5) * b), Mask::from_array([false, true, true, false]));
166+
assert_eq!(a.simd_lt(i32x4::splat(5) * b), Mask::from_array([false, false, true, false]));
167+
assert_eq!(a.simd_ge(i32x4::splat(5) * b), Mask::from_array([true, true, false, true]));
168+
assert_eq!(a.simd_gt(i32x4::splat(5) * b), Mask::from_array([true, false, false, true]));
169169

170170
assert_eq!(a.reduce_sum(), 40);
171171
assert_eq!(b.reduce_sum(), 2);

0 commit comments

Comments
 (0)