Skip to content

Commit 6646334

Browse files
RalfJungRalfJung
committed
adjust tests and library
1 parent 74bd73a commit 6646334

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3731
-3731
lines changed

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

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

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub struct float64x2x4_t(
7474
#[inline]
7575
#[target_feature(enable = "neon")]
7676
#[cfg_attr(test, assert_instr(nop, N1 = 0, N2 = 0))]
77-
#[rustc_legacy_const_generics(1, 3)]
77+
#[rustc_deprecated_legacy_const_generics(1, 3)]
7878
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
7979
pub fn vcopy_lane_s64<const N1: i32, const N2: i32>(_a: int64x1_t, b: int64x1_t) -> int64x1_t {
8080
static_assert!(N1 == 0);
@@ -86,7 +86,7 @@ pub fn vcopy_lane_s64<const N1: i32, const N2: i32>(_a: int64x1_t, b: int64x1_t)
8686
#[inline]
8787
#[target_feature(enable = "neon")]
8888
#[cfg_attr(test, assert_instr(nop, N1 = 0, N2 = 0))]
89-
#[rustc_legacy_const_generics(1, 3)]
89+
#[rustc_deprecated_legacy_const_generics(1, 3)]
9090
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
9191
pub fn vcopy_lane_u64<const N1: i32, const N2: i32>(_a: uint64x1_t, b: uint64x1_t) -> uint64x1_t {
9292
static_assert!(N1 == 0);
@@ -98,7 +98,7 @@ pub fn vcopy_lane_u64<const N1: i32, const N2: i32>(_a: uint64x1_t, b: uint64x1_
9898
#[inline]
9999
#[target_feature(enable = "neon")]
100100
#[cfg_attr(test, assert_instr(nop, N1 = 0, N2 = 0))]
101-
#[rustc_legacy_const_generics(1, 3)]
101+
#[rustc_deprecated_legacy_const_generics(1, 3)]
102102
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
103103
pub fn vcopy_lane_p64<const N1: i32, const N2: i32>(_a: poly64x1_t, b: poly64x1_t) -> poly64x1_t {
104104
static_assert!(N1 == 0);
@@ -110,7 +110,7 @@ pub fn vcopy_lane_p64<const N1: i32, const N2: i32>(_a: poly64x1_t, b: poly64x1_
110110
#[inline]
111111
#[target_feature(enable = "neon")]
112112
#[cfg_attr(test, assert_instr(nop, N1 = 0, N2 = 0))]
113-
#[rustc_legacy_const_generics(1, 3)]
113+
#[rustc_deprecated_legacy_const_generics(1, 3)]
114114
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
115115
pub fn vcopy_lane_f64<const N1: i32, const N2: i32>(
116116
_a: float64x1_t,
@@ -125,7 +125,7 @@ pub fn vcopy_lane_f64<const N1: i32, const N2: i32>(
125125
#[inline]
126126
#[target_feature(enable = "neon")]
127127
#[cfg_attr(test, assert_instr(nop, LANE1 = 0, LANE2 = 1))]
128-
#[rustc_legacy_const_generics(1, 3)]
128+
#[rustc_deprecated_legacy_const_generics(1, 3)]
129129
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
130130
pub fn vcopy_laneq_s64<const LANE1: i32, const LANE2: i32>(
131131
_a: int64x1_t,
@@ -140,7 +140,7 @@ pub fn vcopy_laneq_s64<const LANE1: i32, const LANE2: i32>(
140140
#[inline]
141141
#[target_feature(enable = "neon")]
142142
#[cfg_attr(test, assert_instr(nop, LANE1 = 0, LANE2 = 1))]
143-
#[rustc_legacy_const_generics(1, 3)]
143+
#[rustc_deprecated_legacy_const_generics(1, 3)]
144144
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
145145
pub fn vcopy_laneq_u64<const LANE1: i32, const LANE2: i32>(
146146
_a: uint64x1_t,
@@ -155,7 +155,7 @@ pub fn vcopy_laneq_u64<const LANE1: i32, const LANE2: i32>(
155155
#[inline]
156156
#[target_feature(enable = "neon")]
157157
#[cfg_attr(test, assert_instr(nop, LANE1 = 0, LANE2 = 1))]
158-
#[rustc_legacy_const_generics(1, 3)]
158+
#[rustc_deprecated_legacy_const_generics(1, 3)]
159159
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
160160
pub fn vcopy_laneq_p64<const LANE1: i32, const LANE2: i32>(
161161
_a: poly64x1_t,
@@ -170,7 +170,7 @@ pub fn vcopy_laneq_p64<const LANE1: i32, const LANE2: i32>(
170170
#[inline]
171171
#[target_feature(enable = "neon")]
172172
#[cfg_attr(test, assert_instr(nop, LANE1 = 0, LANE2 = 1))]
173-
#[rustc_legacy_const_generics(1, 3)]
173+
#[rustc_deprecated_legacy_const_generics(1, 3)]
174174
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
175175
pub fn vcopy_laneq_f64<const LANE1: i32, const LANE2: i32>(
176176
_a: float64x1_t,
@@ -203,7 +203,7 @@ pub unsafe fn vld1q_dup_f64(ptr: *const f64) -> float64x2_t {
203203
/// Load one single-element structure to one lane of one register.
204204
#[inline]
205205
#[target_feature(enable = "neon")]
206-
#[rustc_legacy_const_generics(2)]
206+
#[rustc_deprecated_legacy_const_generics(2)]
207207
#[cfg_attr(test, assert_instr(ldr, LANE = 0))]
208208
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
209209
pub unsafe fn vld1_lane_f64<const LANE: i32>(ptr: *const f64, src: float64x1_t) -> float64x1_t {
@@ -214,7 +214,7 @@ pub unsafe fn vld1_lane_f64<const LANE: i32>(ptr: *const f64, src: float64x1_t)
214214
/// Load one single-element structure to one lane of one register.
215215
#[inline]
216216
#[target_feature(enable = "neon")]
217-
#[rustc_legacy_const_generics(2)]
217+
#[rustc_deprecated_legacy_const_generics(2)]
218218
#[cfg_attr(test, assert_instr(ld1, LANE = 1))]
219219
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
220220
pub unsafe fn vld1q_lane_f64<const LANE: i32>(ptr: *const f64, src: float64x2_t) -> float64x2_t {
@@ -329,7 +329,7 @@ pub fn vaddd_u64(a: u64, b: u64) -> u64 {
329329
#[inline]
330330
#[target_feature(enable = "neon")]
331331
#[cfg_attr(test, assert_instr(nop, N = 0))]
332-
#[rustc_legacy_const_generics(2)]
332+
#[rustc_deprecated_legacy_const_generics(2)]
333333
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
334334
pub fn vext_p64<const N: i32>(a: poly64x1_t, _b: poly64x1_t) -> poly64x1_t {
335335
static_assert!(N == 0);
@@ -340,7 +340,7 @@ pub fn vext_p64<const N: i32>(a: poly64x1_t, _b: poly64x1_t) -> poly64x1_t {
340340
#[inline]
341341
#[target_feature(enable = "neon")]
342342
#[cfg_attr(test, assert_instr(nop, N = 0))]
343-
#[rustc_legacy_const_generics(2)]
343+
#[rustc_deprecated_legacy_const_generics(2)]
344344
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
345345
pub fn vext_f64<const N: i32>(a: float64x1_t, _b: float64x1_t) -> float64x1_t {
346346
static_assert!(N == 0);
@@ -458,7 +458,7 @@ pub fn vget_low_p64(a: poly64x2_t) -> poly64x1_t {
458458
/// Duplicate vector element to vector or scalar
459459
#[inline]
460460
#[target_feature(enable = "neon")]
461-
#[rustc_legacy_const_generics(1)]
461+
#[rustc_deprecated_legacy_const_generics(1)]
462462
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
463463
#[cfg_attr(
464464
all(test, any(target_arch = "aarch64", target_arch = "arm64ec")),
@@ -472,7 +472,7 @@ pub fn vget_lane_f64<const IMM5: i32>(v: float64x1_t) -> f64 {
472472
/// Duplicate vector element to vector or scalar
473473
#[inline]
474474
#[target_feature(enable = "neon")]
475-
#[rustc_legacy_const_generics(1)]
475+
#[rustc_deprecated_legacy_const_generics(1)]
476476
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
477477
#[cfg_attr(
478478
all(test, any(target_arch = "aarch64", target_arch = "arm64ec")),
@@ -496,7 +496,7 @@ pub fn vcombine_f64(low: float64x1_t, high: float64x1_t) -> float64x2_t {
496496
#[inline]
497497
#[target_feature(enable = "neon")]
498498
#[cfg_attr(test, assert_instr(nop, N = 2))]
499-
#[rustc_legacy_const_generics(1)]
499+
#[rustc_deprecated_legacy_const_generics(1)]
500500
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
501501
pub fn vshld_n_s64<const N: i32>(a: i64) -> i64 {
502502
static_assert_uimm_bits!(N, 6);
@@ -507,7 +507,7 @@ pub fn vshld_n_s64<const N: i32>(a: i64) -> i64 {
507507
#[inline]
508508
#[target_feature(enable = "neon")]
509509
#[cfg_attr(test, assert_instr(nop, N = 2))]
510-
#[rustc_legacy_const_generics(1)]
510+
#[rustc_deprecated_legacy_const_generics(1)]
511511
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
512512
pub fn vshld_n_u64<const N: i32>(a: u64) -> u64 {
513513
static_assert_uimm_bits!(N, 6);
@@ -518,7 +518,7 @@ pub fn vshld_n_u64<const N: i32>(a: u64) -> u64 {
518518
#[inline]
519519
#[target_feature(enable = "neon")]
520520
#[cfg_attr(test, assert_instr(nop, N = 2))]
521-
#[rustc_legacy_const_generics(1)]
521+
#[rustc_deprecated_legacy_const_generics(1)]
522522
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
523523
pub fn vshrd_n_s64<const N: i32>(a: i64) -> i64 {
524524
static_assert!(N >= 1 && N <= 64);
@@ -530,7 +530,7 @@ pub fn vshrd_n_s64<const N: i32>(a: i64) -> i64 {
530530
#[inline]
531531
#[target_feature(enable = "neon")]
532532
#[cfg_attr(test, assert_instr(nop, N = 2))]
533-
#[rustc_legacy_const_generics(1)]
533+
#[rustc_deprecated_legacy_const_generics(1)]
534534
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
535535
pub fn vshrd_n_u64<const N: i32>(a: u64) -> u64 {
536536
static_assert!(N >= 1 && N <= 64);
@@ -546,7 +546,7 @@ pub fn vshrd_n_u64<const N: i32>(a: u64) -> u64 {
546546
#[inline]
547547
#[target_feature(enable = "neon")]
548548
#[cfg_attr(test, assert_instr(nop, N = 2))]
549-
#[rustc_legacy_const_generics(2)]
549+
#[rustc_deprecated_legacy_const_generics(2)]
550550
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
551551
pub fn vsrad_n_s64<const N: i32>(a: i64, b: i64) -> i64 {
552552
static_assert!(N >= 1 && N <= 64);
@@ -557,7 +557,7 @@ pub fn vsrad_n_s64<const N: i32>(a: i64, b: i64) -> i64 {
557557
#[inline]
558558
#[target_feature(enable = "neon")]
559559
#[cfg_attr(test, assert_instr(nop, N = 2))]
560-
#[rustc_legacy_const_generics(2)]
560+
#[rustc_deprecated_legacy_const_generics(2)]
561561
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
562562
pub fn vsrad_n_u64<const N: i32>(a: u64, b: u64) -> u64 {
563563
static_assert!(N >= 1 && N <= 64);

‎library/stdarch/crates/core_arch/src/aarch64/prefetch.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pub const _PREFETCH_LOCALITY3: i32 = 3;
6969
#[cfg_attr(test, assert_instr("prfm pstl3keep", RW = _PREFETCH_WRITE, LOCALITY = _PREFETCH_LOCALITY1))]
7070
#[cfg_attr(test, assert_instr("prfm pstl2keep", RW = _PREFETCH_WRITE, LOCALITY = _PREFETCH_LOCALITY2))]
7171
#[cfg_attr(test, assert_instr("prfm pstl1keep", RW = _PREFETCH_WRITE, LOCALITY = _PREFETCH_LOCALITY3))]
72-
#[rustc_legacy_const_generics(1, 2)]
72+
#[rustc_deprecated_legacy_const_generics(1, 2)]
7373
#[unstable(feature = "stdarch_aarch64_prefetch", issue = "117217")]
7474
// FIXME: Replace this with the standard ACLE __pld/__pldx/__pli/__plix intrinsics
7575
pub unsafe fn _prefetch<const RW: i32, const LOCALITY: i32>(p: *const i8) {

‎library/stdarch/crates/core_arch/src/aarch64/tme.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pub unsafe fn __tcommit() {
114114
all(test, not(target_env = "msvc")),
115115
assert_instr(tcancel, IMM16 = 0x0)
116116
)]
117-
#[rustc_legacy_const_generics(0)]
117+
#[rustc_deprecated_legacy_const_generics(0)]
118118
#[unstable(feature = "stdarch_aarch64_tme", issue = "117216")]
119119
pub unsafe fn __tcancel<const IMM16: u64>() {
120120
static_assert!(IMM16 <= 65535);

‎library/stdarch/crates/core_arch/src/arm/neon.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ unsafe extern "unadjusted" {
2020
#[target_feature(enable = "neon,v7,aes")]
2121
#[unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800")]
2222
#[cfg_attr(all(test, target_arch = "arm"), assert_instr("vsli.64", N = 1))]
23-
#[rustc_legacy_const_generics(2)]
23+
#[rustc_deprecated_legacy_const_generics(2)]
2424
pub unsafe fn vsli_n_p64<const N: i32>(a: poly64x1_t, b: poly64x1_t) -> poly64x1_t {
2525
static_assert!(0 <= N && N <= 63);
2626
transmute(vshiftins_v1i64(
@@ -40,7 +40,7 @@ pub unsafe fn vsli_n_p64<const N: i32>(a: poly64x1_t, b: poly64x1_t) -> poly64x1
4040
#[target_feature(enable = "neon,v7,aes")]
4141
#[unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800")]
4242
#[cfg_attr(all(test, target_arch = "arm"), assert_instr("vsli.64", N = 1))]
43-
#[rustc_legacy_const_generics(2)]
43+
#[rustc_deprecated_legacy_const_generics(2)]
4444
pub unsafe fn vsliq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x2_t {
4545
static_assert!(0 <= N && N <= 63);
4646
transmute(vshiftins_v2i64(
@@ -60,7 +60,7 @@ pub unsafe fn vsliq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x
6060
#[target_feature(enable = "neon,v7,aes")]
6161
#[unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800")]
6262
#[cfg_attr(all(test, target_arch = "arm"), assert_instr("vsli.64", N = 1))]
63-
#[rustc_legacy_const_generics(2)]
63+
#[rustc_deprecated_legacy_const_generics(2)]
6464
pub unsafe fn vsliq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x2_t {
6565
static_assert!(0 <= N && N <= 63);
6666
let a: poly64x2_t = simd_shuffle!(a, a, [0, 1]);
@@ -82,7 +82,7 @@ pub unsafe fn vsliq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x
8282
#[target_feature(enable = "neon,v7,aes")]
8383
#[unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800")]
8484
#[cfg_attr(all(test, target_arch = "arm"), assert_instr("vsri.64", N = 1))]
85-
#[rustc_legacy_const_generics(2)]
85+
#[rustc_deprecated_legacy_const_generics(2)]
8686
pub unsafe fn vsri_n_p64<const N: i32>(a: poly64x1_t, b: poly64x1_t) -> poly64x1_t {
8787
static_assert!(1 <= N && N <= 64);
8888
transmute(vshiftins_v1i64(
@@ -102,7 +102,7 @@ pub unsafe fn vsri_n_p64<const N: i32>(a: poly64x1_t, b: poly64x1_t) -> poly64x1
102102
#[target_feature(enable = "neon,v7,aes")]
103103
#[unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800")]
104104
#[cfg_attr(all(test, target_arch = "arm"), assert_instr("vsri.64", N = 1))]
105-
#[rustc_legacy_const_generics(2)]
105+
#[rustc_deprecated_legacy_const_generics(2)]
106106
pub unsafe fn vsriq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x2_t {
107107
static_assert!(1 <= N && N <= 64);
108108
transmute(vshiftins_v2i64(
@@ -122,7 +122,7 @@ pub unsafe fn vsriq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x
122122
#[target_feature(enable = "neon,v7,aes")]
123123
#[unstable(feature = "stdarch_arm_neon_intrinsics", issue = "111800")]
124124
#[cfg_attr(all(test, target_arch = "arm"), assert_instr("vsri.64", N = 1))]
125-
#[rustc_legacy_const_generics(2)]
125+
#[rustc_deprecated_legacy_const_generics(2)]
126126
pub unsafe fn vsriq_n_p64<const N: i32>(a: poly64x2_t, b: poly64x2_t) -> poly64x2_t {
127127
static_assert!(1 <= N && N <= 64);
128128
let a: poly64x2_t = simd_shuffle!(a, a, [0, 1]);

‎library/stdarch/crates/core_arch/src/arm/sat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use stdarch_test::assert_instr;
1010
#[unstable(feature = "stdarch_arm_sat", issue = "none")]
1111
#[inline]
1212
#[cfg_attr(test, assert_instr("ssat", WIDTH = 8))]
13-
#[rustc_legacy_const_generics(1)]
13+
#[rustc_deprecated_legacy_const_generics(1)]
1414
pub unsafe fn __ssat<const WIDTH: u32>(x: i32) -> i32 {
1515
static_assert!(matches!(WIDTH, 1..=32));
1616
arm_ssat(x, WIDTH as i32)
@@ -21,7 +21,7 @@ pub unsafe fn __ssat<const WIDTH: u32>(x: i32) -> i32 {
2121
#[unstable(feature = "stdarch_arm_sat", issue = "none")]
2222
#[inline]
2323
#[cfg_attr(test, assert_instr("usat", WIDTH = 8))]
24-
#[rustc_legacy_const_generics(1)]
24+
#[rustc_deprecated_legacy_const_generics(1)]
2525
pub unsafe fn __usat<const WIDTH: u32>(x: i32) -> u32 {
2626
static_assert!(matches!(WIDTH, 1..=32));
2727
arm_usat(x, WIDTH as i32)

0 commit comments

Comments
 (0)