Skip to content

Commit 68542d9

Browse files
authored
Remove PartialEq impls for x86 types (rust-lang#294)
* Remove `PartialEq for __m64` This helps to strip the public API of the vendor type for now, although this may come back at a later date! * Remove `PartialEq for __m128i` Like the previous commit, but for another type! * Remove `PartialEq for __m256i` Same as previous commit!
1 parent 9ab44b4 commit 68542d9

File tree

18 files changed

+559
-546
lines changed

18 files changed

+559
-546
lines changed

coresimd/src/x86/i586/avx.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3041,7 +3041,7 @@ mod tests {
30413041
let a = _mm256_setr_ps(4., 9., 16., 25., 4., 9., 16., 25.);
30423042
let r = _mm256_cvtps_epi32(a);
30433043
let e = _mm256_setr_epi32(4, 9, 16, 25, 4, 9, 16, 25);
3044-
assert_eq!(r, e);
3044+
assert_eq_m256i(r, e);
30453045
}
30463046

30473047
#[simd_test = "avx"]
@@ -3057,23 +3057,23 @@ mod tests {
30573057
let a = _mm256_setr_pd(4., 9., 16., 25.);
30583058
let r = _mm256_cvttpd_epi32(a);
30593059
let e = _mm_setr_epi32(4, 9, 16, 25);
3060-
assert_eq!(r, e);
3060+
assert_eq_m128i(r, e);
30613061
}
30623062

30633063
#[simd_test = "avx"]
30643064
unsafe fn test_mm256_cvtpd_epi32() {
30653065
let a = _mm256_setr_pd(4., 9., 16., 25.);
30663066
let r = _mm256_cvtpd_epi32(a);
30673067
let e = _mm_setr_epi32(4, 9, 16, 25);
3068-
assert_eq!(r, e);
3068+
assert_eq_m128i(r, e);
30693069
}
30703070

30713071
#[simd_test = "avx"]
30723072
unsafe fn test_mm256_cvttps_epi32() {
30733073
let a = _mm256_setr_ps(4., 9., 16., 25., 4., 9., 16., 25.);
30743074
let r = _mm256_cvttps_epi32(a);
30753075
let e = _mm256_setr_epi32(4, 9, 16, 25, 4, 9, 16, 25);
3076-
assert_eq!(r, e);
3076+
assert_eq_m256i(r, e);
30773077
}
30783078

30793079
#[simd_test = "avx"]
@@ -3097,7 +3097,7 @@ mod tests {
30973097
let a = _mm256_setr_epi64x(4, 3, 2, 5);
30983098
let r = _mm256_extractf128_si256(a, 0);
30993099
let e = _mm_setr_epi64x(4, 3);
3100-
assert_eq!(r, e);
3100+
assert_eq_m128i(r, e);
31013101
}
31023102

31033103
#[simd_test = "avx"]
@@ -3202,7 +3202,7 @@ mod tests {
32023202
let b = _mm256_setr_epi32(5, 6, 7, 8, 5, 6, 7, 8);
32033203
let r = _mm256_permute2f128_si256(a, b, 0x20);
32043204
let e = _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 8);
3205-
assert_eq!(r, e);
3205+
assert_eq_m256i(r, e);
32063206
}
32073207

32083208
#[simd_test = "avx"]
@@ -3266,7 +3266,7 @@ mod tests {
32663266
let b = _mm_setr_epi64x(5, 6);
32673267
let r = _mm256_insertf128_si256(a, b, 0);
32683268
let e = _mm256_setr_epi64x(5, 6, 3, 4);
3269-
assert_eq!(r, e);
3269+
assert_eq_m256i(r, e);
32703270
}
32713271

32723272
#[simd_test = "avx"]
@@ -3286,7 +3286,7 @@ mod tests {
32863286
17, 18, 19, 20, 21, 22, 23, 24,
32873287
25, 26, 27, 28, 29, 30, 31, 0,
32883288
);
3289-
assert_eq!(r, e);
3289+
assert_eq_m256i(r, e);
32903290
}
32913291

