Skip to content

Commit a0f68f8

Browse files
SparrowLiiSparrowLii
committed
correct tests
1 parent 2fc5931 commit a0f68f8

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

‎crates/core_arch/src/aarch64/neon/generated.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -23056,7 +23056,7 @@ mod test {
2305623056
let a: u32x4 = u32x4::new(1, 2, 3, 4);
2305723057
let b: u32x4 = u32x4::new(1, 2, 3, 4);
2305823058
let c: u32x4 = u32x4::new(1, 2, 3, 4);
23059-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
23059+
let e: u32x4 = u32x4::new(2147549312, 3221323968, 131329, 2684362752);
2306023060
let r: u32x4 = transmute(vsm3partw1q_u32(transmute(a), transmute(b), transmute(c)));
2306123061
assert_eq!(r, e);
2306223062
}
@@ -23066,7 +23066,7 @@ mod test {
2306623066
let a: u32x4 = u32x4::new(1, 2, 3, 4);
2306723067
let b: u32x4 = u32x4::new(1, 2, 3, 4);
2306823068
let c: u32x4 = u32x4::new(1, 2, 3, 4);
23069-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
23069+
let e: u32x4 = u32x4::new(128, 256, 384, 1077977696);
2307023070
let r: u32x4 = transmute(vsm3partw2q_u32(transmute(a), transmute(b), transmute(c)));
2307123071
assert_eq!(r, e);
2307223072
}
@@ -23076,7 +23076,7 @@ mod test {
2307623076
let a: u32x4 = u32x4::new(1, 2, 3, 4);
2307723077
let b: u32x4 = u32x4::new(1, 2, 3, 4);
2307823078
let c: u32x4 = u32x4::new(1, 2, 3, 4);
23079-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
23079+
let e: u32x4 = u32x4::new(0, 0, 0, 2098176);
2308023080
let r: u32x4 = transmute(vsm3ss1q_u32(transmute(a), transmute(b), transmute(c)));
2308123081
assert_eq!(r, e);
2308223082
}
@@ -23085,7 +23085,7 @@ mod test {
2308523085
unsafe fn test_vsm4ekeyq_u32() {
2308623086
let a: u32x4 = u32x4::new(1, 2, 3, 4);
2308723087
let b: u32x4 = u32x4::new(1, 2, 3, 4);
23088-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
23088+
let e: u32x4 = u32x4::new(1784948604, 136020997, 2940231695, 3789947679);
2308923089
let r: u32x4 = transmute(vsm4ekeyq_u32(transmute(a), transmute(b)));
2309023090
assert_eq!(r, e);
2309123091
}
@@ -23094,7 +23094,7 @@ mod test {
2309423094
unsafe fn test_vsm4eq_u32() {
2309523095
let a: u32x4 = u32x4::new(1, 2, 3, 4);
2309623096
let b: u32x4 = u32x4::new(1, 2, 3, 4);
23097-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
23097+
let e: u32x4 = u32x4::new(1093874472, 3616769504, 3878330411, 2765298765);
2309823098
let r: u32x4 = transmute(vsm4eq_u32(transmute(a), transmute(b)));
2309923099
assert_eq!(r, e);
2310023100
}
@@ -23103,7 +23103,7 @@ mod test {
2310323103
unsafe fn test_vrax1q_u64() {
2310423104
let a: u64x2 = u64x2::new(1, 2);
2310523105
let b: u64x2 = u64x2::new(3, 4);
23106-
let e: u64x2 = u64x2::new(5, 6);
23106+
let e: u64x2 = u64x2::new(7, 10);
2310723107
let r: u64x2 = transmute(vrax1q_u64(transmute(a), transmute(b)));
2310823108
assert_eq!(r, e);
2310923109
}
@@ -23113,7 +23113,7 @@ mod test {
2311323113
let a: u64x2 = u64x2::new(1, 2);
2311423114
let b: u64x2 = u64x2::new(3, 4);
2311523115
let c: u64x2 = u64x2::new(5, 6);
23116-
let e: u64x2 = u64x2::new(7, 8);
23116+
let e: u64x2 = u64x2::new(11189044327219203, 7177611956453380);
2311723117
let r: u64x2 = transmute(vsha512hq_u64(transmute(a), transmute(b), transmute(c)));
2311823118
assert_eq!(r, e);
2311923119
}
@@ -23123,7 +23123,7 @@ mod test {
2312323123
let a: u64x2 = u64x2::new(1, 2);
2312423124
let b: u64x2 = u64x2::new(3, 4);
2312523125
let c: u64x2 = u64x2::new(5, 6);
23126-
let e: u64x2 = u64x2::new(7, 8);
23126+
let e: u64x2 = u64x2::new(5770237651009406214, 349133864969);
2312723127
let r: u64x2 = transmute(vsha512h2q_u64(transmute(a), transmute(b), transmute(c)));
2312823128
assert_eq!(r, e);
2312923129
}
@@ -23132,7 +23132,7 @@ mod test {
2313223132
unsafe fn test_vsha512su0q_u64() {
2313323133
let a: u64x2 = u64x2::new(1, 2);
2313423134
let b: u64x2 = u64x2::new(3, 4);
23135-
let e: u64x2 = u64x2::new(7, 8);
23135+
let e: u64x2 = u64x2::new(144115188075855874, 9439544818968559619);
2313623136
let r: u64x2 = transmute(vsha512su0q_u64(transmute(a), transmute(b)));
2313723137
assert_eq!(r, e);
2313823138
}
@@ -23142,7 +23142,7 @@ mod test {
2314223142
let a: u64x2 = u64x2::new(1, 2);
2314323143
let b: u64x2 = u64x2::new(3, 4);
2314423144
let c: u64x2 = u64x2::new(5, 6);
23145-
let e: u64x2 = u64x2::new(7, 8);
23145+
let e: u64x2 = u64x2::new(105553116266526, 140737488355368);
2314623146
let r: u64x2 = transmute(vsha512su1q_u64(transmute(a), transmute(b), transmute(c)));
2314723147
assert_eq!(r, e);
2314823148
}

‎crates/core_arch/src/aarch64/neon/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -4963,7 +4963,7 @@ mod tests {
49634963
let a: u32x4 = u32x4::new(1, 2, 3, 4);
49644964
let b: u32x4 = u32x4::new(1, 2, 3, 4);
49654965
let c: u32x4 = u32x4::new(1, 2, 3, 4);
4966-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
4966+
let e: u32x4 = u32x4::new(2, 1536, 4, 16395);
49674967
let r: u32x4 = transmute(vsm3tt1aq_u32::<0>(transmute(a), transmute(b), transmute(c)));
49684968
assert_eq!(r, e);
49694969
}
@@ -4973,7 +4973,7 @@ mod tests {
49734973
let a: u32x4 = u32x4::new(1, 2, 3, 4);
49744974
let b: u32x4 = u32x4::new(1, 2, 3, 4);
49754975
let c: u32x4 = u32x4::new(1, 2, 3, 4);
4976-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
4976+
let e: u32x4 = u32x4::new(2, 1536, 4, 16392);
49774977
let r: u32x4 = transmute(vsm3tt1bq_u32::<0>(transmute(a), transmute(b), transmute(c)));
49784978
assert_eq!(r, e);
49794979
}
@@ -4983,7 +4983,7 @@ mod tests {
49834983
let a: u32x4 = u32x4::new(1, 2, 3, 4);
49844984
let b: u32x4 = u32x4::new(1, 2, 3, 4);
49854985
let c: u32x4 = u32x4::new(1, 2, 3, 4);
4986-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
4986+
let e: u32x4 = u32x4::new(2, 1572864, 4, 1447435);
49874987
let r: u32x4 = transmute(vsm3tt2aq_u32::<0>(transmute(a), transmute(b), transmute(c)));
49884988
assert_eq!(r, e);
49894989
}
@@ -4993,16 +4993,16 @@ mod tests {
49934993
let a: u32x4 = u32x4::new(1, 2, 3, 4);
49944994
let b: u32x4 = u32x4::new(1, 2, 3, 4);
49954995
let c: u32x4 = u32x4::new(1, 2, 3, 4);
4996-
let e: u32x4 = u32x4::new(1, 2, 3, 4);
4996+
let e: u32x4 = u32x4::new(2, 1572864, 4, 1052680);
49974997
let r: u32x4 = transmute(vsm3tt2bq_u32::<0>(transmute(a), transmute(b), transmute(c)));
49984998
assert_eq!(r, e);
49994999
}
50005000

50015001
#[simd_test(enable = "neon,sha3")]
50025002
unsafe fn test_vxarq_u64() {
50035003
let a: u64x2 = u64x2::new(1, 2);
5004-
let b: u64x2 = u64x2::new(1, 2);
5005-
let e: u64x2 = u64x2::new(5, 6);
5004+
let b: u64x2 = u64x2::new(3, 4);
5005+
let e: u64x2 = u64x2::new(2, 6);
50065006
let r: u64x2 = transmute(vxarq_u64::<0>(transmute(a), transmute(b)));
50075007
assert_eq!(r, e);
50085008
}

‎crates/core_arch/src/arm_shared/neon/mod.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -4810,7 +4810,7 @@ pub unsafe fn vpadalq_u32(a: uint64x2_t, b: uint32x4_t) -> uint64x2_t {
48104810
#[inline]
48114811
#[target_feature(enable = "neon,i8mm")]
48124812
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
4813-
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(vsmmla))]
4813+
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(nop))]
48144814
#[cfg_attr(all(test, target_arch = "aarch64"), assert_instr(smmla))]
48154815
pub unsafe fn vmmlaq_s32(a: int32x4_t, b: int8x16_t, c: int8x16_t) -> int32x4_t {
48164816
#[allow(improper_ctypes)]
@@ -4829,7 +4829,7 @@ pub unsafe fn vmmlaq_s32(a: int32x4_t, b: int8x16_t, c: int8x16_t) -> int32x4_t
48294829
#[inline]
48304830
#[target_feature(enable = "neon,i8mm")]
48314831
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
4832-
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(vummla))]
4832+
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(nop))]
48334833
#[cfg_attr(all(test, target_arch = "aarch64"), assert_instr(ummla))]
48344834
pub unsafe fn vmmlaq_u32(a: uint32x4_t, b: uint8x16_t, c: uint8x16_t) -> uint32x4_t {
48354835
#[allow(improper_ctypes)]
@@ -4848,7 +4848,7 @@ pub unsafe fn vmmlaq_u32(a: uint32x4_t, b: uint8x16_t, c: uint8x16_t) -> uint32x
48484848
#[inline]
48494849
#[target_feature(enable = "neon,i8mm")]
48504850
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
4851-
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(vusmmla))]
4851+
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(nop))]
48524852
#[cfg_attr(all(test, target_arch = "aarch64"), assert_instr(usmmla))]
48534853
pub unsafe fn vusmmlaq_s32(a: int32x4_t, b: uint8x16_t, c: int8x16_t) -> int32x4_t {
48544854
#[allow(improper_ctypes)]
@@ -10427,29 +10427,29 @@ mod tests {
1042710427
}
1042810428
#[simd_test(enable = "neon,i8mm")]
1042910429
unsafe fn test_vmmlaq_s32() {
10430-
let a: i32x4 = i32x4::new(1, 2, 3, 4);
10431-
let b: i8x16 = i8x16::new(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
10432-
let c: i8x16 = i8x16::new(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
10430+
let a: i32x4 = i32x4::new(1, 3, 4, 9);
10431+
let b: i8x16 = i8x16::new(1, 21, 31, 14, 5, 6, 17, 8, 9, 13, 15, 12, 13, 19, 20, 16);
10432+
let c: i8x16 = i8x16::new(12, 22, 3, 4, 5, 56, 7, 8, 91, 10, 11, 15, 13, 14, 17, 16);
1043310433
let e: i32x4 = i32x4::new(1, 2, 3, 4);
1043410434
let r: i32x4 = transmute(vmmlaq_s32(transmute(a), transmute(b), transmute(c)));
1043510435
assert_eq!(r, e);
1043610436
}
1043710437

1043810438
#[simd_test(enable = "neon,i8mm")]
1043910439
unsafe fn test_vmmlaq_u32() {
10440-
let a: u32x4 = u32x4::new(1, 2, 3, 4);
10441-
let b: u8x16 = u8x16::new(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
10442-
let c: u8x16 = u8x16::new(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
10440+
let a: u32x4 = u32x4::new(1, 3, 4, 9);
10441+
let b: i8x16 = i8x16::new(1, 21, 31, 14, 5, 6, 17, 8, 9, 13, 15, 12, 13, 19, 20, 16);
10442+
let c: i8x16 = i8x16::new(12, 22, 3, 4, 5, 56, 7, 8, 91, 10, 11, 15, 13, 14, 17, 16);
1044310443
let e: u32x4 = u32x4::new(1, 2, 3, 4);
1044410444
let r: u32x4 = transmute(vmmlaq_u32(transmute(a), transmute(b), transmute(c)));
1044510445
assert_eq!(r, e);
1044610446
}
1044710447

1044810448
#[simd_test(enable = "neon,i8mm")]
1044910449
unsafe fn test_vusmmlaq_s32() {
10450-
let a: i32x4 = i32x4::new(1, 2, 3, 4);
10451-
let b: u8x16 = u8x16::new(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
10452-
let c: i8x16 = i8x16::new(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
10450+
let a: i32x4 = i32x4::new(1, 3, 4, 9);
10451+
let b: i8x16 = i8x16::new(1, 21, 31, 14, 5, 6, 17, 8, 9, 13, 15, 12, 13, 19, 20, 16);
10452+
let c: i8x16 = i8x16::new(12, 22, 3, 4, 5, 56, 7, 8, 91, 10, 11, 15, 13, 14, 17, 16);
1045310453
let e: i32x4 = i32x4::new(1, 2, 3, 4);
1045410454
let r: i32x4 = transmute(vusmmlaq_s32(transmute(a), transmute(b), transmute(c)));
1045510455
assert_eq!(r, e);

‎crates/stdarch-gen/neon.spec

+10-10
Original file line numberDiff line numberDiff line change
@@ -6851,7 +6851,7 @@ name = vsm3partw1
68516851
a = 1, 2, 3, 4
68526852
b = 1, 2, 3, 4
68536853
c = 1, 2, 3, 4
6854-
validate 1, 2, 3, 4
6854+
validate 2147549312, 3221323968, 131329, 2684362752
68556855
target = sm4
68566856

68576857
aarch64 = sm3partw1
@@ -6863,7 +6863,7 @@ name = vsm3partw2
68636863
a = 1, 2, 3, 4
68646864
b = 1, 2, 3, 4
68656865
c = 1, 2, 3, 4
6866-
validate 1, 2, 3, 4
6866+
validate 128, 256, 384, 1077977696
68676867
target = sm4
68686868

68696869
aarch64 = sm3partw2
@@ -6875,7 +6875,7 @@ name = vsm3ss1
68756875
a = 1, 2, 3, 4
68766876
b = 1, 2, 3, 4
68776877
c = 1, 2, 3, 4
6878-
validate 1, 2, 3, 4
6878+
validate 0, 0, 0, 2098176
68796879
target = sm4
68806880

68816881
aarch64 = sm3ss1
@@ -6886,7 +6886,7 @@ generate uint32x4_t
68866886
name = vsm4ekey
68876887
a = 1, 2, 3, 4
68886888
b = 1, 2, 3, 4
6889-
validate 1, 2, 3, 4
6889+
validate 1784948604, 136020997, 2940231695, 3789947679
68906890
target = sm4
68916891

68926892
aarch64 = sm4ekey
@@ -6897,7 +6897,7 @@ generate uint32x4_t
68976897
name = vsm4e
68986898
a = 1, 2, 3, 4
68996899
b = 1, 2, 3, 4
6900-
validate 1, 2, 3, 4
6900+
validate 1093874472, 3616769504, 3878330411, 2765298765
69016901
target = sm4
69026902

69036903
aarch64 = sm4e
@@ -6908,7 +6908,7 @@ generate uint32x4_t
69086908
name = vrax1
69096909
a = 1, 2
69106910
b = 3, 4
6911-
validate 5, 6
6911+
validate 7, 10
69126912
target = sha3
69136913

69146914
aarch64 = rax1
@@ -6920,7 +6920,7 @@ name = vsha512h
69206920
a = 1, 2
69216921
b = 3, 4
69226922
c = 5, 6
6923-
validate 7, 8
6923+
validate 11189044327219203, 7177611956453380
69246924
target = sha3
69256925

69266926
aarch64 = sha512h
@@ -6932,7 +6932,7 @@ name = vsha512h2
69326932
a = 1, 2
69336933
b = 3, 4
69346934
c = 5, 6
6935-
validate 7, 8
6935+
validate 5770237651009406214, 349133864969
69366936
target = sha3
69376937

69386938
aarch64 = sha512h2
@@ -6943,7 +6943,7 @@ generate uint64x2_t
69436943
name = vsha512su0
69446944
a = 1, 2
69456945
b = 3, 4
6946-
validate 7, 8
6946+
validate 144115188075855874, 9439544818968559619
69476947
target = sha3
69486948

69496949
aarch64 = sha512su0
@@ -6955,7 +6955,7 @@ name = vsha512su1
69556955
a = 1, 2
69566956
b = 3, 4
69576957
c = 5, 6
6958-
validate 7, 8
6958+
validate 105553116266526, 140737488355368
69596959
target = sha3
69606960

69616961
aarch64 = sha512su1

0 commit comments

Comments
 (0)