Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions crates/core_arch/src/simd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

#![allow(non_camel_case_types)]

#[inline(always)]
pub(crate) unsafe fn simd_imax<T: Copy>(a: T, b: T) -> T {
let mask: T = crate::intrinsics::simd::simd_gt(a, b);
crate::intrinsics::simd::simd_select(mask, a, b)
}

#[inline(always)]
pub(crate) unsafe fn simd_imin<T: Copy>(a: T, b: T) -> T {
let mask: T = crate::intrinsics::simd::simd_lt(a, b);
crate::intrinsics::simd::simd_select(mask, a, b)
}

macro_rules! simd_ty {
($id:ident [$elem_type:ty ; $len:literal]: $($param_name:ident),*) => {
#[repr(simd)]
Expand Down
72 changes: 12 additions & 60 deletions crates/core_arch/src/x86/avx2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1897,11 +1897,7 @@ pub unsafe fn _mm256_maskstore_epi64(mem_addr: *mut i64, mask: __m256i, a: __m25
#[cfg_attr(test, assert_instr(vpmaxsw))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_max_epi16(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_i16x16();
let b = b.as_i16x16();
transmute(simd_select::<i16x16, _>(simd_gt(a, b), a, b))
}
unsafe { simd_imax(a.as_i16x16(), b.as_i16x16()).as_m256i() }
}

/// Compares packed 32-bit integers in `a` and `b`, and returns the packed
Expand All @@ -1913,11 +1909,7 @@ pub fn _mm256_max_epi16(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpmaxsd))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_max_epi32(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_i32x8();
let b = b.as_i32x8();
transmute(simd_select::<i32x8, _>(simd_gt(a, b), a, b))
}
unsafe { simd_imax(a.as_i32x8(), b.as_i32x8()).as_m256i() }
}

/// Compares packed 8-bit integers in `a` and `b`, and returns the packed
Expand All @@ -1929,11 +1921,7 @@ pub fn _mm256_max_epi32(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpmaxsb))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_max_epi8(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_i8x32();
let b = b.as_i8x32();
transmute(simd_select::<i8x32, _>(simd_gt(a, b), a, b))
}
unsafe { simd_imax(a.as_i8x32(), b.as_i8x32()).as_m256i() }
}

/// Compares packed unsigned 16-bit integers in `a` and `b`, and returns
Expand All @@ -1945,11 +1933,7 @@ pub fn _mm256_max_epi8(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpmaxuw))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_max_epu16(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_u16x16();
let b = b.as_u16x16();
transmute(simd_select::<i16x16, _>(simd_gt(a, b), a, b))
}
unsafe { simd_imax(a.as_u16x16(), b.as_u16x16()).as_m256i() }
}

/// Compares packed unsigned 32-bit integers in `a` and `b`, and returns
Expand All @@ -1961,11 +1945,7 @@ pub fn _mm256_max_epu16(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpmaxud))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_max_epu32(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_u32x8();
let b = b.as_u32x8();
transmute(simd_select::<i32x8, _>(simd_gt(a, b), a, b))
}
unsafe { simd_imax(a.as_u32x8(), b.as_u32x8()).as_m256i() }
}

/// Compares packed unsigned 8-bit integers in `a` and `b`, and returns
Expand All @@ -1977,11 +1957,7 @@ pub fn _mm256_max_epu32(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpmaxub))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_max_epu8(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_u8x32();
let b = b.as_u8x32();
transmute(simd_select::<i8x32, _>(simd_gt(a, b), a, b))
}
unsafe { simd_imax(a.as_u8x32(), b.as_u8x32()).as_m256i() }
}

/// Compares packed 16-bit integers in `a` and `b`, and returns the packed
Expand All @@ -1993,11 +1969,7 @@ pub fn _mm256_max_epu8(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpminsw))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_min_epi16(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_i16x16();
let b = b.as_i16x16();
transmute(simd_select::<i16x16, _>(simd_lt(a, b), a, b))
}
unsafe { simd_imin(a.as_i16x16(), b.as_i16x16()).as_m256i() }
}

/// Compares packed 32-bit integers in `a` and `b`, and returns the packed
Expand All @@ -2009,11 +1981,7 @@ pub fn _mm256_min_epi16(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpminsd))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_min_epi32(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_i32x8();
let b = b.as_i32x8();
transmute(simd_select::<i32x8, _>(simd_lt(a, b), a, b))
}
unsafe { simd_imin(a.as_i32x8(), b.as_i32x8()).as_m256i() }
}

/// Compares packed 8-bit integers in `a` and `b`, and returns the packed
Expand All @@ -2025,11 +1993,7 @@ pub fn _mm256_min_epi32(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpminsb))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_min_epi8(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_i8x32();
let b = b.as_i8x32();
transmute(simd_select::<i8x32, _>(simd_lt(a, b), a, b))
}
unsafe { simd_imin(a.as_i8x32(), b.as_i8x32()).as_m256i() }
}

/// Compares packed unsigned 16-bit integers in `a` and `b`, and returns
Expand All @@ -2041,11 +2005,7 @@ pub fn _mm256_min_epi8(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpminuw))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_min_epu16(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_u16x16();
let b = b.as_u16x16();
transmute(simd_select::<i16x16, _>(simd_lt(a, b), a, b))
}
unsafe { simd_imin(a.as_u16x16(), b.as_u16x16()).as_m256i() }
}

/// Compares packed unsigned 32-bit integers in `a` and `b`, and returns
Expand All @@ -2057,11 +2017,7 @@ pub fn _mm256_min_epu16(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpminud))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_min_epu32(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_u32x8();
let b = b.as_u32x8();
transmute(simd_select::<i32x8, _>(simd_lt(a, b), a, b))
}
unsafe { simd_imin(a.as_u32x8(), b.as_u32x8()).as_m256i() }
}

/// Compares packed unsigned 8-bit integers in `a` and `b`, and returns
Expand All @@ -2073,11 +2029,7 @@ pub fn _mm256_min_epu32(a: __m256i, b: __m256i) -> __m256i {
#[cfg_attr(test, assert_instr(vpminub))]
#[stable(feature = "simd_x86", since = "1.27.0")]
pub fn _mm256_min_epu8(a: __m256i, b: __m256i) -> __m256i {
unsafe {
let a = a.as_u8x32();
let b = b.as_u8x32();
transmute(simd_select::<i8x32, _>(simd_lt(a, b), a, b))
}
unsafe { simd_imin(a.as_u8x32(), b.as_u8x32()).as_m256i() }
}

/// Creates mask from the most significant bit of each 8-bit element in `a`,
Expand Down
Loading