Skip to content

Commit 258f489

Browse files
sayantnsayantn
committed
Upgraded disassembly to include windows-gnu targets
1 parent 150aada commit 258f489

File tree

10 files changed

+97
-133
lines changed

10 files changed

+97
-133
lines changed

‎crates/core_arch/src/x86/avx.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ pub unsafe fn _mm256_cvttps_epi32(a: __m256) -> __m256i {
943943
#[inline]
944944
#[target_feature(enable = "avx")]
945945
#[cfg_attr(
946-
all(test, not(target_os = "windows")),
946+
all(test, not(target_env = "msvc")),
947947
assert_instr(vextractf128, IMM1 = 1)
948948
)]
949949
#[rustc_legacy_const_generics(1)]
@@ -964,7 +964,7 @@ pub unsafe fn _mm256_extractf128_ps<const IMM1: i32>(a: __m256) -> __m128 {
964964
#[inline]
965965
#[target_feature(enable = "avx")]
966966
#[cfg_attr(
967-
all(test, not(target_os = "windows")),
967+
all(test, not(target_env = "msvc")),
968968
assert_instr(vextractf128, IMM1 = 1)
969969
)]
970970
#[rustc_legacy_const_generics(1)]
@@ -980,7 +980,7 @@ pub unsafe fn _mm256_extractf128_pd<const IMM1: i32>(a: __m256d) -> __m128d {
980980
#[inline]
981981
#[target_feature(enable = "avx")]
982982
#[cfg_attr(
983-
all(test, not(target_os = "windows")),
983+
all(test, not(target_env = "msvc")),
984984
assert_instr(vextractf128, IMM1 = 1)
985985
)]
986986
#[rustc_legacy_const_generics(1)]
@@ -1270,7 +1270,7 @@ pub unsafe fn _mm256_broadcast_pd(a: &__m128d) -> __m256d {
12701270
#[inline]
12711271
#[target_feature(enable = "avx")]
12721272
#[cfg_attr(
1273-
all(test, not(target_os = "windows")),
1273+
all(test, not(target_env = "msvc")),
12741274
assert_instr(vinsertf128, IMM1 = 1)
12751275
)]
12761276
#[rustc_legacy_const_generics(2)]
@@ -1292,7 +1292,7 @@ pub unsafe fn _mm256_insertf128_ps<const IMM1: i32>(a: __m256, b: __m128) -> __m
12921292
#[inline]
12931293
#[target_feature(enable = "avx")]
12941294
#[cfg_attr(
1295-
all(test, not(target_os = "windows")),
1295+
all(test, not(target_env = "msvc")),
12961296
assert_instr(vinsertf128, IMM1 = 1)
12971297
)]
12981298
#[rustc_legacy_const_generics(2)]
@@ -1313,7 +1313,7 @@ pub unsafe fn _mm256_insertf128_pd<const IMM1: i32>(a: __m256d, b: __m128d) -> _
13131313
#[inline]
13141314
#[target_feature(enable = "avx")]
13151315
#[cfg_attr(
1316-
all(test, not(target_os = "windows")),
1316+
all(test, not(target_env = "msvc")),
13171317
assert_instr(vinsertf128, IMM1 = 1)
13181318
)]
13191319
#[rustc_legacy_const_generics(2)]

‎crates/core_arch/src/x86/avx2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ pub unsafe fn _mm256_cvtepu8_epi64(a: __m128i) -> __m256i {
896896
#[inline]
897897
#[target_feature(enable = "avx2")]
898898
#[cfg_attr(
899-
all(test, not(target_os = "windows")),
899+
all(test, not(target_env = "msvc")),
900900
assert_instr(vextractf128, IMM1 = 1)
901901
)]
902902
#[rustc_legacy_const_generics(1)]
@@ -1718,7 +1718,7 @@ pub unsafe fn _mm256_mask_i64gather_pd<const SCALE: i32>(
17181718
#[inline]
17191719
#[target_feature(enable = "avx2")]
17201720
#[cfg_attr(
1721-
all(test, not(target_os = "windows")),
1721+
all(test, not(target_env = "msvc")),
17221722
assert_instr(vinsertf128, IMM1 = 1)
17231723
)]
17241724
#[rustc_legacy_const_generics(2)]