32923292
#[simd_test = "avx"]
@@ -3296,23 +3296,23 @@ mod tests {
32963296
let r = _mm256_insert_epi16(a, 0, 15);
32973297
let e =
32983298
_mm256_setr_epi16(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0);
3299-
assert_eq!(r, e);
3299+
assert_eq_m256i(r, e);
33003300
}
33013301

33023302
#[simd_test = "avx"]
33033303
unsafe fn test_mm256_insert_epi32() {
33043304
let a = _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 8);
33053305
let r = _mm256_insert_epi32(a, 0, 7);
33063306
let e = _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 0);
3307-
assert_eq!(r, e);
3307+
assert_eq_m256i(r, e);
33083308
}
33093309

33103310
#[simd_test = "avx"]
33113311
unsafe fn test_mm256_insert_epi64() {
33123312
let a = _mm256_setr_epi64x(1, 2, 3, 4);
33133313
let r = _mm256_insert_epi64(a, 0, 3);
33143314
let e = _mm256_setr_epi64x(1, 2, 3, 0);
3315-
assert_eq!(r, e);
3315+
assert_eq_m256i(r, e);
33163316
}
33173317

33183318
#[simd_test = "avx"]
@@ -3389,15 +3389,15 @@ mod tests {
33893389
let p = &a as *const _;
33903390
let r = _mm256_load_si256(p);
33913391
let e = _mm256_setr_epi64x(1, 2, 3, 4);
3392-
assert_eq!(r, e);
3392+
assert_eq_m256i(r, e);
33933393
}
33943394

33953395
#[simd_test = "avx"]
33963396
unsafe fn test_mm256_store_si256() {
33973397
let a = _mm256_setr_epi64x(1, 2, 3, 4);
33983398
let mut r = _mm256_undefined_si256();
33993399
_mm256_store_si256(&mut r as *mut _, a);
3400-
assert_eq!(r, a);
3400+
assert_eq_m256i(r, a);
34013401
}
34023402

34033403
#[simd_test = "avx"]
@@ -3406,15 +3406,15 @@ mod tests {
34063406
let p = &a as *const _;
34073407
let r = _mm256_loadu_si256(black_box(p));
34083408
let e = _mm256_setr_epi64x(1, 2, 3, 4);
3409-
assert_eq!(r, e);
3409+
assert_eq_m256i(r, e);
34103410
}
34113411

34123412
#[simd_test = "avx"]
34133413
unsafe fn test_mm256_storeu_si256() {
34143414
let a = _mm256_set1_epi8(9);
34153415
let mut r = _mm256_undefined_si256();
34163416
_mm256_storeu_si256(&mut r as *mut _, a);
3417-
assert_eq!(r, a);
3417+
assert_eq_m256i(r, a);
34183418
}
34193419

34203420
#[simd_test = "avx"]
@@ -3539,15 +3539,15 @@ mod tests {
35393539
17, 18, 19, 20, 21, 22, 23, 24,
35403540
25, 26, 27, 28, 29, 30, 31, 32,
35413541
);
3542-
assert_eq!(r, e);
3542+
assert_eq_m256i(r, e);
35433543
}
35443544

35453545
#[simd_test = "avx"]
35463546
unsafe fn test_mm256_stream_si256() {
35473547
let a = _mm256_setr_epi64x(1, 2, 3, 4);
35483548
let mut r = _mm256_undefined_si256();
35493549
_mm256_stream_si256(&mut r as *mut _, a);
3550-
assert_eq!(r, a);
3550+
assert_eq_m256i(r, a);
35513551
}
35523552

