Skip to content

Enable multiple #[assert_instr] attributes #96

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 2 commits into from
Oct 6, 2017
Merged

Enable multiple #[assert_instr] attributes #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c9a1d9
Enable multiple #[assert_instr] attributes
alexcrichton Oct 5, 2017
f56b445
Uncomment assertions for `_mm_prefetch`
alexcrichton Oct 5, 2017
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
6 changes: 3 additions & 3 deletions src/x86/sse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,9 @@ pub const _MM_HINT_NTA: i8 = 0;
#[inline(always)]
#[target_feature = "+sse"]
#[cfg_attr(test, assert_instr(prefetcht0, strategy = _MM_HINT_T0))]
// #[cfg_attr(test, assert_instr(prefetcht1, strategy = _MM_HINT_T1))]
// #[cfg_attr(test, assert_instr(prefetcht2, strategy = _MM_HINT_T2))]
// #[cfg_attr(test, assert_instr(prefetchnta, strategy = _MM_HINT_NTA))]
#[cfg_attr(test, assert_instr(prefetcht1, strategy = _MM_HINT_T1))]
#[cfg_attr(test, assert_instr(prefetcht2, strategy = _MM_HINT_T2))]
#[cfg_attr(test, assert_instr(prefetchnta, strategy = _MM_HINT_NTA))]
pub unsafe fn _mm_prefetch(p: *const c_void, strategy: i8) {
// The `strategy` must be a compile-time constant, so we use a short form of
// `constify_imm8!` for now.
Expand Down
9 changes: 7 additions & 2 deletions stdsimd-test/assert-instr-macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ pub fn assert_instr(attr: proc_macro::TokenStream,
(quote! { #[ignore] }).into()
};
let name = &func.ident;
let assert_name = syn::Ident::from(&format!("assert_{}", name.sym.as_str())[..]);
let assert_name = syn::Ident::from(&format!("assert_{}_{}",
name.sym.as_str(),
instr.sym.as_str())[..]);
let shim_name = syn::Ident::from(&format!("{}_shim", name.sym.as_str())[..]);
let (to_test, test_name) = if invoc.args.len() == 0 {
(TokenStream::empty(), &func.ident)
Expand All @@ -67,7 +69,10 @@ pub fn assert_instr(attr: proc_macro::TokenStream,
}
};
}
let attrs = Append(&item.attrs);
let attrs = item.attrs.iter().filter(|attr| {
attr.path.segments.get(0).item().ident.sym.as_str().starts_with("target")
}).collect::<Vec<_>>();
let attrs = Append(&attrs);
(quote! {
#attrs
unsafe fn #shim_name(#(#inputs),*) #ret {
Expand Down