‎crates/core_arch/src/x86/avx512f.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23499,7 +23499,7 @@ pub unsafe fn _mm256_maskz_shuffle_f64x2<const MASK: i32>(
2349923499
#[target_feature(enable = "avx512f")]
2350023500
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2350123501
#[cfg_attr(
23502-
all(test, not(target_os = "windows")),
23502+
all(test, not(target_env = "msvc")),
2350323503
assert_instr(vextractf32x4, IMM8 = 3)
2350423504
)]
2350523505
#[rustc_legacy_const_generics(1)]
@@ -23520,7 +23520,7 @@ pub unsafe fn _mm512_extractf32x4_ps<const IMM8: i32>(a: __m512) -> __m128 {
2352023520
#[target_feature(enable = "avx512f")]
2352123521
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2352223522
#[cfg_attr(
23523-
all(test, not(target_os = "windows")),
23523+
all(test, not(target_env = "msvc")),
2352423524
assert_instr(vextractf32x4, IMM8 = 3)
2352523525
)]
2352623526
#[rustc_legacy_const_generics(3)]
@@ -23541,7 +23541,7 @@ pub unsafe fn _mm512_mask_extractf32x4_ps<const IMM8: i32>(
2354123541
#[target_feature(enable = "avx512f")]
2354223542
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2354323543
#[cfg_attr(
23544-
all(test, not(target_os = "windows")),
23544+
all(test, not(target_env = "msvc")),
2354523545
assert_instr(vextractf32x4, IMM8 = 3)
2354623546
)]
2354723547
#[rustc_legacy_const_generics(2)]
@@ -23559,7 +23559,7 @@ pub unsafe fn _mm512_maskz_extractf32x4_ps<const IMM8: i32>(k: __mmask8, a: __m5
2355923559
#[target_feature(enable = "avx512f,avx512vl")]
2356023560
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2356123561
#[cfg_attr(
23562-
all(test, not(target_os = "windows")),
23562+
all(test, not(target_env = "msvc")),
2356323563
assert_instr(vextract, IMM8 = 1) //should be vextractf32x4
2356423564
)]
2356523565
#[rustc_legacy_const_generics(1)]
@@ -23578,7 +23578,7 @@ pub unsafe fn _mm256_extractf32x4_ps<const IMM8: i32>(a: __m256) -> __m128 {
2357823578
#[target_feature(enable = "avx512f,avx512vl")]
2357923579
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2358023580
#[cfg_attr(
23581-
all(test, not(target_os = "windows")),
23581+
all(test, not(target_env = "msvc")),
2358223582
assert_instr(vextractf32x4, IMM8 = 1)
2358323583
)]
2358423584
#[rustc_legacy_const_generics(3)]
@@ -23599,7 +23599,7 @@ pub unsafe fn _mm256_mask_extractf32x4_ps<const IMM8: i32>(
2359923599
#[target_feature(enable = "avx512f,avx512vl")]
2360023600
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2360123601
#[cfg_attr(
23602-
all(test, not(target_os = "windows")),
23602+
all(test, not(target_env = "msvc")),
2360323603
assert_instr(vextractf32x4, IMM8 = 1)
2360423604
)]
2360523605
#[rustc_legacy_const_generics(2)]
@@ -23617,7 +23617,7 @@ pub unsafe fn _mm256_maskz_extractf32x4_ps<const IMM8: i32>(k: __mmask8, a: __m2
2361723617
#[target_feature(enable = "avx512f")]
2361823618
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2361923619
#[cfg_attr(
23620-
all(test, not(target_os = "windows")),
23620+
all(test, not(target_env = "msvc")),
2362123621
assert_instr(vextractf64x4, IMM1 = 1) //should be vextracti64x4
2362223622
)]
2362323623
#[rustc_legacy_const_generics(1)]
@@ -23636,7 +23636,7 @@ pub unsafe fn _mm512_extracti64x4_epi64<const IMM1: i32>(a: __m512i) -> __m256i
2363623636
#[target_feature(enable = "avx512f")]
2363723637
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2363823638
#[cfg_attr(
23639-
all(test, not(target_os = "windows")),
23639+
all(test, not(target_env = "msvc")),
2364023640
assert_instr(vextracti64x4, IMM1 = 1)
2364123641
)]
2364223642
#[rustc_legacy_const_generics(3)]
@@ -23657,7 +23657,7 @@ pub unsafe fn _mm512_mask_extracti64x4_epi64<const IMM1: i32>(
2365723657
#[target_feature(enable = "avx512f")]
2365823658
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2365923659
#[cfg_attr(
23660-
all(test, not(target_os = "windows")),
23660+
all(test, not(target_env = "msvc")),
2366123661
assert_instr(vextracti64x4, IMM1 = 1)
2366223662
)]
2366323663
#[rustc_legacy_const_generics(2)]
@@ -23675,7 +23675,7 @@ pub unsafe fn _mm512_maskz_extracti64x4_epi64<const IMM1: i32>(k: __mmask8, a: _
2367523675
#[target_feature(enable = "avx512f")]
2367623676
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2367723677
#[cfg_attr(
23678-
all(test, not(target_os = "windows")),
23678+
all(test, not(target_env = "msvc")),
2367923679
assert_instr(vextractf64x4, IMM8 = 1)
2368023680
)]
2368123681
#[rustc_legacy_const_generics(1)]
@@ -23694,7 +23694,7 @@ pub unsafe fn _mm512_extractf64x4_pd<const IMM8: i32>(a: __m512d) -> __m256d {
2369423694
#[target_feature(enable = "avx512f")]
2369523695
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2369623696
#[cfg_attr(
23697-
all(test, not(target_os = "windows")),
23697+
all(test, not(target_env = "msvc")),
2369823698
assert_instr(vextractf64x4, IMM8 = 1)
2369923699
)]
2370023700
#[rustc_legacy_const_generics(3)]
@@ -23715,7 +23715,7 @@ pub unsafe fn _mm512_mask_extractf64x4_pd<const IMM8: i32>(
2371523715
#[target_feature(enable = "avx512f")]
2371623716
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2371723717
#[cfg_attr(
23718-
all(test, not(target_os = "windows")),
23718+
all(test, not(target_env = "msvc")),
2371923719
assert_instr(vextractf64x4, IMM8 = 1)
2372023720
)]
2372123721
#[rustc_legacy_const_generics(2)]
@@ -23733,7 +23733,7 @@ pub unsafe fn _mm512_maskz_extractf64x4_pd<const IMM8: i32>(k: __mmask8, a: __m5
2373323733
#[target_feature(enable = "avx512f")]
2373423734
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2373523735
#[cfg_attr(
23736-
all(test, not(target_os = "windows")),
23736+
all(test, not(target_env = "msvc")),
2373723737
assert_instr(vextractf32x4, IMM2 = 3) //should be vextracti32x4
2373823738
)]
2373923739
#[rustc_legacy_const_generics(1)]
@@ -23757,7 +23757,7 @@ pub unsafe fn _mm512_extracti32x4_epi32<const IMM2: i32>(a: __m512i) -> __m128i
2375723757
#[target_feature(enable = "avx512f")]
2375823758
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2375923759
#[cfg_attr(
23760-
all(test, not(target_os = "windows")),
23760+
all(test, not(target_env = "msvc")),
2376123761
assert_instr(vextracti32x4, IMM2 = 3)
2376223762
)]
2376323763
#[rustc_legacy_const_generics(3)]
@@ -23778,7 +23778,7 @@ pub unsafe fn _mm512_mask_extracti32x4_epi32<const IMM2: i32>(
2377823778
#[target_feature(enable = "avx512f")]
2377923779
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2378023780
#[cfg_attr(
23781-
all(test, not(target_os = "windows")),
23781+
all(test, not(target_env = "msvc")),
2378223782
assert_instr(vextracti32x4, IMM2 = 3)
2378323783
)]
2378423784
#[rustc_legacy_const_generics(2)]
@@ -23796,7 +23796,7 @@ pub unsafe fn _mm512_maskz_extracti32x4_epi32<const IMM2: i32>(k: __mmask8, a: _
2379623796
#[target_feature(enable = "avx512f,avx512vl")]
2379723797
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2379823798
#[cfg_attr(
23799-
all(test, not(target_os = "windows")),
23799+
all(test, not(target_env = "msvc")),
2380023800
assert_instr(vextract, IMM1 = 1) //should be vextracti32x4
2380123801
)]
2380223802
#[rustc_legacy_const_generics(1)]
@@ -23818,7 +23818,7 @@ pub unsafe fn _mm256_extracti32x4_epi32<const IMM1: i32>(a: __m256i) -> __m128i
2381823818
#[target_feature(enable = "avx512f,avx512vl")]
2381923819
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2382023820
#[cfg_attr(
23821-
all(test, not(target_os = "windows")),
23821+
all(test, not(target_env = "msvc")),
2382223822
assert_instr(vextracti32x4, IMM1 = 1)
2382323823
)]
2382423824
#[rustc_legacy_const_generics(3)]
@@ -23839,7 +23839,7 @@ pub unsafe fn _mm256_mask_extracti32x4_epi32<const IMM1: i32>(
2383923839
#[target_feature(enable = "avx512f,avx512vl")]
2384023840
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2384123841
#[cfg_attr(
23842-
all(test, not(target_os = "windows")),
23842+
all(test, not(target_env = "msvc")),
2384323843
assert_instr(vextracti32x4, IMM1 = 1)
2384423844
)]
2384523845
#[rustc_legacy_const_generics(2)]
@@ -24189,7 +24189,7 @@ pub unsafe fn _mm512_maskz_inserti32x4<const IMM8: i32>(
2418924189
#[target_feature(enable = "avx512f,avx512vl")]
2419024190
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2419124191
#[cfg_attr(
24192-
all(test, not(target_os = "windows")),
24192+
all(test, not(target_env = "msvc")),
2419324193
assert_instr(vinsert, IMM8 = 1) //should be vinserti32x4
2419424194
)]
2419524195
#[rustc_legacy_const_generics(2)]
@@ -24211,7 +24211,7 @@ pub unsafe fn _mm256_inserti32x4<const IMM8: i32>(a: __m256i, b: __m128i) -> __m
2421124211
#[target_feature(enable = "avx512f,avx512vl")]
2421224212
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2421324213
#[cfg_attr(
24214-
all(test, not(target_os = "windows")),
24214+
all(test, not(target_env = "msvc")),
2421524215
assert_instr(vinserti32x4, IMM8 = 1)
2421624216
)]
2421724217
#[rustc_legacy_const_generics(4)]
@@ -24233,7 +24233,7 @@ pub unsafe fn _mm256_mask_inserti32x4<const IMM8: i32>(
2423324233
#[target_feature(enable = "avx512f,avx512vl")]
2423424234
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2423524235
#[cfg_attr(
24236-
all(test, not(target_os = "windows")),
24236+
all(test, not(target_env = "msvc")),
2423724237
assert_instr(vinserti32x4, IMM8 = 1)
2423824238
)]
2423924239
#[rustc_legacy_const_generics(3)]
@@ -24379,7 +24379,7 @@ pub unsafe fn _mm512_maskz_insertf32x4<const IMM8: i32>(
2437924379
#[target_feature(enable = "avx512f,avx512vl")]
2438024380
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2438124381
#[cfg_attr(
24382-
all(test, not(target_os = "windows")),
24382+
all(test, not(target_env = "msvc")),
2438324383
assert_instr(vinsert, IMM8 = 1) //should be vinsertf32x4
2438424384
)]
2438524385
#[rustc_legacy_const_generics(2)]
@@ -24399,7 +24399,7 @@ pub unsafe fn _mm256_insertf32x4<const IMM8: i32>(a: __m256, b: __m128) -> __m25
2439924399
#[target_feature(enable = "avx512f,avx512vl")]
2440024400
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2440124401
#[cfg_attr(
24402-
all(test, not(target_os = "windows")),
24402+
all(test, not(target_env = "msvc")),
2440324403
assert_instr(vinsertf32x4, IMM8 = 1)
2440424404
)]
2440524405
#[rustc_legacy_const_generics(4)]
@@ -24421,7 +24421,7 @@ pub unsafe fn _mm256_mask_insertf32x4<const IMM8: i32>(
2442124421
#[target_feature(enable = "avx512f,avx512vl")]
2442224422
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
2442324423
#[cfg_attr(
24424-
all(test, not(target_os = "windows")),
24424+
all(test, not(target_env = "msvc")),
2442524425
assert_instr(vinsertf32x4, IMM8 = 1)
2442624426
)]
2442724427
#[rustc_legacy_const_generics(3)]
@@ -25554,7 +25554,7 @@ pub unsafe fn _mm512_castsi512_pd(a: __m512i) -> __m512d {
2555425554
#[inline]
2555525555
#[target_feature(enable = "avx512f")]
2555625556
#[unstable(feature = "stdarch_x86_avx512", issue = "111137")]
25557-
#[cfg_attr(all(test, not(target_os = "windows")), assert_instr(vmovd))]
25557+
#[cfg_attr(all(test, not(target_env = "msvc")), assert_instr(vmovd))]
2555825558
pub unsafe fn _mm512_cvtsi512_si32(a: __m512i) -> i32 {
2555925559
let extract: i32 = simd_extract!(a.as_i32x16(), 0);
2556025560
extract

‎crates/core_arch/src/x86/pclmulqdq.rs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,23 @@ extern "C" {
2525
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_clmulepi64_si128)
2626
#[inline]
2727
#[target_feature(enable = "pclmulqdq")]
28-
#[cfg_attr(all(test, not(target_os = "linux")), assert_instr(pclmulqdq, IMM8 = 0))]
29-
#[cfg_attr(all(test, target_os = "linux"), assert_instr(pclmullqlqdq, IMM8 = 0))]
30-
#[cfg_attr(all(test, target_os = "linux"), assert_instr(pclmulhqlqdq, IMM8 = 1))]
31-
#[cfg_attr(all(test, target_os = "linux"), assert_instr(pclmullqhqdq, IMM8 = 16))]
32-
#[cfg_attr(all(test, target_os = "linux"), assert_instr(pclmulhqhqdq, IMM8 = 17))]
28+
#[cfg_attr(all(test, target_env = "msvc"), assert_instr(pclmulqdq, IMM8 = 0))]
29+
#[cfg_attr(
30+
all(test, not(target_env = "msvc")),
31+
assert_instr(pclmullqlqdq, IMM8 = 0)
32+
)]
33+
#[cfg_attr(
34+
all(test, not(target_env = "msvc")),
35+
assert_instr(pclmulhqlqdq, IMM8 = 1)
36+
)]
37+
#[cfg_attr(
38+
all(test, not(target_env = "msvc")),
39+
assert_instr(pclmullqhqdq, IMM8 = 16)
40+
)]
41+
#[cfg_attr(
42+
all(test, not(target_env = "msvc")),
43+
assert_instr(pclmulhqhqdq, IMM8 = 17)
44+
)]
3345
#[rustc_legacy_const_generics(2)]
3446
#[stable(feature = "simd_x86", since = "1.27.0")]
3547
pub unsafe fn _mm_clmulepi64_si128<const IMM8: i32>(a: __m128i, b: __m128i) -> __m128i {

0 commit comments

Comments
 (0)