35533553
#[simd_test = "avx"]
@@ -3841,7 +3841,7 @@ mod tests {
38413841
#[simd_test = "avx"]
38423842
unsafe fn test_mm256_setzero_si256() {
38433843
let r = _mm256_setzero_si256();
3844-
assert_eq!(r, _mm256_set1_epi8(0));
3844+
assert_eq_m256i(r, _mm256_set1_epi8(0));
38453845
}
38463846

38473847
#[simd_test = "avx"]
@@ -3872,7 +3872,7 @@ mod tests {
38723872
16, 15, 14, 13, 12, 11, 10, 9,
38733873
8, 7, 6, 5, 4, 3, 2, 1
38743874
);
3875-
assert_eq!(r, e);
3875+
assert_eq_m256i(r, e);
38763876
}
38773877

38783878
#[simd_test = "avx"]
@@ -3882,7 +3882,7 @@ mod tests {
38823882
1, 2, 3, 4, 5, 6, 7, 8,
38833883
9, 10, 11, 12, 13, 14, 15, 16,
38843884
);
3885-
assert_eq!(
3885+
assert_eq_m256i(
38863886
r,
38873887
_mm256_setr_epi16(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1)
38883888
);
@@ -3891,13 +3891,13 @@ mod tests {
38913891
#[simd_test = "avx"]
38923892
unsafe fn test_mm256_set_epi32() {
38933893
let r = _mm256_set_epi32(1, 2, 3, 4, 5, 6, 7, 8);
3894-
assert_eq!(r, _mm256_setr_epi32(8, 7, 6, 5, 4, 3, 2, 1));
3894+
assert_eq_m256i(r, _mm256_setr_epi32(8, 7, 6, 5, 4, 3, 2, 1));
38953895
}
38963896

38973897
#[simd_test = "avx"]
38983898
unsafe fn test_mm256_set_epi64x() {
38993899
let r = _mm256_set_epi64x(1, 2, 3, 4);
3900-
assert_eq!(r, _mm256_setr_epi64x(4, 3, 2, 1));
3900+
assert_eq_m256i(r, _mm256_setr_epi64x(4, 3, 2, 1));
39013901
}
39023902

39033903
#[simd_test = "avx"]
@@ -3929,7 +3929,7 @@ mod tests {
39293929
25, 26, 27, 28, 29, 30, 31, 32
39303930
);
39313931

3932-
assert_eq!(r, e);
3932+
assert_eq_m256i(r, e);
39333933
}
39343934

39353935
#[simd_test = "avx"]
@@ -3939,7 +3939,7 @@ mod tests {
39393939
1, 2, 3, 4, 5, 6, 7, 8,
39403940
9, 10, 11, 12, 13, 14, 15, 16,
39413941
);
3942-
assert_eq!(
3942+
assert_eq_m256i(
39433943
r,
39443944
_mm256_setr_epi16(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
39453945
);
@@ -3948,13 +3948,13 @@ mod tests {
39483948
#[simd_test = "avx"]
39493949
unsafe fn test_mm256_setr_epi32() {
39503950
let r = _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 8);
3951-
assert_eq!(r, _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 8));
3951+
assert_eq_m256i(r, _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 8));
39523952
}
39533953

39543954
#[simd_test = "avx"]
39553955
unsafe fn test_mm256_setr_epi64x() {
39563956
let r = _mm256_setr_epi64x(1, 2, 3, 4);
3957-
assert_eq!(r, _mm256_setr_epi64x(1, 2, 3, 4));
3957+
assert_eq_m256i(r, _mm256_setr_epi64x(1, 2, 3, 4));
39583958
}
39593959

39603960
#[simd_test = "avx"]
@@ -3972,25 +3972,25 @@ mod tests {
39723972
#[simd_test = "avx"]
39733973
unsafe fn test_mm256_set1_epi8() {
39743974
let r = _mm256_set1_epi8(1);
3975-
assert_eq!(r, _mm256_set1_epi8(1));
3975+
assert_eq_m256i(r, _mm256_set1_epi8(1));
39763976
}
39773977

39783978
#[simd_test = "avx"]
39793979
unsafe fn test_mm256_set1_epi16() {
39803980
let r = _mm256_set1_epi16(1);
3981-
assert_eq!(r, _mm256_set1_epi16(1));
3981+
assert_eq_m256i(r, _mm256_set1_epi16(1));
39823982
}
39833983

39843984
#[simd_test = "avx"]
39853985
unsafe fn test_mm256_set1_epi32() {
39863986
let r = _mm256_set1_epi32(1);
3987-
assert_eq!(r, _mm256_set1_epi32(1));
3987+
assert_eq_m256i(r, _mm256_set1_epi32(1));
39883988
}
39893989

39903990
#[simd_test = "avx"]
39913991
unsafe fn test_mm256_set1_epi64x() {
39923992
let r = _mm256_set1_epi64x(1);
3993-
assert_eq!(r, _mm256_set1_epi64x(1));
3993+
assert_eq_m256i(r, _mm256_set1_epi64x(1));
39943994
}
39953995

39963996
#[simd_test = "avx"]
@@ -4020,7 +4020,7 @@ mod tests {
40204020
0, 0, -96, 64, 0, 0, -64, 64,
40214021
0, 0, -32, 64, 0, 0, 0, 65,
40224022
);
4023-
assert_eq!(r, e);
4023+
assert_eq_m256i(r, e);
40244024
}
40254025

40264026
#[simd_test = "avx"]
@@ -4069,7 +4069,7 @@ mod tests {
40694069
unsafe fn test_mm256_castsi256_si128() {
40704070
let a = _mm256_setr_epi64x(1, 2, 3, 4);
40714071
let r = _mm256_castsi256_si128(a);
4072-
assert_eq!(r, _mm_setr_epi64x(1, 2));
4072+
assert_eq_m128i(r, _mm_setr_epi64x(1, 2));
40734073
}
40744074

40754075
#[simd_test = "avx"]
@@ -4085,7 +4085,7 @@ mod tests {
40854085
let a = _mm_setr_epi64x(1, 2);
40864086
let r = _mm256_zextsi128_si256(a);
40874087
let e = _mm256_setr_epi64x(1, 2, 0, 0);
4088-
assert_eq!(r, e);
4088+
assert_eq_m256i(r, e);
40894089
}
40904090

40914091
#[simd_test = "avx"]
@@ -4138,7 +4138,7 @@ mod tests {
41384138
17, 18, 19, 20, 21, 22, 23, 24,
41394139
25, 26, 27, 28, 29, 30, 31, 32,
41404140
);
4141-
assert_eq!(r, e);
4141+
assert_eq_m256i(r, e);
41424142
}
41434143

41444144
#[simd_test = "avx"]
@@ -4181,7 +4181,7 @@ mod tests {
41814181
17, 18, 19, 20, 21, 22, 23, 24,
41824182
25, 26, 27, 28, 29, 30, 31, 32,
41834183
);
4184-
assert_eq!(r, e);
4184+
assert_eq_m256i(r, e);
41854185
}
41864186

41874187
#[simd_test = "avx"]
@@ -4226,7 +4226,7 @@ mod tests {
42264226
17, 18, 19, 20, 21, 22, 23, 24,
42274227
25, 26, 27, 28, 29, 30, 31, 32,
42284228
);
4229-
assert_eq!(r, e);
4229+
assert_eq_m256i(r, e);
42304230
}
42314231

42324232
#[simd_test = "avx"]
@@ -4280,8 +4280,8 @@ mod tests {
42804280
9, 10, 11, 12, 13, 14, 15, 16
42814281
);
42824282

4283-
assert_eq!(hi, e_hi);
4284-
assert_eq!(lo, e_lo);
4283+
assert_eq_m128i(hi, e_hi);
4284+
assert_eq_m128i(lo, e_lo);
42854285
}
42864286

42874287
#[simd_test = "avx"]

0 commit comments

Comments
 (0)