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

simd: reduce pub functions visibility #182

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

simd: reduce pub functions visibility #182

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/simd/avx2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::iter::Bytes;

#[inline]
#[target_feature(enable = "avx2", enable = "sse4.2")]
pub unsafe fn match_uri_vectored(bytes: &mut Bytes) {
pub(crate) unsafe fn match_uri_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 32 {
let advance = match_url_char_32_avx(bytes.as_ref());
bytes.advance(advance);
Expand Down Expand Up @@ -57,7 +57,7 @@ unsafe fn match_url_char_32_avx(buf: &[u8]) -> usize {
}

#[target_feature(enable = "avx2", enable = "sse4.2")]
pub unsafe fn match_header_value_vectored(bytes: &mut Bytes) {
pub(crate) unsafe fn match_header_value_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 32 {
let advance = match_header_value_char_32_avx(bytes.as_ref());
bytes.advance(advance);
Expand Down
22 changes: 11 additions & 11 deletions src/simd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mod swar;
)
),
)))]
pub use self::swar::*;
pub(crate) use self::swar::*;

#[cfg(all(
httparse_simd,
Expand Down Expand Up @@ -59,7 +59,7 @@ mod runtime;
target_arch = "x86_64",
),
))]
pub use self::runtime::*;
pub(crate) use self::runtime::*;

#[cfg(all(
httparse_simd,
Expand All @@ -72,18 +72,18 @@ pub use self::runtime::*;
))]
mod sse42_compile_time {
#[inline(always)]
pub fn match_header_name_vectored(b: &mut crate::iter::Bytes<'_>) {
pub(crate) fn match_header_name_vectored(b: &mut crate::iter::Bytes<'_>) {
super::swar::match_header_name_vectored(b);
}

#[inline(always)]
pub fn match_uri_vectored(b: &mut crate::iter::Bytes<'_>) {
pub(crate) fn match_uri_vectored(b: &mut crate::iter::Bytes<'_>) {
// SAFETY: calls are guarded by a compile time feature check
unsafe { crate::simd::sse42::match_uri_vectored(b) }
}

#[inline(always)]
pub fn match_header_value_vectored(b: &mut crate::iter::Bytes<'_>) {
pub(crate) fn match_header_value_vectored(b: &mut crate::iter::Bytes<'_>) {
// SAFETY: calls are guarded by a compile time feature check
unsafe { crate::simd::sse42::match_header_value_vectored(b) }
}
Expand All @@ -98,7 +98,7 @@ mod sse42_compile_time {
target_arch = "x86_64",
),
))]
pub use self::sse42_compile_time::*;
pub(crate) use self::sse42_compile_time::*;

#[cfg(all(
httparse_simd,
Expand All @@ -110,18 +110,18 @@ pub use self::sse42_compile_time::*;
))]
mod avx2_compile_time {
#[inline(always)]
pub fn match_header_name_vectored(b: &mut crate::iter::Bytes<'_>) {
pub(crate) fn match_header_name_vectored(b: &mut crate::iter::Bytes<'_>) {
super::swar::match_header_name_vectored(b);
}

#[inline(always)]
pub fn match_uri_vectored(b: &mut crate::iter::Bytes<'_>) {
pub(crate) fn match_uri_vectored(b: &mut crate::iter::Bytes<'_>) {
// SAFETY: calls are guarded by a compile time feature check
unsafe { crate::simd::avx2::match_uri_vectored(b) }
}

#[inline(always)]
pub fn match_header_value_vectored(b: &mut crate::iter::Bytes<'_>) {
pub(crate) fn match_header_value_vectored(b: &mut crate::iter::Bytes<'_>) {
// SAFETY: calls are guarded by a compile time feature check
unsafe { crate::simd::avx2::match_header_value_vectored(b) }
}
Expand All @@ -135,7 +135,7 @@ mod avx2_compile_time {
target_arch = "x86_64",
),
))]
pub use self::avx2_compile_time::*;
pub(crate) use self::avx2_compile_time::*;

#[cfg(all(
httparse_simd,
Expand All @@ -149,4 +149,4 @@ mod neon;
target_arch = "aarch64",
httparse_simd_neon_intrinsics,
))]
pub use self::neon::*;
pub(crate) use self::neon::*;
6 changes: 3 additions & 3 deletions src/simd/neon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::iter::Bytes;
use core::arch::aarch64::*;

