Skip to content

Commit 3357c0e

Browse files
AmanieuAmanieu
committed
Update stabilization version of certain x86 intrinsics to 1.89
These were left as `CURRENT_RUSTC_VERSION` in the submodule.
1 parent 5438ab1 commit 3357c0e

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ unsafe extern "unadjusted" {
127127
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_loadiwkey)
128128
#[inline]
129129
#[target_feature(enable = "kl")]
130-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
130+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
131131
#[cfg_attr(test, assert_instr(loadiwkey))]
132132
pub unsafe fn _mm_loadiwkey(
133133
control: u32,
@@ -153,7 +153,7 @@ pub unsafe fn _mm_loadiwkey(
153153
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_encodekey128_u32)
154154
#[inline]
155155
#[target_feature(enable = "kl")]
156-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
156+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
157157
#[cfg_attr(test, assert_instr(encodekey128))]
158158
pub unsafe fn _mm_encodekey128_u32(key_params: u32, key: __m128i, handle: *mut u8) -> u32 {
159159
let EncodeKey128Output(control, key0, key1, key2, _, _, _) = encodekey128(key_params, key);
@@ -176,7 +176,7 @@ pub unsafe fn _mm_encodekey128_u32(key_params: u32, key: __m128i, handle: *mut u
176176
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_encodekey256_u32)
177177
#[inline]
178178
#[target_feature(enable = "kl")]
179-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
179+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
180180
#[cfg_attr(test, assert_instr(encodekey256))]
181181
pub unsafe fn _mm_encodekey256_u32(
182182
key_params: u32,
@@ -198,7 +198,7 @@ pub unsafe fn _mm_encodekey256_u32(
198198
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesenc128kl_u8)
199199
#[inline]
200200
#[target_feature(enable = "kl")]
201-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
201+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
202202
#[cfg_attr(test, assert_instr(aesenc128kl))]
203203
pub unsafe fn _mm_aesenc128kl_u8(output: *mut __m128i, input: __m128i, handle: *const u8) -> u8 {
204204
let AesOutput(status, result) = aesenc128kl(input, handle);
@@ -214,7 +214,7 @@ pub unsafe fn _mm_aesenc128kl_u8(output: *mut __m128i, input: __m128i, handle: *
214214
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesdec128kl_u8)
215215
#[inline]
216216
#[target_feature(enable = "kl")]
217-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
217+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
218218
#[cfg_attr(test, assert_instr(aesdec128kl))]
219219
pub unsafe fn _mm_aesdec128kl_u8(output: *mut __m128i, input: __m128i, handle: *const u8) -> u8 {
220220
let AesOutput(status, result) = aesdec128kl(input, handle);
@@ -230,7 +230,7 @@ pub unsafe fn _mm_aesdec128kl_u8(output: *mut __m128i, input: __m128i, handle: *
230230
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesenc256kl_u8)
231231
#[inline]
232232
#[target_feature(enable = "kl")]
233-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
233+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
234234
#[cfg_attr(test, assert_instr(aesenc256kl))]
235235
pub unsafe fn _mm_aesenc256kl_u8(output: *mut __m128i, input: __m128i, handle: *const u8) -> u8 {
236236
let AesOutput(status, result) = aesenc256kl(input, handle);
@@ -246,7 +246,7 @@ pub unsafe fn _mm_aesenc256kl_u8(output: *mut __m128i, input: __m128i, handle: *
246246
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesdec256kl_u8)
247247
#[inline]
248248
#[target_feature(enable = "kl")]
249-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
249+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
250250
#[cfg_attr(test, assert_instr(aesdec256kl))]
251251
pub unsafe fn _mm_aesdec256kl_u8(output: *mut __m128i, input: __m128i, handle: *const u8) -> u8 {
252252
let AesOutput(status, result) = aesdec256kl(input, handle);
@@ -262,7 +262,7 @@ pub unsafe fn _mm_aesdec256kl_u8(output: *mut __m128i, input: __m128i, handle: *
262262
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesencwide128kl_u8)
263263
#[inline]
264264
#[target_feature(enable = "widekl")]
265-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
265+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
266266
#[cfg_attr(test, assert_instr(aesencwide128kl))]
267267
pub unsafe fn _mm_aesencwide128kl_u8(
268268
output: *mut __m128i,
@@ -285,7 +285,7 @@ pub unsafe fn _mm_aesencwide128kl_u8(
285285
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesdecwide128kl_u8)
286286
#[inline]
287287
#[target_feature(enable = "widekl")]
288-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
288+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
289289
#[cfg_attr(test, assert_instr(aesdecwide128kl))]
290290
pub unsafe fn _mm_aesdecwide128kl_u8(
291291
output: *mut __m128i,
@@ -308,7 +308,7 @@ pub unsafe fn _mm_aesdecwide128kl_u8(
308308
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesencwide256kl_u8)
309309
#[inline]
310310
#[target_feature(enable = "widekl")]
311-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
311+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
312312
#[cfg_attr(test, assert_instr(aesencwide256kl))]
313313
pub unsafe fn _mm_aesencwide256kl_u8(
314314
output: *mut __m128i,
@@ -331,7 +331,7 @@ pub unsafe fn _mm_aesencwide256kl_u8(
331331
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_aesdecwide256kl_u8)
332332
#[inline]
333333
#[target_feature(enable = "widekl")]
334-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
334+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
335335
#[cfg_attr(test, assert_instr(aesdecwide256kl))]
336336
pub unsafe fn _mm_aesdecwide256kl_u8(
337337
output: *mut __m128i,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,5 +772,5 @@ mod avx512fp16;
772772
pub use self::avx512fp16::*;
773773

774774
mod kl;
775-
#[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")]
775+
#[stable(feature = "keylocker_x86", since = "1.89.0")]
776776
pub use self::kl::*;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ pub fn _mm_sha256rnds2_epu32(a: __m128i, b: __m128i, k: __m128i) -> __m128i {
146146
#[inline]
147147
#[target_feature(enable = "sha512,avx")]
148148
#[cfg_attr(test, assert_instr(vsha512msg1))]
149-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
149+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
150150
pub fn _mm256_sha512msg1_epi64(a: __m256i, b: __m128i) -> __m256i {
151151
unsafe { transmute(vsha512msg1(a.as_i64x4(), b.as_i64x2())) }
152152
}
@@ -159,7 +159,7 @@ pub fn _mm256_sha512msg1_epi64(a: __m256i, b: __m128i) -> __m256i {
159159
#[inline]
160160
#[target_feature(enable = "sha512,avx")]
161161
#[cfg_attr(test, assert_instr(vsha512msg2))]
162-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
162+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
163163
pub fn _mm256_sha512msg2_epi64(a: __m256i, b: __m256i) -> __m256i {
164164
unsafe { transmute(vsha512msg2(a.as_i64x4(), b.as_i64x4())) }
165165
}
@@ -175,7 +175,7 @@ pub fn _mm256_sha512msg2_epi64(a: __m256i, b: __m256i) -> __m256i {
175175
#[inline]
176176
#[target_feature(enable = "sha512,avx")]
177177
#[cfg_attr(test, assert_instr(vsha512rnds2))]
178-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
178+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
179179
pub fn _mm256_sha512rnds2_epi64(a: __m256i, b: __m256i, k: __m128i) -> __m256i {
180180
unsafe { transmute(vsha512rnds2(a.as_i64x4(), b.as_i64x4(), k.as_i64x2())) }
181181
}
@@ -188,7 +188,7 @@ pub fn _mm256_sha512rnds2_epi64(a: __m256i, b: __m256i, k: __m128i) -> __m256i {
188188
#[inline]
189189
#[target_feature(enable = "sm3,avx")]
190190
#[cfg_attr(test, assert_instr(vsm3msg1))]
191-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
191+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
192192
pub fn _mm_sm3msg1_epi32(a: __m128i, b: __m128i, c: __m128i) -> __m128i {
193193
unsafe { transmute(vsm3msg1(a.as_i32x4(), b.as_i32x4(), c.as_i32x4())) }
194194
}
@@ -201,7 +201,7 @@ pub fn _mm_sm3msg1_epi32(a: __m128i, b: __m128i, c: __m128i) -> __m128i {
201201
#[inline]
202202
#[target_feature(enable = "sm3,avx")]
203203
#[cfg_attr(test, assert_instr(vsm3msg2))]
204-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
204+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
205205
pub fn _mm_sm3msg2_epi32(a: __m128i, b: __m128i, c: __m128i) -> __m128i {
206206
unsafe { transmute(vsm3msg2(a.as_i32x4(), b.as_i32x4(), c.as_i32x4())) }
207207
}
@@ -219,7 +219,7 @@ pub fn _mm_sm3msg2_epi32(a: __m128i, b: __m128i, c: __m128i) -> __m128i {
219219
#[target_feature(enable = "sm3,avx")]
220220
#[cfg_attr(test, assert_instr(vsm3rnds2, IMM8 = 0))]
221221
#[rustc_legacy_const_generics(3)]
222-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
222+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
223223
pub fn _mm_sm3rnds2_epi32<const IMM8: i32>(a: __m128i, b: __m128i, c: __m128i) -> __m128i {
224224
static_assert!(
225225
IMM8 == (IMM8 & 0x3e),
@@ -235,7 +235,7 @@ pub fn _mm_sm3rnds2_epi32<const IMM8: i32>(a: __m128i, b: __m128i, c: __m128i) -
235235
#[inline]
236236
#[target_feature(enable = "sm4,avx")]
237237
#[cfg_attr(test, assert_instr(vsm4key4))]
238-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
238+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
239239
pub fn _mm_sm4key4_epi32(a: __m128i, b: __m128i) -> __m128i {
240240
unsafe { transmute(vsm4key4128(a.as_i32x4(), b.as_i32x4())) }
241241
}
@@ -247,7 +247,7 @@ pub fn _mm_sm4key4_epi32(a: __m128i, b: __m128i) -> __m128i {
247247
#[inline]
248248
#[target_feature(enable = "sm4,avx")]
249249
#[cfg_attr(test, assert_instr(vsm4key4))]
250-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
250+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
251251
pub fn _mm256_sm4key4_epi32(a: __m256i, b: __m256i) -> __m256i {
252252
unsafe { transmute(vsm4key4256(a.as_i32x8(), b.as_i32x8())) }
253253
}
@@ -259,7 +259,7 @@ pub fn _mm256_sm4key4_epi32(a: __m256i, b: __m256i) -> __m256i {
259259
#[inline]
260260
#[target_feature(enable = "sm4,avx")]
261261
#[cfg_attr(test, assert_instr(vsm4rnds4))]
262-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
262+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
263263
pub fn _mm_sm4rnds4_epi32(a: __m128i, b: __m128i) -> __m128i {
264264
unsafe { transmute(vsm4rnds4128(a.as_i32x4(), b.as_i32x4())) }
265265
}
@@ -271,7 +271,7 @@ pub fn _mm_sm4rnds4_epi32(a: __m128i, b: __m128i) -> __m128i {
271271
#[inline]
272272
#[target_feature(enable = "sm4,avx")]
273273
#[cfg_attr(test, assert_instr(vsm4rnds4))]
274-
#[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")]
274+
#[stable(feature = "sha512_sm_x86", since = "1.89.0")]
275275
pub fn _mm256_sm4rnds4_epi32(a: __m256i, b: __m256i) -> __m256i {
276276
unsafe { transmute(vsm4rnds4256(a.as_i32x8(), b.as_i32x8())) }
277277
}

‎crates/std_detect/src/detect/arch/x86.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ features! {
157157
/// AVX (Advanced Vector Extensions)
158158
@FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx2: "avx2";
159159
/// AVX2 (Advanced Vector Extensions 2)
160-
@FEATURE: #[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")] sha512: "sha512";
160+
@FEATURE: #[stable(feature = "sha512_sm_x86", since = "1.89.0")] sha512: "sha512";
161161
/// SHA512
162-
@FEATURE: #[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")] sm3: "sm3";
162+
@FEATURE: #[stable(feature = "sha512_sm_x86", since = "1.89.0")] sm3: "sm3";
163163
/// SM3
164-
@FEATURE: #[stable(feature = "sha512_sm_x86", since = "CURRENT_RUSTC_VERSION")] sm4: "sm4";
164+
@FEATURE: #[stable(feature = "sha512_sm_x86", since = "1.89.0")] sm4: "sm4";
165165
/// SM4
166166
@FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512f: "avx512f" ;
167167
/// AVX-512 F (Foundation)
@@ -259,9 +259,9 @@ features! {
259259
/// XSAVEC (Save Processor Extended States Compacted)
260260
@FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] cmpxchg16b: "cmpxchg16b";
261261
/// CMPXCH16B (16-byte compare-and-swap instruction)
262-
@FEATURE: #[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")] kl: "kl";
262+
@FEATURE: #[stable(feature = "keylocker_x86", since = "1.89.0")] kl: "kl";
263263
/// Intel Key Locker
264-
@FEATURE: #[stable(feature = "keylocker_x86", since = "CURRENT_RUSTC_VERSION")] widekl: "widekl";
264+
@FEATURE: #[stable(feature = "keylocker_x86", since = "1.89.0")] widekl: "widekl";
265265
/// Intel Key Locker Wide
266266
@FEATURE: #[stable(feature = "simd_x86_adx", since = "1.33.0")] adx: "adx";
267267
/// ADX, Intel ADX (Multi-Precision Add-Carry Instruction Extensions)

0 commit comments

Comments
 (0)