Skip to content

Commit 64bb36f

Browse files
p32bloBurntSushi
authored andcommitted
Add the necessary SIMD types for sign extend intrinsics
1 parent 02afa1c commit 64bb36f

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

src/lib.rs

+26
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,32 @@ mod v256;
163163
mod v512;
164164
mod v64;
165165

166+
mod v32 {
167+
use simd_llvm::*;
168+
169+
define_ty! { i16x2, i16, i16 }
170+
define_impl! { i16x2, i16, 2, i16x2, x0, x1 }
171+
172+
define_ty! { i8x4, i8, i8, i8, i8 }
173+
define_impl! { i8x4, i8, 4, i8x4, x0, x1, x2, x3 }
174+
175+
define_casts!(
176+
(i8x4, i32x4, as_i32x4),
177+
(i16x2, i64x2, as_i64x4)
178+
);
179+
}
180+
181+
mod v16 {
182+
use simd_llvm::*;
183+
184+
define_ty! { i8x2, i8, i8 }
185+
define_impl! { i8x2, i8, 2, i8x2, x0, x1 }
186+
187+
define_casts!(
188+
(i8x2, i64x2, as_i64x2)
189+
);
190+
}
191+
166192
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
167193
#[macro_use]
168194
mod x86;

src/x86/sse41.rs

+6-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::mem;
44

55
#[cfg(test)]
66
use stdsimd_test::assert_instr;
7-
use simd_llvm::{simd_cast, simd_shuffle2, simd_shuffle4, simd_shuffle8};
7+
use simd_llvm::{simd_shuffle2, simd_shuffle4, simd_shuffle8};
88

99
use v128::*;
1010

@@ -273,37 +273,32 @@ pub unsafe fn _mm_cvtepi8_epi16(a: i8x16) -> i16x8 {
273273
#[target_feature = "+sse4.1"]
274274
#[cfg_attr(test, assert_instr(pmovsxbd))]
275275
pub unsafe fn _mm_cvtepi8_epi32(a: i8x16) -> i32x4 {
276-
let cast = simd_cast::<_, ::v512::i32x16>(a);
277-
simd_shuffle4(cast, cast, [0, 1, 2, 3])
276+
simd_shuffle4::<_, ::v32::i8x4>(a, a, [0, 1, 2, 3]).as_i32x4()
278277
}
279278

280279
/// Sign extend packed 8-bit integers in the low 8 bytes of `a` to packed 64-bit integers
281-
/*
282280
#[inline(always)]
283281
#[target_feature = "+sse4.1"]
284282
#[cfg_attr(test, assert_instr(pmovsxbq))]
285283
pub unsafe fn _mm_cvtepi8_epi64(a: i8x16) -> i64x2 {
286-
simd_cast::<::v16::i8x2, _>(simd_shuffle2(a, a, [0, 1]))
284+
simd_shuffle2::<_, ::v16::i8x2>(a, a, [0, 1]).as_i64x2()
287285
}
288-
*/
289286

290287
/// Sign extend packed 16-bit integers in `a` to packed 32-bit integers
291288
#[inline(always)]
292289
#[target_feature = "+sse4.1"]
293290
#[cfg_attr(test, assert_instr(pmovsxwd))]
294291
pub unsafe fn _mm_cvtepi16_epi32(a: i16x8) -> i32x4 {
295-
simd_cast::<::v64::i16x4, _>(simd_shuffle4(a, a, [0, 1, 2, 3]))
292+
simd_shuffle4::<_, ::v64::i16x4>(a, a, [0, 1, 2, 3]).as_i32x4()
296293
}
297294

298295
/// Sign extend packed 16-bit integers in a to packed 64-bit integers
299-
/*
300296
#[inline(always)]
301297
#[target_feature = "+sse4.1"]
302298
#[cfg_attr(test, assert_instr(pmovsxwq))]
303299
pub unsafe fn _mm_cvtepi16_epi64(a: i16x8) -> i64x2 {
304-
simd_cast::<::v32::i16x2, _>(simd_shuffle2(a, a, [0, 1]))
300+
simd_shuffle2::<_, ::v32::i16x2>(a, a, [0, 1]).as_i64x4()
305301
}
306-
*/
307302

308303
/// Returns the dot product of two f64x2 vectors.
309304
///
@@ -829,7 +824,6 @@ mod tests {
829824
assert_eq!(r, e);
830825
}
831826

832-
/*
833827
#[simd_test = "sse4.1"]
834828
unsafe fn _mm_cvtepi8_epi64() {
835829
let a = i8x16::splat(10);
@@ -841,7 +835,6 @@ mod tests {
841835
let e = i64x2::splat(-10);
842836
assert_eq!(r, e);
843837
}
844-
*/
845838

846839
#[simd_test = "sse4.1"]
847840
unsafe fn _mm_cvtepi16_epi32() {
@@ -855,7 +848,6 @@ mod tests {
855848
assert_eq!(r, e);
856849
}
857850

858-
/*
859851
#[simd_test = "sse4.1"]
860852
unsafe fn _mm_cvtepi16_epi64() {
861853
let a = i16x8::splat(10);
@@ -867,7 +859,7 @@ mod tests {
867859
let e = i64x2::splat(-10);
868860
assert_eq!(r, e);
869861
}
870-
*/
862+
871863
#[simd_test = "sse4.1"]
872864
unsafe fn _mm_dp_pd() {
873865
let a = f64x2::new(2.0, 3.0);

0 commit comments

Comments
 (0)