Skip to content

Commit 2afada9

Browse files
AmanieuAmanieu
authored
Merge pull request rust-lang#1860 from folkertdev/stdarch-test-cleanup
`stdarch-test`: various cleanups
2 parents 3712455 + 2290ff2 commit 2afada9

File tree

8 files changed

+397
-138
lines changed

8 files changed

+397
-138
lines changed

‎stdarch/Cargo.lock‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub fn __crc32d(crc: u32, data: u64) -> u32 {
5151
#[inline]
5252
#[target_feature(enable = "neon")]
5353
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
54-
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(sabal))]
54+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(sabal2))]
5555
pub fn vabal_high_s8(a: int16x8_t, b: int8x16_t, c: int8x16_t) -> int16x8_t {
5656
unsafe {
5757
let d: int8x8_t = simd_shuffle!(b, b, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -66,7 +66,7 @@ pub fn vabal_high_s8(a: int16x8_t, b: int8x16_t, c: int8x16_t) -> int16x8_t {
6666
#[inline]
6767
#[target_feature(enable = "neon")]
6868
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
69-
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(sabal))]
69+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(sabal2))]
7070
pub fn vabal_high_s16(a: int32x4_t, b: int16x8_t, c: int16x8_t) -> int32x4_t {
7171
unsafe {
7272
let d: int16x4_t = simd_shuffle!(b, b, [4, 5, 6, 7]);
@@ -81,7 +81,7 @@ pub fn vabal_high_s16(a: int32x4_t, b: int16x8_t, c: int16x8_t) -> int32x4_t {
8181
#[inline]
8282
#[target_feature(enable = "neon")]
8383
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
84-
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(sabal))]
84+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(sabal2))]
8585
pub fn vabal_high_s32(a: int64x2_t, b: int32x4_t, c: int32x4_t) -> int64x2_t {
8686
unsafe {
8787
let d: int32x2_t = simd_shuffle!(b, b, [2, 3]);
@@ -96,7 +96,7 @@ pub fn vabal_high_s32(a: int64x2_t, b: int32x4_t, c: int32x4_t) -> int64x2_t {
9696
#[inline]
9797
#[target_feature(enable = "neon")]
9898
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
99-
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(uabal))]
99+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(uabal2))]
100100
pub fn vabal_high_u8(a: uint16x8_t, b: uint8x16_t, c: uint8x16_t) -> uint16x8_t {
101101
unsafe {
102102
let d: uint8x8_t = simd_shuffle!(b, b, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -110,7 +110,7 @@ pub fn vabal_high_u8(a: uint16x8_t, b: uint8x16_t, c: uint8x16_t) -> uint16x8_t
110110
#[inline]
111111
#[target_feature(enable = "neon")]
112112
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
113-
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(uabal))]
113+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(uabal2))]
114114
pub fn vabal_high_u16(a: uint32x4_t, b: uint16x8_t, c: uint16x8_t) -> uint32x4_t {
115115
unsafe {
116116
let d: uint16x4_t = simd_shuffle!(b, b, [4, 5, 6, 7]);
@@ -124,7 +124,7 @@ pub fn vabal_high_u16(a: uint32x4_t, b: uint16x8_t, c: uint16x8_t) -> uint32x4_t
124124
#[inline]
125125
#[target_feature(enable = "neon")]
126126
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
127-
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(uabal))]
127+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(uabal2))]
128128
pub fn vabal_high_u32(a: uint64x2_t, b: uint32x4_t, c: uint32x4_t) -> uint64x2_t {
129129
unsafe {
130130
let d: uint32x2_t = simd_shuffle!(b, b, [2, 3]);
@@ -197,7 +197,7 @@ pub fn vabdh_f16(a: f16, b: f16) -> f16 {
197197
#[inline]
198198
#[target_feature(enable = "neon")]
199199
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
200-
#[cfg_attr(test, assert_instr(sabdl))]
200+
#[cfg_attr(test, assert_instr(sabdl2))]
201201
pub fn vabdl_high_s16(a: int16x8_t, b: int16x8_t) -> int32x4_t {
202202
unsafe {
203203
let c: int16x4_t = simd_shuffle!(a, a, [4, 5, 6, 7]);
@@ -211,7 +211,7 @@ pub fn vabdl_high_s16(a: int16x8_t, b: int16x8_t) -> int32x4_t {
211211
#[inline]
212212
#[target_feature(enable = "neon")]
213213
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
214-
#[cfg_attr(test, assert_instr(sabdl))]
214+
#[cfg_attr(test, assert_instr(sabdl2))]
215215
pub fn vabdl_high_s32(a: int32x4_t, b: int32x4_t) -> int64x2_t {
216216
unsafe {
217217
let c: int32x2_t = simd_shuffle!(a, a, [2, 3]);
@@ -225,7 +225,7 @@ pub fn vabdl_high_s32(a: int32x4_t, b: int32x4_t) -> int64x2_t {
225225
#[inline]
226226
#[target_feature(enable = "neon")]
227227
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
228-
#[cfg_attr(test, assert_instr(sabdl))]
228+
#[cfg_attr(test, assert_instr(sabdl2))]
229229
pub fn vabdl_high_s8(a: int8x16_t, b: int8x16_t) -> int16x8_t {
230230
unsafe {
231231
let c: int8x8_t = simd_shuffle!(a, a, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -238,7 +238,7 @@ pub fn vabdl_high_s8(a: int8x16_t, b: int8x16_t) -> int16x8_t {
238238
#[doc = "[Arm's documentation](https://developer.arm.com/architectures/instruction-sets/intrinsics/vabdl_high_u8)"]
239239
#[inline]
240240
#[target_feature(enable = "neon")]
241-
#[cfg_attr(test, assert_instr(uabdl))]
241+
#[cfg_attr(test, assert_instr(uabdl2))]
242242
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
243243
pub fn vabdl_high_u8(a: uint8x16_t, b: uint8x16_t) -> uint16x8_t {
244244
unsafe {
@@ -251,7 +251,7 @@ pub fn vabdl_high_u8(a: uint8x16_t, b: uint8x16_t) -> uint16x8_t {
251251
#[doc = "[Arm's documentation](https://developer.arm.com/architectures/instruction-sets/intrinsics/vabdl_high_u16)"]
252252
#[inline]
253253
#[target_feature(enable = "neon")]
254-
#[cfg_attr(test, assert_instr(uabdl))]
254+
#[cfg_attr(test, assert_instr(uabdl2))]
255255
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
256256
pub fn vabdl_high_u16(a: uint16x8_t, b: uint16x8_t) -> uint32x4_t {
257257
unsafe {
@@ -264,7 +264,7 @@ pub fn vabdl_high_u16(a: uint16x8_t, b: uint16x8_t) -> uint32x4_t {
264264
#[doc = "[Arm's documentation](https://developer.arm.com/architectures/instruction-sets/intrinsics/vabdl_high_u32)"]
265265
#[inline]
266266
#[target_feature(enable = "neon")]
267-
#[cfg_attr(test, assert_instr(uabdl))]
267+
#[cfg_attr(test, assert_instr(uabdl2))]
268268
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
269269
pub fn vabdl_high_u32(a: uint32x4_t, b: uint32x4_t) -> uint64x2_t {
270270
unsafe {
@@ -7177,7 +7177,7 @@ pub fn vcvt_high_f32_f16(a: float16x8_t) -> float32x4_t {
71777177
#[doc = "[Arm's documentation](https://developer.arm.com/architectures/instruction-sets/intrinsics/vcvt_high_f32_f64)"]
71787178
#[inline]
71797179
#[target_feature(enable = "neon")]
7180-
#[cfg_attr(test, assert_instr(fcvtn))]
7180+
#[cfg_attr(test, assert_instr(fcvtn2))]
71817181
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
71827182
pub fn vcvt_high_f32_f64(a: float32x2_t, b: float64x2_t) -> float32x4_t {
71837183
unsafe { simd_shuffle!(a, simd_cast(b), [0, 1, 2, 3]) }
@@ -7186,7 +7186,7 @@ pub fn vcvt_high_f32_f64(a: float32x2_t, b: float64x2_t) -> float32x4_t {
71867186
#[doc = "[Arm's documentation](https://developer.arm.com/architectures/instruction-sets/intrinsics/vcvt_high_f64_f32)"]
71877187
#[inline]
71887188
#[target_feature(enable = "neon")]
7189-
#[cfg_attr(test, assert_instr(fcvtl))]
7189+
#[cfg_attr(test, assert_instr(fcvtl2))]
71907190
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
71917191
pub fn vcvt_high_f64_f32(a: float32x4_t) -> float64x2_t {
71927192
unsafe {
@@ -9286,7 +9286,7 @@ pub fn vcvtx_f32_f64(a: float64x2_t) -> float32x2_t {
92869286
#[doc = "[Arm's documentation](https://developer.arm.com/architectures/instruction-sets/intrinsics/vcvtx_high_f32_f64)"]
92879287
#[inline]
92889288
#[target_feature(enable = "neon")]
9289-
#[cfg_attr(test, assert_instr(fcvtxn))]
9289+
#[cfg_attr(test, assert_instr(fcvtxn2))]
92909290
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
92919291
pub fn vcvtx_high_f32_f64(a: float32x2_t, b: float64x2_t) -> float32x4_t {
92929292
unsafe { simd_shuffle!(a, vcvtx_f32_f64(b), [0, 1, 2, 3]) }
@@ -14893,7 +14893,7 @@ pub fn vmull_high_n_u32(a: uint32x4_t, b: u32) -> uint64x2_t {
1489314893
#[inline]
1489414894
#[target_feature(enable = "neon,aes")]
1489514895
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
14896-
#[cfg_attr(test, assert_instr(pmull))]
14896+
#[cfg_attr(test, assert_instr(pmull2))]
1489714897
pub fn vmull_high_p64(a: poly64x2_t, b: poly64x2_t) -> p128 {
1489814898
unsafe { vmull_p64(simd_extract!(a, 1), simd_extract!(b, 1)) }
1489914899
}
@@ -14902,7 +14902,7 @@ pub fn vmull_high_p64(a: poly64x2_t, b: poly64x2_t) -> p128 {
1490214902
#[inline]
1490314903
#[target_feature(enable = "neon")]
1490414904
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
14905-
#[cfg_attr(test, assert_instr(pmull))]
14905+
#[cfg_attr(test, assert_instr(pmull2))]
1490614906
pub fn vmull_high_p8(a: poly8x16_t, b: poly8x16_t) -> poly16x8_t {
1490714907
unsafe {
1490814908
let a: poly8x8_t = simd_shuffle!(a, a, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -26497,7 +26497,7 @@ pub fn vsubh_f16(a: f16, b: f16) -> f16 {
2649726497
#[inline]
2649826498
#[target_feature(enable = "neon")]
2649926499
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26500-
#[cfg_attr(test, assert_instr(ssubl))]
26500+
#[cfg_attr(test, assert_instr(ssubl2))]
2650126501
pub fn vsubl_high_s8(a: int8x16_t, b: int8x16_t) -> int16x8_t {
2650226502
unsafe {
2650326503
let c: int8x8_t = simd_shuffle!(a, a, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -26512,7 +26512,7 @@ pub fn vsubl_high_s8(a: int8x16_t, b: int8x16_t) -> int16x8_t {
2651226512
#[inline]
2651326513
#[target_feature(enable = "neon")]
2651426514
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26515-
#[cfg_attr(test, assert_instr(ssubl))]
26515+
#[cfg_attr(test, assert_instr(ssubl2))]
2651626516
pub fn vsubl_high_s16(a: int16x8_t, b: int16x8_t) -> int32x4_t {
2651726517
unsafe {
2651826518
let c: int16x4_t = simd_shuffle!(a, a, [4, 5, 6, 7]);
@@ -26527,7 +26527,7 @@ pub fn vsubl_high_s16(a: int16x8_t, b: int16x8_t) -> int32x4_t {
2652726527
#[inline]
2652826528
#[target_feature(enable = "neon")]
2652926529
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26530-
#[cfg_attr(test, assert_instr(ssubl))]
26530+
#[cfg_attr(test, assert_instr(ssubl2))]
2653126531
pub fn vsubl_high_s32(a: int32x4_t, b: int32x4_t) -> int64x2_t {
2653226532
unsafe {
2653326533
let c: int32x2_t = simd_shuffle!(a, a, [2, 3]);
@@ -26542,7 +26542,7 @@ pub fn vsubl_high_s32(a: int32x4_t, b: int32x4_t) -> int64x2_t {
2654226542
#[inline]
2654326543
#[target_feature(enable = "neon")]
2654426544
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26545-
#[cfg_attr(test, assert_instr(usubl))]
26545+
#[cfg_attr(test, assert_instr(usubl2))]
2654626546
pub fn vsubl_high_u8(a: uint8x16_t, b: uint8x16_t) -> uint16x8_t {
2654726547
unsafe {
2654826548
let c: uint8x8_t = simd_shuffle!(a, a, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -26557,7 +26557,7 @@ pub fn vsubl_high_u8(a: uint8x16_t, b: uint8x16_t) -> uint16x8_t {
2655726557
#[inline]
2655826558
#[target_feature(enable = "neon")]
2655926559
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26560-
#[cfg_attr(test, assert_instr(usubl))]
26560+
#[cfg_attr(test, assert_instr(usubl2))]
2656126561
pub fn vsubl_high_u16(a: uint16x8_t, b: uint16x8_t) -> uint32x4_t {
2656226562
unsafe {
2656326563
let c: uint16x4_t = simd_shuffle!(a, a, [4, 5, 6, 7]);
@@ -26572,7 +26572,7 @@ pub fn vsubl_high_u16(a: uint16x8_t, b: uint16x8_t) -> uint32x4_t {
2657226572
#[inline]
2657326573
#[target_feature(enable = "neon")]
2657426574
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26575-
#[cfg_attr(test, assert_instr(usubl))]
26575+
#[cfg_attr(test, assert_instr(usubl2))]
2657626576
pub fn vsubl_high_u32(a: uint32x4_t, b: uint32x4_t) -> uint64x2_t {
2657726577
unsafe {
2657826578
let c: uint32x2_t = simd_shuffle!(a, a, [2, 3]);
@@ -26587,7 +26587,7 @@ pub fn vsubl_high_u32(a: uint32x4_t, b: uint32x4_t) -> uint64x2_t {
2658726587
#[inline]
2658826588
#[target_feature(enable = "neon")]
2658926589
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26590-
#[cfg_attr(test, assert_instr(ssubw))]
26590+
#[cfg_attr(test, assert_instr(ssubw2))]
2659126591
pub fn vsubw_high_s8(a: int16x8_t, b: int8x16_t) -> int16x8_t {
2659226592
unsafe {
2659326593
let c: int8x8_t = simd_shuffle!(b, b, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -26599,7 +26599,7 @@ pub fn vsubw_high_s8(a: int16x8_t, b: int8x16_t) -> int16x8_t {
2659926599
#[inline]
2660026600
#[target_feature(enable = "neon")]
2660126601
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26602-
#[cfg_attr(test, assert_instr(ssubw))]
26602+
#[cfg_attr(test, assert_instr(ssubw2))]
2660326603
pub fn vsubw_high_s16(a: int32x4_t, b: int16x8_t) -> int32x4_t {
2660426604
unsafe {
2660526605
let c: int16x4_t = simd_shuffle!(b, b, [4, 5, 6, 7]);
@@ -26611,7 +26611,7 @@ pub fn vsubw_high_s16(a: int32x4_t, b: int16x8_t) -> int32x4_t {
2661126611
#[inline]
2661226612
#[target_feature(enable = "neon")]
2661326613
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26614-
#[cfg_attr(test, assert_instr(ssubw))]
26614+
#[cfg_attr(test, assert_instr(ssubw2))]
2661526615
pub fn vsubw_high_s32(a: int64x2_t, b: int32x4_t) -> int64x2_t {
2661626616
unsafe {
2661726617
let c: int32x2_t = simd_shuffle!(b, b, [2, 3]);
@@ -26623,7 +26623,7 @@ pub fn vsubw_high_s32(a: int64x2_t, b: int32x4_t) -> int64x2_t {
2662326623
#[inline]
2662426624
#[target_feature(enable = "neon")]
2662526625
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26626-
#[cfg_attr(test, assert_instr(usubw))]
26626+
#[cfg_attr(test, assert_instr(usubw2))]
2662726627
pub fn vsubw_high_u8(a: uint16x8_t, b: uint8x16_t) -> uint16x8_t {
2662826628
unsafe {
2662926629
let c: uint8x8_t = simd_shuffle!(b, b, [8, 9, 10, 11, 12, 13, 14, 15]);
@@ -26635,7 +26635,7 @@ pub fn vsubw_high_u8(a: uint16x8_t, b: uint8x16_t) -> uint16x8_t {
2663526635
#[inline]
2663626636
#[target_feature(enable = "neon")]
2663726637
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26638-
#[cfg_attr(test, assert_instr(usubw))]
26638+
#[cfg_attr(test, assert_instr(usubw2))]
2663926639
pub fn vsubw_high_u16(a: uint32x4_t, b: uint16x8_t) -> uint32x4_t {
2664026640
unsafe {
2664126641
let c: uint16x4_t = simd_shuffle!(b, b, [4, 5, 6, 7]);
@@ -26647,7 +26647,7 @@ pub fn vsubw_high_u16(a: uint32x4_t, b: uint16x8_t) -> uint32x4_t {
2664726647
#[inline]
2664826648
#[target_feature(enable = "neon")]
2664926649
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
26650-
#[cfg_attr(test, assert_instr(usubw))]
26650+
#[cfg_attr(test, assert_instr(usubw2))]
2665126651
pub fn vsubw_high_u32(a: uint64x2_t, b: uint32x4_t) -> uint64x2_t {
2665226652
unsafe {
2665326653
let c: uint32x2_t = simd_shuffle!(b, b, [2, 3]);

0 commit comments

Comments
 (0)