Skip to content

Commit 2111b53

Browse files
committed
Use simd_* in x86/avx2.rs where possible
1 parent 65d499c commit 2111b53

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

crates/core_arch/src/x86/avx2.rs

+8-24
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ pub unsafe fn _mm256_add_epi8(a: __m256i, b: __m256i) -> __m256i {
111111
#[cfg_attr(test, assert_instr(vpaddsb))]
112112
#[stable(feature = "simd_x86", since = "1.27.0")]
113113
pub unsafe fn _mm256_adds_epi8(a: __m256i, b: __m256i) -> __m256i {
114-
transmute(paddsb(a.as_i8x32(), b.as_i8x32()))
114+
transmute(simd_saturating_add(a.as_i8x32(), b.as_i8x32()))
115115
}
116116

117117
/// Adds packed 16-bit integers in `a` and `b` using saturation.
@@ -122,7 +122,7 @@ pub unsafe fn _mm256_adds_epi8(a: __m256i, b: __m256i) -> __m256i {
122122
#[cfg_attr(test, assert_instr(vpaddsw))]
123123
#[stable(feature = "simd_x86", since = "1.27.0")]
124124
pub unsafe fn _mm256_adds_epi16(a: __m256i, b: __m256i) -> __m256i {
125-
transmute(paddsw(a.as_i16x16(), b.as_i16x16()))
125+
transmute(simd_saturating_add(a.as_i16x16(), b.as_i16x16()))
126126
}
127127

128128
/// Adds packed unsigned 8-bit integers in `a` and `b` using saturation.
@@ -133,7 +133,7 @@ pub unsafe fn _mm256_adds_epi16(a: __m256i, b: __m256i) -> __m256i {
133133
#[cfg_attr(test, assert_instr(vpaddusb))]
134134
#[stable(feature = "simd_x86", since = "1.27.0")]
135135
pub unsafe fn _mm256_adds_epu8(a: __m256i, b: __m256i) -> __m256i {
136-
transmute(paddusb(a.as_u8x32(), b.as_u8x32()))
136+
transmute(simd_saturating_add(a.as_u8x32(), b.as_u8x32()))
137137
}
138138

139139
/// Adds packed unsigned 16-bit integers in `a` and `b` using saturation.
@@ -144,7 +144,7 @@ pub unsafe fn _mm256_adds_epu8(a: __m256i, b: __m256i) -> __m256i {
144144
#[cfg_attr(test, assert_instr(vpaddusw))]
145145
#[stable(feature = "simd_x86", since = "1.27.0")]
146146
pub unsafe fn _mm256_adds_epu16(a: __m256i, b: __m256i) -> __m256i {
147-
transmute(paddusw(a.as_u16x16(), b.as_u16x16()))
147+
transmute(simd_saturating_add(a.as_u16x16(), b.as_u16x16()))
148148
}
149149

150150
/// Concatenates pairs of 16-byte blocks in `a` and `b` into a 32-byte temporary
@@ -3334,7 +3334,7 @@ pub unsafe fn _mm256_sub_epi8(a: __m256i, b: __m256i) -> __m256i {
33343334
#[cfg_attr(test, assert_instr(vpsubsw))]
33353335
#[stable(feature = "simd_x86", since = "1.27.0")]
33363336
pub unsafe fn _mm256_subs_epi16(a: __m256i, b: __m256i) -> __m256i {
3337-
transmute(psubsw(a.as_i16x16(), b.as_i16x16()))
3337+
transmute(simd_saturating_sub(a.as_i16x16(), b.as_i16x16()))
33383338
}
33393339

33403340
/// Subtract packed 8-bit integers in `b` from packed 8-bit integers in
@@ -3346,7 +3346,7 @@ pub unsafe fn _mm256_subs_epi16(a: __m256i, b: __m256i) -> __m256i {
33463346
#[cfg_attr(test, assert_instr(vpsubsb))]
33473347
#[stable(feature = "simd_x86", since = "1.27.0")]
33483348
pub unsafe fn _mm256_subs_epi8(a: __m256i, b: __m256i) -> __m256i {
3349-
transmute(psubsb(a.as_i8x32(), b.as_i8x32()))
3349+
transmute(simd_saturating_sub(a.as_i8x32(), b.as_i8x32()))
33503350
}
33513351

33523352
/// Subtract packed unsigned 16-bit integers in `b` from packed 16-bit
@@ -3358,7 +3358,7 @@ pub unsafe fn _mm256_subs_epi8(a: __m256i, b: __m256i) -> __m256i {
33583358
#[cfg_attr(test, assert_instr(vpsubusw))]
33593359
#[stable(feature = "simd_x86", since = "1.27.0")]
33603360
pub unsafe fn _mm256_subs_epu16(a: __m256i, b: __m256i) -> __m256i {
3361-
transmute(psubusw(a.as_u16x16(), b.as_u16x16()))
3361+
transmute(simd_saturating_sub(a.as_u16x16(), b.as_u16x16()))
33623362
}
33633363

33643364
/// Subtract packed unsigned 8-bit integers in `b` from packed 8-bit
@@ -3370,7 +3370,7 @@ pub unsafe fn _mm256_subs_epu16(a: __m256i, b: __m256i) -> __m256i {
33703370
#[cfg_attr(test, assert_instr(vpsubusb))]
33713371
#[stable(feature = "simd_x86", since = "1.27.0")]
33723372
pub unsafe fn _mm256_subs_epu8(a: __m256i, b: __m256i) -> __m256i {
3373-
transmute(psubusb(a.as_u8x32(), b.as_u8x32()))
3373+
transmute(simd_saturating_sub(a.as_u8x32(), b.as_u8x32()))
33743374
}
33753375

33763376
/// Unpacks and interleave 8-bit integers from the high half of each
@@ -3810,14 +3810,6 @@ extern "C" {
38103810
fn pabsw(a: i16x16) -> u16x16;
38113811
#[link_name = "llvm.x86.avx2.pabs.d"]
38123812
fn pabsd(a: i32x8) -> u32x8;
3813-
#[link_name = "llvm.x86.avx2.padds.b"]
3814-
fn paddsb(a: i8x32, b: i8x32) -> i8x32;
3815-
#[link_name = "llvm.x86.avx2.padds.w"]
3816-
fn paddsw(a: i16x16, b: i16x16) -> i16x16;
3817-
#[link_name = "llvm.x86.avx2.paddus.b"]
3818-
fn paddusb(a: u8x32, b: u8x32) -> u8x32;
3819-
#[link_name = "llvm.x86.avx2.paddus.w"]
3820-
fn paddusw(a: u16x16, b: u16x16) -> u16x16;
38213813
#[link_name = "llvm.x86.avx2.pavg.b"]
38223814
fn pavgb(a: u8x32, b: u8x32) -> u8x32;
38233815
#[link_name = "llvm.x86.avx2.pavg.w"]
@@ -3962,14 +3954,6 @@ extern "C" {
39623954
fn psrlvq(a: i64x2, count: i64x2) -> i64x2;
39633955
#[link_name = "llvm.x86.avx2.psrlv.q.256"]
39643956
fn psrlvq256(a: i64x4, count: i64x4) -> i64x4;
3965-
#[link_name = "llvm.x86.avx2.psubs.b"]
3966-
fn psubsb(a: i8x32, b: i8x32) -> i8x32;
3967-
#[link_name = "llvm.x86.avx2.psubs.w"]
3968-
fn psubsw(a: i16x16, b: i16x16) -> i16x16;
3969-
#[link_name = "llvm.x86.avx2.psubus.b"]
3970-
fn psubusb(a: u8x32, b: u8x32) -> u8x32;
3971-
#[link_name = "llvm.x86.avx2.psubus.w"]
3972-
fn psubusw(a: u16x16, b: u16x16) -> u16x16;
39733957
#[link_name = "llvm.x86.avx2.pshuf.b"]
39743958
fn pshufb(a: u8x32, b: u8x32) -> u8x32;
39753959
#[link_name = "llvm.x86.avx2.permd"]

0 commit comments

Comments
 (0)