Skip to content

Commit 3b225f5

Browse files
committed
Merge remote-tracking branch 'up/master' into sse4.1
2 parents c8d63ea + 45fff57 commit 3b225f5

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ mod v256;
163163
mod v512;
164164
mod v64;
165165

166+
/// 32-bit wide vector tpyes
166167
mod v32 {
167168
use simd_llvm::*;
168169

@@ -184,6 +185,7 @@ mod v32 {
184185
);
185186
}
186187

188+
/// 16-bit wide vector tpyes
187189
mod v16 {
188190
use simd_llvm::*;
189191

src/x86/sse2.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,9 @@ pub unsafe fn _mm_cvtsd_si64(a: f64x2) -> i64 {
17921792
#[inline(always)]
17931793
#[target_feature = "+sse2"]
17941794
#[cfg_attr(test, assert_instr(cvtsd2si))]
1795-
pub unsafe fn _mm_cvtsd_si64x(a: f64x2) -> i64 { _mm_cvtsd_si64(a) }
1795+
pub unsafe fn _mm_cvtsd_si64x(a: f64x2) -> i64 {
1796+
_mm_cvtsd_si64(a)
1797+
}
17961798

17971799
/// Convert the lower double-precision (64-bit) floating-point element in `b`
17981800
/// to a single-precision (32-bit) floating-point element, store the result in
@@ -1857,7 +1859,9 @@ pub unsafe fn _mm_cvttsd_si64(a: f64x2) -> i64 {
18571859
#[inline(always)]
18581860
#[target_feature = "+sse2"]
18591861
#[cfg_attr(test, assert_instr(cvttsd2si))]
1860-
pub unsafe fn _mm_cvttsd_si64x(a: f64x2) -> i64 { _mm_cvttsd_si64(a) }
1862+
pub unsafe fn _mm_cvttsd_si64x(a: f64x2) -> i64 {
1863+
_mm_cvttsd_si64(a)
1864+
}
18611865

18621866
/// Convert packed single-precision (32-bit) floating-point elements in `a` to
18631867
/// packed 32-bit integers with truncation.

src/x86/sse41.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@ pub unsafe fn _mm_max_epu32(a: u32x4, b: u32x4) -> u32x4 {
244244
pmaxud(a, b)
245245
}
246246

247-
/// Convert packed 32-bit integers from `a` and `b` to packed 16-bit integers using unsigned saturation
247+
/// Convert packed 32-bit integers from `a` and `b` to packed 16-bit integers
248+
/// using unsigned saturation
248249
#[inline(always)]
249250
#[target_feature = "+sse4.1"]
250251
#[cfg_attr(test, assert_instr(packusdw))]
@@ -276,7 +277,8 @@ pub unsafe fn _mm_cvtepi8_epi32(a: i8x16) -> i32x4 {
276277
simd_shuffle4::<_, ::v32::i8x4>(a, a, [0, 1, 2, 3]).as_i32x4()
277278
}
278279

279-
/// Sign extend packed 8-bit integers in the low 8 bytes of `a` to packed 64-bit integers
280+
/// Sign extend packed 8-bit integers in the low 8 bytes of `a` to packed
281+
/// 64-bit integers
280282
#[inline(always)]
281283
#[target_feature = "+sse4.1"]
282284
#[cfg_attr(test, assert_instr(pmovsxbq))]
@@ -1062,7 +1064,7 @@ mod tests {
10621064
assert_eq!(r, e);
10631065
}
10641066

1065-
#[simd_test = "sse4.1"]
1067+
#[simd_test = "sse4.1"]
10661068
unsafe fn _mm_cvtepi8_epi16() {
10671069
let a = i8x16::splat(10);
10681070
let r = sse41::_mm_cvtepi8_epi16(a);
@@ -1104,7 +1106,7 @@ mod tests {
11041106
let r = sse41::_mm_cvtepi16_epi32(a);
11051107
let e = i32x4::splat(10);
11061108
assert_eq!(r, e);
1107-
let a = i16x8::splat(-10);
1109+
let a = i16x8::splat(-10);
11081110
let r = sse41::_mm_cvtepi16_epi32(a);
11091111
let e = i32x4::splat(-10);
11101112
assert_eq!(r, e);
@@ -1116,7 +1118,7 @@ mod tests {
11161118
let r = sse41::_mm_cvtepi16_epi64(a);
11171119
let e = i64x2::splat(10);
11181120
assert_eq!(r, e);
1119-
let a = i16x8::splat(-10);
1121+
let a = i16x8::splat(-10);
11201122
let r = sse41::_mm_cvtepi16_epi64(a);
11211123
let e = i64x2::splat(-10);
11221124
assert_eq!(r, e);

0 commit comments

Comments
 (0)