Skip to content
Open
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
2 changes: 2 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ fn cfg() {
let ok_arch = matches!(&*target_arch, "x86" | "x86_64");
let sse4_2_guaranteed = target_feature.split(',').any(|f| f == "sse4.2");

println!("cargo::rustc-check-cfg=cfg(jetscii_sse4_2, values(\"yes\", \"maybe\", \"no\"))");

if sse4_2_guaranteed {
println!(r#"cargo:rustc-cfg=jetscii_sse4_2="yes""#);
} else if ok_arch {
Expand Down
2 changes: 1 addition & 1 deletion src/fallback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub struct ByteSubstring<'a> {
}

impl<'a> ByteSubstring<'a> {
pub /* const */ fn new(needle: &'a[u8]) -> Self {
pub const fn new(needle: &'a[u8]) -> Self {
ByteSubstring { needle }
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ pub struct ByteSubstring<'a> {
}

impl<'a> ByteSubstring<'a> {
pub /* const */ fn new(needle: &'a [u8]) -> Self {
pub const fn new(needle: &'a [u8]) -> Self {
ByteSubstring {
#[cfg(any(jetscii_sse4_2 = "yes", jetscii_sse4_2 = "maybe"))]
simd: simd::ByteSubstring::new(needle),
Expand Down
16 changes: 11 additions & 5 deletions src/simd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,18 @@ pub struct ByteSubstring<'a> {
}

impl<'a> ByteSubstring<'a> {
pub /* const */ fn new(needle: &'a[u8]) -> Self {
use std::cmp;

pub const fn new(needle: &'a[u8]) -> Self {
let mut simd_needle = [0; 16];
let len = cmp::min(simd_needle.len(), needle.len());
simd_needle[..len].copy_from_slice(&needle[..len]);
let len = if simd_needle.len() < needle.len() {
simd_needle.len()
} else {
needle.len()
};
let mut i = 0;
while i < len {
simd_needle[i] = needle[i];
i += 1;
}
ByteSubstring {
complete_needle: needle,
needle: unsafe { TransmuteToSimd { bytes: simd_needle }.simd },
Expand Down