Skip to content

Update stdsimd-verify for vendor types #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2018
Merged

Update stdsimd-verify for vendor types #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 18 additions & 21 deletions coresimd/src/x86/i586/avx2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3162,8 +3162,6 @@ extern "C" {
mod tests {
use stdsimd_test::simd_test;

use v256::*;
use v128::*;
use x86::*;
use std;

Expand Down Expand Up @@ -3423,17 +3421,16 @@ mod tests {
unsafe fn test_mm256_and_si256() {
let a = _mm256_set1_epi8(5);
let b = _mm256_set1_epi8(3);
let got = _mm256_and_si256(__m256i::from(a), __m256i::from(b));
assert_eq!(got, __m256i::from(_mm256_set1_epi8(1)));
let got = _mm256_and_si256(a, b);
assert_eq!(got, _mm256_set1_epi8(1));
}

#[simd_test = "avx2"]
unsafe fn test_mm256_andnot_si256() {
let a = _mm256_set1_epi8(5);
let b = _mm256_set1_epi8(3);
let got =
_mm256_andnot_si256(__m256i::from(a), __m256i::from(b));
assert_eq!(got, __m256i::from(_mm256_set1_epi8(2)));
let got = _mm256_andnot_si256(a, b);
assert_eq!(got, _mm256_set1_epi8(2));
}

#[simd_test = "avx2"]
Expand Down Expand Up @@ -3774,9 +3771,9 @@ mod tests {

#[simd_test = "avx2"]
unsafe fn test_mm256_extracti128_si256() {
let a = __m256i::from(_mm256_setr_epi64x(1, 2, 3, 4));
let a = _mm256_setr_epi64x(1, 2, 3, 4);
let r = _mm256_extracti128_si256(a, 0b01);
let e = __m128i::from(_mm_setr_epi64x(3, 4));
let e = _mm_setr_epi64x(3, 4);
assert_eq!(r, e);
}

Expand Down Expand Up @@ -3850,11 +3847,11 @@ mod tests {

#[simd_test = "avx2"]
unsafe fn test_mm256_inserti128_si256() {
let a = __m256i::from(_mm256_setr_epi64x(1, 2, 3, 4));
let b = __m128i::from(_mm_setr_epi64x(7, 8));
let a = _mm256_setr_epi64x(1, 2, 3, 4);
let b = _mm_setr_epi64x(7, 8);
let r = _mm256_inserti128_si256(a, b, 0b01);
let e = _mm256_setr_epi64x(1, 2, 7, 8);
assert_eq!(r, __m256i::from(e));
assert_eq!(r, e);
}

#[simd_test = "avx2"]
Expand Down Expand Up @@ -4124,8 +4121,8 @@ mod tests {

#[simd_test = "avx2"]
unsafe fn test_mm256_or_si256() {
let a = __m256i::from(_mm256_set1_epi8(-1));
let b = __m256i::from(_mm256_set1_epi8(0));
let a = _mm256_set1_epi8(-1);
let b = _mm256_set1_epi8(0);
let r = _mm256_or_si256(a, b);
assert_eq!(r, a);
}
Expand Down Expand Up @@ -4301,8 +4298,8 @@ mod tests {
#[simd_test = "avx2"]
unsafe fn test_mm256_slli_si256() {
let a = _mm256_set1_epi64x(0xFFFFFFFF);
let r = _mm256_slli_si256(__m256i::from(a), 3);
assert_eq!(r, __m256i::from(_mm256_set1_epi64x(0xFFFFFFFF000000)));
let r = _mm256_slli_si256(a, 3);
assert_eq!(r, _mm256_set1_epi64x(0xFFFFFFFF000000));
}

#[simd_test = "avx2"]
Expand Down Expand Up @@ -4400,15 +4397,15 @@ mod tests {
17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32,
);
let r = _mm256_srli_si256(__m256i::from(a), 3);
let r = _mm256_srli_si256(a, 3);
#[cfg_attr(rustfmt, rustfmt_skip)]
let e = _mm256_setr_epi8(
4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 0, 0, 0,
20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 0, 0, 0,
);
assert_eq!(r, __m256i::from(e));
assert_eq!(r, e);
}

#[simd_test = "avx2"]
Expand Down Expand Up @@ -4561,10 +4558,10 @@ mod tests {

#[simd_test = "avx2"]
unsafe fn test_mm256_xor_si256() {
let a = __m256i::from(_mm256_set1_epi8(5));
let b = __m256i::from(_mm256_set1_epi8(3));
let a = _mm256_set1_epi8(5);
let b = _mm256_set1_epi8(3);
let r = _mm256_xor_si256(a, b);
assert_eq!(r, __m256i::from(_mm256_set1_epi8(6)));
assert_eq!(r, _mm256_set1_epi8(6));
}

#[simd_test = "avx2"]
Expand Down
52 changes: 26 additions & 26 deletions coresimd/src/x86/i686/sse4a.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use core::mem;
use v128::*;
use x86::*;

#[cfg(test)]
use stdsimd_test::assert_instr;
Expand All @@ -13,9 +14,9 @@ extern "C" {
#[link_name = "llvm.x86.sse4a.insertq"]
fn insertq(x: i64x2, y: i64x2) -> i64x2;
#[link_name = "llvm.x86.sse4a.movnt.sd"]
fn movntsd(x: *mut f64, y: f64x2);
fn movntsd(x: *mut f64, y: __m128d);
#[link_name = "llvm.x86.sse4a.movnt.ss"]
fn movntss(x: *mut f32, y: f32x4);
fn movntss(x: *mut f32, y: __m128);
}

// FIXME(blocked on #248): _mm_extracti_si64(x, len, idx) // EXTRQ
Expand All @@ -35,8 +36,8 @@ extern "C" {
#[inline(always)]
#[target_feature(enable = "sse4a")]
#[cfg_attr(test, assert_instr(extrq))]
pub unsafe fn _mm_extract_si64(x: i64x2, y: i64x2) -> i64x2 {
extrq(x, mem::transmute(y))
pub unsafe fn _mm_extract_si64(x: __m128i, y: __m128i) -> __m128i {
mem::transmute(extrq(x.as_i64x2(), y.as_i8x16()))
}

/// Inserts the `[length:0]` bits of `y` into `x` at `index`.
Expand All @@ -51,59 +52,58 @@ pub unsafe fn _mm_extract_si64(x: i64x2, y: i64x2) -> i64x2 {
#[inline(always)]
#[target_feature(enable = "sse4a")]
#[cfg_attr(test, assert_instr(insertq))]
pub unsafe fn _mm_insert_si64(x: i64x2, y: i64x2) -> i64x2 {
insertq(x, y)
pub unsafe fn _mm_insert_si64(x: __m128i, y: __m128i) -> __m128i {
mem::transmute(insertq(x.as_i64x2(), y.as_i64x2()))
}

/// Non-temporal store of `a.0` into `p`.
#[inline(always)]
#[target_feature(enable = "sse4a")]
#[cfg_attr(test, assert_instr(movntsd))]
pub unsafe fn _mm_stream_sd(p: *mut f64, a: f64x2) {
pub unsafe fn _mm_stream_sd(p: *mut f64, a: __m128d) {
movntsd(p, a);
}

/// Non-temporal store of `a.0` into `p`.
#[inline(always)]
#[target_feature(enable = "sse4a")]
#[cfg_attr(test, assert_instr(movntss))]
pub unsafe fn _mm_stream_ss(p: *mut f32, a: f32x4) {
pub unsafe fn _mm_stream_ss(p: *mut f32, a: __m128) {
movntss(p, a);
}

#[cfg(test)]
mod tests {
use stdsimd_test::simd_test;
use x86::i686::sse4a;
use v128::*;
use x86::*;

#[simd_test = "sse4a"]
unsafe fn _mm_extract_si64() {
unsafe fn test_mm_extract_si64() {
let b = 0b0110_0000_0000_i64;
// ^^^^ bit range extracted
let x = i64x2::new(b, 0);
let x = _mm_setr_epi64x(b, 0);
let v = 0b001000___00___000100_i64;
// ^idx: 2^3 = 8 ^length = 2^2 = 4
let y = i64x2::new(v, 0);
let e = i64x2::new(0b0110_i64, 0);
let r = sse4a::_mm_extract_si64(x, y);
let y = _mm_setr_epi64x(v, 0);
let e = _mm_setr_epi64x(0b0110_i64, 0);
let r = _mm_extract_si64(x, y);
assert_eq!(r, e);
}

#[simd_test = "sse4a"]
unsafe fn _mm_insert_si64() {
unsafe fn test_mm_insert_si64() {
let i = 0b0110_i64;
// ^^^^ bit range inserted
let z = 0b1010_1010_1010i64;
// ^^^^ bit range replaced
let e = 0b0110_1010_1010i64;
// ^^^^ replaced 1010 with 0110
let x = i64x2::new(z, 0);
let expected = i64x2::new(e, 0);
let x = _mm_setr_epi64x(z, 0);
let expected = _mm_setr_epi64x(e, 0);
let v = 0b001000___00___000100_i64;
// ^idx: 2^3 = 8 ^length = 2^2 = 4
let y = i64x2::new(i, v);
let r = sse4a::_mm_insert_si64(x, y);
let y = _mm_setr_epi64x(i, v);
let r = _mm_insert_si64(x, y);
assert_eq!(r, expected);
}

Expand All @@ -113,17 +113,17 @@ mod tests {
}

#[simd_test = "sse4a"]
unsafe fn _mm_stream_sd() {
unsafe fn test_mm_stream_sd() {
let mut mem = MemoryF64 {
data: [1.0_f64, 2.0],
};
{
let vals = &mut mem.data;
let d = vals.as_mut_ptr();

let x = f64x2::new(3.0, 4.0);
let x = _mm_setr_pd(3.0, 4.0);

sse4a::_mm_stream_sd(d, x);
_mm_stream_sd(d, x);
}
assert_eq!(mem.data[0], 3.0);
assert_eq!(mem.data[1], 2.0);
Expand All @@ -135,17 +135,17 @@ mod tests {
}

#[simd_test = "sse4a"]
unsafe fn _mm_stream_ss() {
unsafe fn test_mm_stream_ss() {
let mut mem = MemoryF32 {
data: [1.0_f32, 2.0, 3.0, 4.0],
};
{
let vals = &mut mem.data;
let d = vals.as_mut_ptr();

let x = f32x4::new(5.0, 6.0, 7.0, 8.0);
let x = _mm_setr_ps(5.0, 6.0, 7.0, 8.0);

sse4a::_mm_stream_ss(d, x);
_mm_stream_ss(d, x);
}
assert_eq!(mem.data[0], 5.0);
assert_eq!(mem.data[1], 2.0);
Expand Down
11 changes: 11 additions & 0 deletions coresimd/src/x86/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,14 @@ pub unsafe fn get_m256(a: __m256, idx: usize) -> f32 {
union A { a: __m256, b: [f32; 8] };
A { a }.b[idx]
}

// These intrinsics doesn't exist on x86 b/c it requires a 64-bit registe,r which
// doesn't exist on x86!
#[cfg(target_arch = "x86")]
#[target_feature(enable = "avx")]
pub unsafe fn _mm_insert_epi64(a: __m128i, val: i64, idx: i32) -> __m128i {
union A { a: __m128i, b: [i64; 2] };
let mut a = A { a };
a.b[idx as usize] = val;
a.a
}
68 changes: 33 additions & 35 deletions stdsimd-verify/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub fn x86_functions(input: TokenStream) -> TokenStream {

let mut files = Vec::new();
walk(&root, &mut files);
assert!(files.len() > 0);

let mut functions = Vec::new();
for file in files {
Expand All @@ -35,6 +36,7 @@ pub fn x86_functions(input: TokenStream) -> TokenStream {
}
}
}
assert!(functions.len() > 0);

functions.retain(|f| {
match f.vis {
Expand All @@ -48,10 +50,11 @@ pub fn x86_functions(input: TokenStream) -> TokenStream {
.iter()
.filter_map(|a| a.interpret_meta())
.any(|a| match a {
syn::Meta::NameValue(i) => i.ident == "target_feature",
syn::Meta::List(i) => i.ident == "target_feature",
_ => false,
})
});
assert!(functions.len() > 0);

let input = proc_macro2::TokenStream::from(input);

Expand Down Expand Up @@ -97,48 +100,24 @@ pub fn x86_functions(input: TokenStream) -> TokenStream {
fn to_type(t: &syn::Type) -> Tokens {
match *t {
syn::Type::Path(ref p) => match extract_path_ident(&p.path).as_ref() {
"__m128" => my_quote! { &F32x4 },
"__m128d" => my_quote! { &F64x2 },
"__m128i" => my_quote! { &I8x16 },
"__m256i" => my_quote! { &I8x32 },
"__m64" => my_quote! { &I8x8 },
"__m128" => my_quote! { &M128 },
"__m128d" => my_quote! { &M128D },
"__m128i" => my_quote! { &M128I },
"__m256" => my_quote! { &M256 },
"__m256d" => my_quote! { &M256D },
"__m256i" => my_quote! { &M256I },
"__m64" => my_quote! { &M64 },
"bool" => my_quote! { &BOOL },
"f32" => my_quote! { &F32 },
"f32x4" => my_quote! { &F32x4 },
"f32x8" => my_quote! { &F32x8 },
"f64" => my_quote! { &F64 },
"f64x2" => my_quote! { &F64x2 },
"f64x4" => my_quote! { &F64x4 },
"i16" => my_quote! { &I16 },
"i16x16" => my_quote! { &I16x16 },
"i16x4" => my_quote! { &I16x4 },
"i16x8" => my_quote! { &I16x8 },
"i32" => my_quote! { &I32 },
"i32x2" => my_quote! { &I32x2 },
"i32x4" => my_quote! { &I32x4 },
"i32x8" => my_quote! { &I32x8 },
"i64" => my_quote! { &I64 },
"i64x2" => my_quote! { &I64x2 },
"i64x4" => my_quote! { &I64x4 },
"i8" => my_quote! { &I8 },
"i8x16" => my_quote! { &I8x16 },
"i8x32" => my_quote! { &I8x32 },
"i8x8" => my_quote! { &I8x8 },
"u16x4" => my_quote! { &U16x4 },
"u16x8" => my_quote! { &U16x8 },
"u16" => my_quote! { &U16 },
"u32" => my_quote! { &U32 },
"u32x2" => my_quote! { &U32x2 },
"u32x4" => my_quote! { &U32x4 },
"u32x8" => my_quote! { &U32x8 },
"u64" => my_quote! { &U64 },
"u64x2" => my_quote! { &U64x2 },
"u64x4" => my_quote! { &U64x4 },
"u8" => my_quote! { &U8 },
"u16" => my_quote! { &U16 },
"u8x16" => my_quote! { &U8x16 },
"u8x32" => my_quote! { &U8x32 },
"u16x16" => my_quote! { &U16x16 },
"u8x8" => my_quote! { &U8x8 },
s => panic!("unspported type: {}", s),
},
syn::Type::Ptr(syn::TypePtr { ref elem, .. })
Expand Down Expand Up @@ -233,15 +212,34 @@ fn find_target_feature(
.iter()
.filter_map(|a| a.interpret_meta())
.filter_map(|a| match a {
syn::Meta::NameValue(i) => {
syn::Meta::List(i) => {
if i.ident == "target_feature" {
Some(i.lit)
Some(i.nested)
} else {
None
}
}
_ => None,
})
.flat_map(|list| list)
.filter_map(|nested| {
match nested {
syn::NestedMeta::Meta(m) => Some(m),
syn::NestedMeta::Literal(_) => None,
}
})
.filter_map(|m| {
match m {
syn::Meta::NameValue(i) => {
if i.ident == "enable" {
Some(i.lit)
} else {
None
}
}
_ => None,
}
})
.next()
.expect(&format!("failed to find target_feature for {}", name))
}
Loading