@@ -38,7 +38,7 @@ extern "C" {
38
38
///
39
39
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_aesenc_epi128)
40
40
#[ inline]
41
- #[ target_feature( enable = "avx512vaes " ) ]
41
+ #[ target_feature( enable = "vaes " ) ]
42
42
#[ cfg_attr( test, assert_instr( vaesenc) ) ]
43
43
pub unsafe fn _mm256_aesenc_epi128 ( a : __m256i , round_key : __m256i ) -> __m256i {
44
44
aesenc_256 ( a, round_key)
@@ -49,7 +49,7 @@ pub unsafe fn _mm256_aesenc_epi128(a: __m256i, round_key: __m256i) -> __m256i {
49
49
///
50
50
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_aesenclast_epi128)
51
51
#[ inline]
52
- #[ target_feature( enable = "avx512vaes " ) ]
52
+ #[ target_feature( enable = "vaes " ) ]
53
53
#[ cfg_attr( test, assert_instr( vaesenclast) ) ]
54
54
pub unsafe fn _mm256_aesenclast_epi128 ( a : __m256i , round_key : __m256i ) -> __m256i {
55
55
aesenclast_256 ( a, round_key)
@@ -60,7 +60,7 @@ pub unsafe fn _mm256_aesenclast_epi128(a: __m256i, round_key: __m256i) -> __m256
60
60
///
61
61
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_aesdec_epi128)
62
62
#[ inline]
63
- #[ target_feature( enable = "avx512vaes " ) ]
63
+ #[ target_feature( enable = "vaes " ) ]
64
64
#[ cfg_attr( test, assert_instr( vaesdec) ) ]
65
65
pub unsafe fn _mm256_aesdec_epi128 ( a : __m256i , round_key : __m256i ) -> __m256i {
66
66
aesdec_256 ( a, round_key)
@@ -71,7 +71,7 @@ pub unsafe fn _mm256_aesdec_epi128(a: __m256i, round_key: __m256i) -> __m256i {
71
71
///
72
72
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_aesdeclast_epi128)
73
73
#[ inline]
74
- #[ target_feature( enable = "avx512vaes " ) ]
74
+ #[ target_feature( enable = "vaes " ) ]
75
75
#[ cfg_attr( test, assert_instr( vaesdeclast) ) ]
76
76
pub unsafe fn _mm256_aesdeclast_epi128 ( a : __m256i , round_key : __m256i ) -> __m256i {
77
77
aesdeclast_256 ( a, round_key)
@@ -82,7 +82,7 @@ pub unsafe fn _mm256_aesdeclast_epi128(a: __m256i, round_key: __m256i) -> __m256
82
82
///
83
83
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm512_aesenc_epi128)
84
84
#[ inline]
85
- #[ target_feature( enable = "avx512vaes ,avx512f" ) ]
85
+ #[ target_feature( enable = "vaes ,avx512f" ) ]
86
86
#[ cfg_attr( test, assert_instr( vaesenc) ) ]
87
87
pub unsafe fn _mm512_aesenc_epi128 ( a : __m512i , round_key : __m512i ) -> __m512i {
88
88
aesenc_512 ( a, round_key)
@@ -93,7 +93,7 @@ pub unsafe fn _mm512_aesenc_epi128(a: __m512i, round_key: __m512i) -> __m512i {
93
93
///
94
94
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm512_aesenclast_epi128)
95
95
#[ inline]
96
- #[ target_feature( enable = "avx512vaes ,avx512f" ) ]
96
+ #[ target_feature( enable = "vaes ,avx512f" ) ]
97
97
#[ cfg_attr( test, assert_instr( vaesenclast) ) ]
98
98
pub unsafe fn _mm512_aesenclast_epi128 ( a : __m512i , round_key : __m512i ) -> __m512i {
99
99
aesenclast_512 ( a, round_key)
@@ -104,7 +104,7 @@ pub unsafe fn _mm512_aesenclast_epi128(a: __m512i, round_key: __m512i) -> __m512
104
104
///
105
105
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm512_aesdec_epi128)
106
106
#[ inline]
107
- #[ target_feature( enable = "avx512vaes ,avx512f" ) ]
107
+ #[ target_feature( enable = "vaes ,avx512f" ) ]
108
108
#[ cfg_attr( test, assert_instr( vaesdec) ) ]
109
109
pub unsafe fn _mm512_aesdec_epi128 ( a : __m512i , round_key : __m512i ) -> __m512i {
110
110
aesdec_512 ( a, round_key)
@@ -115,7 +115,7 @@ pub unsafe fn _mm512_aesdec_epi128(a: __m512i, round_key: __m512i) -> __m512i {
115
115
///
116
116
/// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm512_aesdeclast_epi128)
117
117
#[ inline]
118
- #[ target_feature( enable = "avx512vaes ,avx512f" ) ]
118
+ #[ target_feature( enable = "vaes ,avx512f" ) ]
119
119
#[ cfg_attr( test, assert_instr( vaesdeclast) ) ]
120
120
pub unsafe fn _mm512_aesdeclast_epi128 ( a : __m512i , round_key : __m512i ) -> __m512i {
121
121
aesdeclast_512 ( a, round_key)
@@ -138,7 +138,7 @@ mod tests {
138
138
// ideally we'd be using quickcheck here instead
139
139
140
140
#[ target_feature( enable = "avx2" ) ]
141
- unsafe fn helper_for_256_avx512vaes (
141
+ unsafe fn helper_for_256_vaes (
142
142
linear : unsafe fn ( __m128i , __m128i ) -> __m128i ,
143
143
vectorized : unsafe fn ( __m256i , __m256i ) -> __m256i ,
144
144
) {
@@ -187,7 +187,7 @@ mod tests {
187
187
setup_state_key ( _mm512_broadcast_i32x4)
188
188
}
189
189
190
- #[ simd_test( enable = "avx512vaes ,avx512vl" ) ]
190
+ #[ simd_test( enable = "vaes ,avx512vl" ) ]
191
191
unsafe fn test_mm256_aesdec_epi128 ( ) {
192
192
// Constants taken from https://msdn.microsoft.com/en-us/library/cc664949.aspx.
193
193
let ( a, k) = setup_state_key_256 ( ) ;
@@ -196,10 +196,10 @@ mod tests {
196
196
let r = _mm256_aesdec_epi128 ( a, k) ;
197
197
assert_eq_m256i ( r, e) ;
198
198
199
- helper_for_256_avx512vaes ( _mm_aesdec_si128, _mm256_aesdec_epi128) ;
199
+ helper_for_256_vaes ( _mm_aesdec_si128, _mm256_aesdec_epi128) ;
200
200
}
201
201
202
- #[ simd_test( enable = "avx512vaes ,avx512vl" ) ]
202
+ #[ simd_test( enable = "vaes ,avx512vl" ) ]
203
203
unsafe fn test_mm256_aesdeclast_epi128 ( ) {
204
204
// Constants taken from https://msdn.microsoft.com/en-us/library/cc714178.aspx.
205
205
let ( a, k) = setup_state_key_256 ( ) ;
@@ -208,10 +208,10 @@ mod tests {
208
208
let r = _mm256_aesdeclast_epi128 ( a, k) ;
209
209
assert_eq_m256i ( r, e) ;
210
210
211
- helper_for_256_avx512vaes ( _mm_aesdeclast_si128, _mm256_aesdeclast_epi128) ;
211
+ helper_for_256_vaes ( _mm_aesdeclast_si128, _mm256_aesdeclast_epi128) ;
212
212
}
213
213
214
- #[ simd_test( enable = "avx512vaes ,avx512vl" ) ]
214
+ #[ simd_test( enable = "vaes ,avx512vl" ) ]
215
215
unsafe fn test_mm256_aesenc_epi128 ( ) {
216
216
// Constants taken from https://msdn.microsoft.com/en-us/library/cc664810.aspx.
217
217
// they are repeated appropriately
@@ -221,10 +221,10 @@ mod tests {
221
221
let r = _mm256_aesenc_epi128 ( a, k) ;
222
222
assert_eq_m256i ( r, e) ;
223
223
224
- helper_for_256_avx512vaes ( _mm_aesenc_si128, _mm256_aesenc_epi128) ;
224
+ helper_for_256_vaes ( _mm_aesenc_si128, _mm256_aesenc_epi128) ;
225
225
}
226
226
227
- #[ simd_test( enable = "avx512vaes ,avx512vl" ) ]
227
+ #[ simd_test( enable = "vaes ,avx512vl" ) ]
228
228
unsafe fn test_mm256_aesenclast_epi128 ( ) {
229
229
// Constants taken from https://msdn.microsoft.com/en-us/library/cc714136.aspx.
230
230
let ( a, k) = setup_state_key_256 ( ) ;
@@ -233,11 +233,11 @@ mod tests {
233
233
let r = _mm256_aesenclast_epi128 ( a, k) ;
234
234
assert_eq_m256i ( r, e) ;
235
235
236
- helper_for_256_avx512vaes ( _mm_aesenclast_si128, _mm256_aesenclast_epi128) ;
236
+ helper_for_256_vaes ( _mm_aesenclast_si128, _mm256_aesenclast_epi128) ;
237
237
}
238
238
239
239
#[ target_feature( enable = "avx512f" ) ]
240
- unsafe fn helper_for_512_avx512vaes (
240
+ unsafe fn helper_for_512_vaes (
241
241
linear : unsafe fn ( __m128i , __m128i ) -> __m128i ,
242
242
vectorized : unsafe fn ( __m512i , __m512i ) -> __m512i ,
243
243
) {
@@ -282,7 +282,7 @@ mod tests {
282
282
assert_eq_m128i ( _mm512_extracti32x4_epi32 :: < 3 > ( r) , e_decomp[ 3 ] ) ;
283
283
}
284
284
285
- #[ simd_test( enable = "avx512vaes ,avx512f" ) ]
285
+ #[ simd_test( enable = "vaes ,avx512f" ) ]
286
286
unsafe fn test_mm512_aesdec_epi128 ( ) {
287
287
// Constants taken from https://msdn.microsoft.com/en-us/library/cc664949.aspx.
288
288
let ( a, k) = setup_state_key_512 ( ) ;
@@ -291,10 +291,10 @@ mod tests {
291
291
let r = _mm512_aesdec_epi128 ( a, k) ;
292
292
assert_eq_m512i ( r, e) ;
293
293
294
- helper_for_512_avx512vaes ( _mm_aesdec_si128, _mm512_aesdec_epi128) ;
294
+ helper_for_512_vaes ( _mm_aesdec_si128, _mm512_aesdec_epi128) ;
295
295
}
296
296
297
- #[ simd_test( enable = "avx512vaes ,avx512f" ) ]
297
+ #[ simd_test( enable = "vaes ,avx512f" ) ]
298
298
unsafe fn test_mm512_aesdeclast_epi128 ( ) {
299
299
// Constants taken from https://msdn.microsoft.com/en-us/library/cc714178.aspx.
300
300
let ( a, k) = setup_state_key_512 ( ) ;
@@ -303,10 +303,10 @@ mod tests {
303
303
let r = _mm512_aesdeclast_epi128 ( a, k) ;
304
304
assert_eq_m512i ( r, e) ;
305
305
306
- helper_for_512_avx512vaes ( _mm_aesdeclast_si128, _mm512_aesdeclast_epi128) ;
306
+ helper_for_512_vaes ( _mm_aesdeclast_si128, _mm512_aesdeclast_epi128) ;
307
307
}
308
308
309
- #[ simd_test( enable = "avx512vaes ,avx512f" ) ]
309
+ #[ simd_test( enable = "vaes ,avx512f" ) ]
310
310
unsafe fn test_mm512_aesenc_epi128 ( ) {
311
311
// Constants taken from https://msdn.microsoft.com/en-us/library/cc664810.aspx.
312
312
let ( a, k) = setup_state_key_512 ( ) ;
@@ -315,10 +315,10 @@ mod tests {
315
315
let r = _mm512_aesenc_epi128 ( a, k) ;
316
316
assert_eq_m512i ( r, e) ;
317
317
318
- helper_for_512_avx512vaes ( _mm_aesenc_si128, _mm512_aesenc_epi128) ;
318
+ helper_for_512_vaes ( _mm_aesenc_si128, _mm512_aesenc_epi128) ;
319
319
}
320
320
321
- #[ simd_test( enable = "avx512vaes ,avx512f" ) ]
321
+ #[ simd_test( enable = "vaes ,avx512f" ) ]
322
322
unsafe fn test_mm512_aesenclast_epi128 ( ) {
323
323
// Constants taken from https://msdn.microsoft.com/en-us/library/cc714136.aspx.
324
324
let ( a, k) = setup_state_key_512 ( ) ;
@@ -327,6 +327,6 @@ mod tests {
327
327
let r = _mm512_aesenclast_epi128 ( a, k) ;
328
328
assert_eq_m512i ( r, e) ;
329
329
330
- helper_for_512_avx512vaes ( _mm_aesenclast_si128, _mm512_aesenclast_epi128) ;
330
+ helper_for_512_vaes ( _mm_aesenclast_si128, _mm512_aesenclast_epi128) ;
331
331
}
332
332
}
0 commit comments