Skip to content
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

Jump to bottom

Make this crate build on big-endian aarch64. #162

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make this crate build on big-endian aarch64. #162

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
4 changes: 2 additions & 2 deletions src/arch/aarch64/memchr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ available for `aarch64` targets.)

macro_rules! defraw {
($ty:ident, $find:ident, $start:ident, $end:ident, $($needles:ident),+) => {{
#[cfg(target_feature = "neon")]
#[cfg(all(target_feature = "neon", target_endian = "little"))]
{
use crate::arch::aarch64::neon::memchr::$ty;

Expand All @@ -19,7 +19,7 @@ macro_rules! defraw {
// enabled.
$ty::new_unchecked($($needles),+).$find($start, $end)
}
#[cfg(not(target_feature = "neon"))]
#[cfg(not(all(target_feature = "neon", target_endian = "little")))]
{
use crate::arch::all::memchr::$ty;

Expand Down
2 changes: 2 additions & 0 deletions src/arch/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Vector algorithms for the `aarch64` target.
*/

#[cfg(target_endian = "little")]
pub mod neon;

#[cfg(target_endian = "little")]
pub(crate) mod memchr;
28 changes: 14 additions & 14 deletions src/memchr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,14 +518,14 @@ unsafe fn memchr_raw(
{
crate::arch::wasm32::memchr::memchr_raw(needle, start, end)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::memchr_raw(needle, start, end)
}
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::One::new(needle).find_raw(start, end)
Expand All @@ -551,14 +551,14 @@ unsafe fn memrchr_raw(
{
crate::arch::wasm32::memchr::memrchr_raw(needle, start, end)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::memrchr_raw(needle, start, end)
}
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::One::new(needle).rfind_raw(start, end)
Expand All @@ -585,14 +585,14 @@ unsafe fn memchr2_raw(
{
crate::arch::wasm32::memchr::memchr2_raw(needle1, needle2, start, end)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::memchr2_raw(needle1, needle2, start, end)
}
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::Two::new(needle1, needle2)
Expand Down Expand Up @@ -620,7 +620,7 @@ unsafe fn memrchr2_raw(
{
crate::arch::wasm32::memchr::memrchr2_raw(needle1, needle2, start, end)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::memrchr2_raw(
needle1, needle2, start, end,
Expand All @@ -629,7 +629,7 @@ unsafe fn memrchr2_raw(
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::Two::new(needle1, needle2)
Expand Down Expand Up @@ -662,7 +662,7 @@ unsafe fn memchr3_raw(
needle1, needle2, needle3, start, end,
)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::memchr3_raw(
needle1, needle2, needle3, start, end,
Expand All @@ -671,7 +671,7 @@ unsafe fn memchr3_raw(
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::Three::new(needle1, needle2, needle3)
Expand Down Expand Up @@ -704,7 +704,7 @@ unsafe fn memrchr3_raw(
needle1, needle2, needle3, start, end,
)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::memrchr3_raw(
needle1, needle2, needle3, start, end,
Expand All @@ -713,7 +713,7 @@ unsafe fn memrchr3_raw(
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::Three::new(needle1, needle2, needle3)
Expand All @@ -736,14 +736,14 @@ unsafe fn count_raw(needle: u8, start: *const u8, end: *const u8) -> usize {
{
crate::arch::wasm32::memchr::count_raw(needle, start, end)
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
crate::arch::aarch64::memchr::count_raw(needle, start, end)
}
#[cfg(not(any(
target_arch = "x86_64",
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
crate::arch::all::memchr::One::new(needle).count_raw(start, end)
Expand Down
16 changes: 8 additions & 8 deletions src/memmem/searcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::arch::all::{
rabinkarp, twoway,
};

#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
use crate::arch::aarch64::neon::packedpair as neon;
#[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
use crate::arch::wasm32::simd128::packedpair as simd128;
Expand Down Expand Up @@ -129,7 +129,7 @@ impl Searcher {
Searcher::twoway(needle, rabinkarp, prestrat)
}
}
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
{
if let Some(pp) = neon::Finder::with_pair(needle, pair) {
if do_packed_search(needle) {
Expand All @@ -152,7 +152,7 @@ impl Searcher {
#[cfg(not(any(
all(target_arch = "x86_64", target_feature = "sse2"),
all(target_arch = "wasm32", target_feature = "simd128"),
target_arch = "aarch64"
all(target_arch = "aarch64", target_endian = "little")
)))]
{
if prefilter.is_none() {
Expand Down Expand Up @@ -253,7 +253,7 @@ union SearcherKind {
avx2: crate::arch::x86_64::avx2::packedpair::Finder,
#[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
simd128: crate::arch::wasm32::simd128::packedpair::Finder,
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
neon: crate::arch::aarch64::neon::packedpair::Finder,
}

Expand Down Expand Up @@ -421,7 +421,7 @@ unsafe fn searcher_kind_simd128(
/// # Safety
///
/// Callers must ensure that the `searcher.kind.neon` union field is set.
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
unsafe fn searcher_kind_neon(
searcher: &Searcher,
_prestate: &mut PrefilterState,
Expand Down Expand Up @@ -686,7 +686,7 @@ impl Prefilter {
}

/// Return a prefilter using a aarch64 neon vector algorithm.
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
#[inline]
fn neon(finder: neon::Finder, needle: &[u8]) -> Prefilter {
trace!("building aarch64 neon prefilter");
Expand Down Expand Up @@ -763,7 +763,7 @@ union PrefilterKind {
avx2: crate::arch::x86_64::avx2::packedpair::Finder,
#[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
simd128: crate::arch::wasm32::simd128::packedpair::Finder,
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
neon: crate::arch::aarch64::neon::packedpair::Finder,
}

Expand Down Expand Up @@ -852,7 +852,7 @@ unsafe fn prefilter_kind_simd128(
/// # Safety
///
/// Callers must ensure that the `strat.kind.neon` union field is set.
#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
unsafe fn prefilter_kind_neon(
strat: &Prefilter,
haystack: &[u8],
Expand Down
2 changes: 1 addition & 1 deletion src/vector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ mod x86avx2 {
}
}

#[cfg(target_arch = "aarch64")]
#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
mod aarch64neon {
use core::arch::aarch64::*;

Expand Down
Loading