#[inline]
pub fn match_header_name_vectored(bytes: &mut Bytes) {
pub(crate) fn match_header_name_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 16 {
// SAFETY: ensured that there are at least 16 bytes remaining
unsafe {
Expand All @@ -18,7 +18,7 @@ pub fn match_header_name_vectored(bytes: &mut Bytes) {
}

#[inline]
pub fn match_header_value_vectored(bytes: &mut Bytes) {
pub(crate) fn match_header_value_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 16 {
// SAFETY: ensured that there are at least 16 bytes remaining
unsafe {
Expand All @@ -34,7 +34,7 @@ pub fn match_header_value_vectored(bytes: &mut Bytes) {
}

#[inline]
pub fn match_uri_vectored(bytes: &mut Bytes) {
pub(crate) fn match_uri_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 16 {
// SAFETY: ensured that there are at least 16 bytes remaining
unsafe {
Expand Down
6 changes: 3 additions & 3 deletions src/simd/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ fn get_runtime_feature() -> u8 {
feature
}

pub fn match_header_name_vectored(bytes: &mut Bytes) {
pub(crate) fn match_header_name_vectored(bytes: &mut Bytes) {
super::swar::match_header_name_vectored(bytes);
}

pub fn match_uri_vectored(bytes: &mut Bytes) {
pub(crate) fn match_uri_vectored(bytes: &mut Bytes) {
// SAFETY: calls are guarded by a feature check
unsafe {
match get_runtime_feature() {
Expand All @@ -45,7 +45,7 @@ pub fn match_uri_vectored(bytes: &mut Bytes) {
}
}

pub fn match_header_value_vectored(bytes: &mut Bytes) {
pub(crate) fn match_header_value_vectored(bytes: &mut Bytes) {
// SAFETY: calls are guarded by a feature check
unsafe {
match get_runtime_feature() {
Expand Down
4 changes: 2 additions & 2 deletions src/simd/sse42.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::iter::Bytes;

#[target_feature(enable = "sse4.2")]
pub unsafe fn match_uri_vectored(bytes: &mut Bytes) {
pub(crate) unsafe fn match_uri_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 16 {
let advance = match_url_char_16_sse(bytes.as_ref());
bytes.advance(advance);
Expand Down Expand Up @@ -62,7 +62,7 @@ unsafe fn match_url_char_16_sse(buf: &[u8]) -> usize {
}

#[target_feature(enable = "sse4.2")]
pub unsafe fn match_header_value_vectored(bytes: &mut Bytes) {
pub(crate) unsafe fn match_header_value_vectored(bytes: &mut Bytes) {
while bytes.as_ref().len() >= 16 {
let advance = match_header_value_char_16_sse(bytes.as_ref());
bytes.advance(advance);
Expand Down
6 changes: 3 additions & 3 deletions src/simd/swar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const BLOCK_SIZE: usize = core::mem::size_of::<usize>();
type ByteBlock = [u8; BLOCK_SIZE];

#[inline]
pub fn match_uri_vectored(bytes: &mut Bytes) {
pub(crate) fn match_uri_vectored(bytes: &mut Bytes) {
loop {
if let Some(bytes8) = bytes.peek_n::<ByteBlock>(BLOCK_SIZE) {
let n = match_uri_char_8_swar(bytes8);
Expand Down Expand Up @@ -35,7 +35,7 @@ pub fn match_uri_vectored(bytes: &mut Bytes) {
}

#[inline]
pub fn match_header_value_vectored(bytes: &mut Bytes) {
pub(crate) fn match_header_value_vectored(bytes: &mut Bytes) {
loop {
if let Some(bytes8) = bytes.peek_n::<ByteBlock>(BLOCK_SIZE) {
let n = match_header_value_char_8_swar(bytes8);
Expand Down Expand Up @@ -63,7 +63,7 @@ pub fn match_header_value_vectored(bytes: &mut Bytes) {
}

#[inline]
pub fn match_header_name_vectored(bytes: &mut Bytes) {
pub(crate) fn match_header_name_vectored(bytes: &mut Bytes) {
while let Some(block) = bytes.peek_n::<ByteBlock>(BLOCK_SIZE) {
let n = match_block(is_header_name_token, block);
// SAFETY: using peek_n to retrieve the bytes ensures that there are at least n more bytes
Expand Down
Loading