Skip to content

Commit f274f8f

Browse files
rust-bors[bot]rust-bors[bot]
authored
Auto merge of #146578 - RalfJung:avx512-no-legacy, r=<try>
[crater experiment] avx512: remove rustc_legacy_const_generics
2 parents d1ed52b + 2e45fa5 commit f274f8f

File tree

7 files changed

+1322
-1345
lines changed

7 files changed

+1322
-1345
lines changed

‎library/stdarch/crates/core_arch/src/x86/avx512bw.rs‎

Lines changed: 81 additions & 81 deletions
Large diffs are not rendered by default.

‎library/stdarch/crates/core_arch/src/x86/avx512dq.rs‎

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

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

Lines changed: 733 additions & 733 deletions
Large diffs are not rendered by default.

‎library/stdarch/crates/core_arch/src/x86/avx512fp16.rs‎

Lines changed: 294 additions & 294 deletions
Large diffs are not rendered by default.

‎library/stdarch/crates/core_arch/src/x86/avx512vbmi2.rs‎

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

‎library/stdarch/crates/core_arch/src/x86_64/avx512f.rs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ pub fn _mm_cvttss_u64(a: __m128) -> u64 {
163163
#[target_feature(enable = "avx512f")]
164164
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
165165
#[cfg_attr(test, assert_instr(vcvtsi2sd, ROUNDING = 8))]
166-
#[rustc_legacy_const_generics(2)]
167166
pub fn _mm_cvt_roundi64_sd<const ROUNDING: i32>(a: __m128d, b: i64) -> __m128d {
168167
unsafe {
169168
static_assert_rounding!(ROUNDING);
@@ -186,7 +185,6 @@ pub fn _mm_cvt_roundi64_sd<const ROUNDING: i32>(a: __m128d, b: i64) -> __m128d {
186185
#[target_feature(enable = "avx512f")]
187186
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
188187
#[cfg_attr(test, assert_instr(vcvtsi2sd, ROUNDING = 8))]
189-
#[rustc_legacy_const_generics(2)]
190188
pub fn _mm_cvt_roundsi64_sd<const ROUNDING: i32>(a: __m128d, b: i64) -> __m128d {
191189
unsafe {
192190
static_assert_rounding!(ROUNDING);
@@ -209,7 +207,6 @@ pub fn _mm_cvt_roundsi64_sd<const ROUNDING: i32>(a: __m128d, b: i64) -> __m128d
209207
#[target_feature(enable = "avx512f")]
210208
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
211209
#[cfg_attr(test, assert_instr(vcvtsi2ss, ROUNDING = 8))]
212-
#[rustc_legacy_const_generics(2)]
213210
pub fn _mm_cvt_roundi64_ss<const ROUNDING: i32>(a: __m128, b: i64) -> __m128 {
214211
unsafe {
215212
static_assert_rounding!(ROUNDING);
@@ -232,7 +229,6 @@ pub fn _mm_cvt_roundi64_ss<const ROUNDING: i32>(a: __m128, b: i64) -> __m128 {
232229
#[target_feature(enable = "avx512f")]
233230
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
234231
#[cfg_attr(test, assert_instr(vcvtusi2sd, ROUNDING = 8))]
235-
#[rustc_legacy_const_generics(2)]
236232
pub fn _mm_cvt_roundu64_sd<const ROUNDING: i32>(a: __m128d, b: u64) -> __m128d {
237233
unsafe {
238234
static_assert_rounding!(ROUNDING);
@@ -255,7 +251,6 @@ pub fn _mm_cvt_roundu64_sd<const ROUNDING: i32>(a: __m128d, b: u64) -> __m128d {
255251
#[target_feature(enable = "avx512f")]
256252
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
257253
#[cfg_attr(test, assert_instr(vcvtsi2ss, ROUNDING = 8))]
258-
#[rustc_legacy_const_generics(2)]
259254
pub fn _mm_cvt_roundsi64_ss<const ROUNDING: i32>(a: __m128, b: i64) -> __m128 {
260255
unsafe {
261256
static_assert_rounding!(ROUNDING);
@@ -278,7 +273,6 @@ pub fn _mm_cvt_roundsi64_ss<const ROUNDING: i32>(a: __m128, b: i64) -> __m128 {
278273
#[target_feature(enable = "avx512f")]
279274
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
280275
#[cfg_attr(test, assert_instr(vcvtusi2ss, ROUNDING = 8))]
281-
#[rustc_legacy_const_generics(2)]
282276
pub fn _mm_cvt_roundu64_ss<const ROUNDING: i32>(a: __m128, b: u64) -> __m128 {
283277
unsafe {
284278
static_assert_rounding!(ROUNDING);
@@ -301,7 +295,6 @@ pub fn _mm_cvt_roundu64_ss<const ROUNDING: i32>(a: __m128, b: u64) -> __m128 {
301295
#[target_feature(enable = "avx512f")]
302296
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
303297
#[cfg_attr(test, assert_instr(vcvtsd2si, ROUNDING = 8))]
304-
#[rustc_legacy_const_generics(1)]
305298
pub fn _mm_cvt_roundsd_si64<const ROUNDING: i32>(a: __m128d) -> i64 {
306299
unsafe {
307300
static_assert_rounding!(ROUNDING);
@@ -323,7 +316,6 @@ pub fn _mm_cvt_roundsd_si64<const ROUNDING: i32>(a: __m128d) -> i64 {
323316
#[target_feature(enable = "avx512f")]
324317
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
325318
#[cfg_attr(test, assert_instr(vcvtsd2si, ROUNDING = 8))]
326-
#[rustc_legacy_const_generics(1)]
327319
pub fn _mm_cvt_roundsd_i64<const ROUNDING: i32>(a: __m128d) -> i64 {
328320
unsafe {
329321
static_assert_rounding!(ROUNDING);
@@ -345,7 +337,6 @@ pub fn _mm_cvt_roundsd_i64<const ROUNDING: i32>(a: __m128d) -> i64 {
345337
#[target_feature(enable = "avx512f")]
346338
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
347339
#[cfg_attr(test, assert_instr(vcvtsd2usi, ROUNDING = 8))]
348-
#[rustc_legacy_const_generics(1)]
349340
pub fn _mm_cvt_roundsd_u64<const ROUNDING: i32>(a: __m128d) -> u64 {
350341
unsafe {
351342
static_assert_rounding!(ROUNDING);
@@ -367,7 +358,6 @@ pub fn _mm_cvt_roundsd_u64<const ROUNDING: i32>(a: __m128d) -> u64 {
367358
#[target_feature(enable = "avx512f")]
368359
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
369360
#[cfg_attr(test, assert_instr(vcvtss2si, ROUNDING = 8))]
370-
#[rustc_legacy_const_generics(1)]
371361
pub fn _mm_cvt_roundss_si64<const ROUNDING: i32>(a: __m128) -> i64 {
372362
unsafe {
373363
static_assert_rounding!(ROUNDING);
@@ -389,7 +379,6 @@ pub fn _mm_cvt_roundss_si64<const ROUNDING: i32>(a: __m128) -> i64 {
389379
#[target_feature(enable = "avx512f")]
390380
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
391381
#[cfg_attr(test, assert_instr(vcvtss2si, ROUNDING = 8))]
392-
#[rustc_legacy_const_generics(1)]
393382
pub fn _mm_cvt_roundss_i64<const ROUNDING: i32>(a: __m128) -> i64 {
394383
unsafe {
395384
static_assert_rounding!(ROUNDING);
@@ -411,7 +400,6 @@ pub fn _mm_cvt_roundss_i64<const ROUNDING: i32>(a: __m128) -> i64 {
411400
#[target_feature(enable = "avx512f")]
412401
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
413402
#[cfg_attr(test, assert_instr(vcvtss2usi, ROUNDING = 8))]
414-
#[rustc_legacy_const_generics(1)]
415403
pub fn _mm_cvt_roundss_u64<const ROUNDING: i32>(a: __m128) -> u64 {
416404
unsafe {
417405
static_assert_rounding!(ROUNDING);
@@ -428,7 +416,6 @@ pub fn _mm_cvt_roundss_u64<const ROUNDING: i32>(a: __m128) -> u64 {
428416
#[target_feature(enable = "avx512f")]
429417
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
430418
#[cfg_attr(test, assert_instr(vcvttsd2si, SAE = 8))]
431-
#[rustc_legacy_const_generics(1)]
432419
pub fn _mm_cvtt_roundsd_si64<const SAE: i32>(a: __m128d) -> i64 {
433420
unsafe {
434421
static_assert_sae!(SAE);
@@ -445,7 +432,6 @@ pub fn _mm_cvtt_roundsd_si64<const SAE: i32>(a: __m128d) -> i64 {
445432
#[target_feature(enable = "avx512f")]
446433
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
447434
#[cfg_attr(test, assert_instr(vcvttsd2si, SAE = 8))]
448-
#[rustc_legacy_const_generics(1)]
449435
pub fn _mm_cvtt_roundsd_i64<const SAE: i32>(a: __m128d) -> i64 {
450436
unsafe {
451437
static_assert_sae!(SAE);
@@ -462,7 +448,6 @@ pub fn _mm_cvtt_roundsd_i64<const SAE: i32>(a: __m128d) -> i64 {
462448
#[target_feature(enable = "avx512f")]
463449
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
464450
#[cfg_attr(test, assert_instr(vcvttsd2usi, SAE = 8))]
465-
#[rustc_legacy_const_generics(1)]
466451
pub fn _mm_cvtt_roundsd_u64<const SAE: i32>(a: __m128d) -> u64 {
467452
unsafe {
468453
static_assert_sae!(SAE);
@@ -479,7 +464,6 @@ pub fn _mm_cvtt_roundsd_u64<const SAE: i32>(a: __m128d) -> u64 {
479464
#[target_feature(enable = "avx512f")]
480465
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
481466
#[cfg_attr(test, assert_instr(vcvttss2si, SAE = 8))]
482-
#[rustc_legacy_const_generics(1)]
483467
pub fn _mm_cvtt_roundss_i64<const SAE: i32>(a: __m128) -> i64 {
484468
unsafe {
485469
static_assert_sae!(SAE);
@@ -496,7 +480,6 @@ pub fn _mm_cvtt_roundss_i64<const SAE: i32>(a: __m128) -> i64 {
496480
#[target_feature(enable = "avx512f")]
497481
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
498482
#[cfg_attr(test, assert_instr(vcvttss2si, SAE = 8))]
499-
#[rustc_legacy_const_generics(1)]
500483
pub fn _mm_cvtt_roundss_si64<const SAE: i32>(a: __m128) -> i64 {
501484
unsafe {
502485
static_assert_sae!(SAE);
@@ -513,7 +496,6 @@ pub fn _mm_cvtt_roundss_si64<const SAE: i32>(a: __m128) -> i64 {
513496
#[target_feature(enable = "avx512f")]
514497
#[stable(feature = "stdarch_x86_avx512", since = "1.89")]
515498
#[cfg_attr(test, assert_instr(vcvttss2usi, SAE = 8))]
516-
#[rustc_legacy_const_generics(1)]
517499
pub fn _mm_cvtt_roundss_u64<const SAE: i32>(a: __m128) -> u64 {
518500
unsafe {
519501
static_assert_sae!(SAE);

‎library/stdarch/crates/core_arch/src/x86_64/avx512fp16.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ pub fn _mm_cvtu64_sh(a: __m128h, b: u64) -> __m128h {
6969
#[inline]
7070
#[target_feature(enable = "avx512fp16")]
7171
#[cfg_attr(test, assert_instr(vcvtusi2sh, ROUNDING = 8))]
72-
#[rustc_legacy_const_generics(2)]
7372
#[unstable(feature = "stdarch_x86_avx512_f16", issue = "127213")]
7473
pub fn _mm_cvt_roundu64_sh<const ROUNDING: i32>(a: __m128h, b: u64) -> __m128h {
7574
unsafe {
@@ -105,7 +104,6 @@ pub fn _mm_cvtsh_i64(a: __m128h) -> i64 {
105104
#[inline]
106105
#[target_feature(enable = "avx512fp16")]
107106
#[cfg_attr(test, assert_instr(vcvtsh2si, ROUNDING = 8))]
108-
#[rustc_legacy_const_generics(1)]
109107
#[unstable(feature = "stdarch_x86_avx512_f16", issue = "127213")]
110108
pub fn _mm_cvt_roundsh_i64<const ROUNDING: i32>(a: __m128h) -> i64 {
111109
unsafe {
@@ -141,7 +139,6 @@ pub fn _mm_cvtsh_u64(a: __m128h) -> u64 {
141139
#[inline]
142140
#[target_feature(enable = "avx512fp16")]
143141
#[cfg_attr(test, assert_instr(vcvtsh2usi, ROUNDING = 8))]
144-
#[rustc_legacy_const_generics(1)]
145142
#[unstable(feature = "stdarch_x86_avx512_f16", issue = "127213")]
146143
pub fn _mm_cvt_roundsh_u64<const ROUNDING: i32>(a: __m128h) -> u64 {
147144
unsafe {
@@ -171,7 +168,6 @@ pub fn _mm_cvttsh_i64(a: __m128h) -> i64 {
171168
#[inline]
172169
#[target_feature(enable = "avx512fp16")]
173170
#[cfg_attr(test, assert_instr(vcvttsh2si, SAE = 8))]
174-
#[rustc_legacy_const_generics(1)]
175171
#[unstable(feature = "stdarch_x86_avx512_f16", issue = "127213")]
176172
pub fn _mm_cvtt_roundsh_i64<const SAE: i32>(a: __m128h) -> i64 {
177173
unsafe {
@@ -201,7 +197,6 @@ pub fn _mm_cvttsh_u64(a: __m128h) -> u64 {
201197
#[inline]
202198
#[target_feature(enable = "avx512fp16")]
203199
#[cfg_attr(test, assert_instr(vcvttsh2usi, SAE = 8))]
204-
#[rustc_legacy_const_generics(1)]
205200
#[unstable(feature = "stdarch_x86_avx512_f16", issue = "127213")]
206201
pub fn _mm_cvtt_roundsh_u64<const SAE: i32>(a: __m128h) -> u64 {
207202
unsafe {

0 commit comments

Comments
 (0)