Skip to content

chore: cleanup codes #33

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 10 commits into from
Oct 13, 2025
Merged

chore: cleanup codes #33

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0b16945
chore: cleanup codes
Brooooooklyn Oct 13, 2025
c3e9712
add asan
Brooooooklyn Oct 13, 2025
637d58a
more asan
Brooooooklyn Oct 13, 2025
1763532
asan option
Brooooooklyn Oct 13, 2025
ba15d95
asan option
Brooooooklyn Oct 13, 2025
6918410
memtag
Brooooooklyn Oct 13, 2025
ef8d294
fix asan
Brooooooklyn Oct 13, 2025
08127ad
fix
Brooooooklyn Oct 13, 2025
96d4888
fix
Brooooooklyn Oct 13, 2025
02d76d8
remove cfi
Brooooooklyn Oct 13, 2025
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
77 changes: 77 additions & 0 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,83 @@ jobs:
run: cargo miri test
env:
MIRIFLAGS: "-Zmiri-disable-isolation"

asan:
name: ASAN - ${{ matrix.os }} - ${{ matrix.asan.flag }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, windows-latest]
asan:
- flag: sanitizer=address
options: detect_leaks=1 detect_stack_use_after_return=1
- flag: sanitizer=memory
options: ''

steps:
- uses: actions/checkout@v5

- name: Setup node
uses: actions/setup-node@v5
with:
node-version: 22
cache: 'yarn'

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: nightly
components: rust-src

- name: Install dependencies
run: yarn install --immutable --mode=skip-build

- name: Download fixtures
run: node download-fixtures.js
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Test with ASAN (Linux)
if: matrix.os == 'ubuntu-24.04'
run: cargo test --tests --target x86_64-unknown-linux-gnu
env:
RUST_TARGET: x86_64-unknown-linux-gnu
RUST_BACKTRACE: 1
RUSTFLAGS: "-Z${{ matrix.asan.flag }}"
ASAN_OPTIONS: ${{ matrix.asan.options }}
CARGO_UNSTABLE_BUILD_STD: std,panic_abort

- name: Test with ASAN (Windows)
if: matrix.os == 'windows-latest'
shell: pwsh
run: |
# Set ASAN environment variables for Windows
$env:ASAN_OPTIONS = "windows_hook_rtl_allocators=true:detect_leaks=0:print_stats=1:check_initialization_order=true:strict_string_checks=true"

# Find and set the path to the ASAN runtime DLL
$vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
$asanDllPath = Get-ChildItem -Path "$vsPath\VC\Tools\MSVC" -Recurse -Filter "clang_rt.asan_dynamic-x86_64.dll" | Select-Object -First 1
if ($asanDllPath) {
$env:PATH = "$($asanDllPath.DirectoryName);$env:PATH"
Write-Host "Found ASAN DLL at: $($asanDllPath.FullName)"
}
cargo test --tests --target x86_64-pc-windows-msvc
env:
RUSTFLAGS: -Z${{ matrix.asan.flag }}
RUST_BACKTRACE: 1
CARGO_PROFILE_DEV_OPT_LEVEL: 1
CARGO_UNSTABLE_BUILD_STD: std,panic_abort

- name: Upload ASAN logs (Windows)
if: failure() && matrix.os == 'windows-latest'
uses: actions/upload-artifact@v4
with:
name: windows-asan-logs
path: |
asan.log*
*.asan.log

bench:
strategy:
matrix:
Expand Down
34 changes: 18 additions & 16 deletions src/simd/avx2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,25 +220,27 @@ pub unsafe fn format_string(value: &str, dst: &mut [u8]) -> usize {
// Handle remaining bytes
let mut placeholder: [u8; LANES] = [0; LANES];
while nb > 0 {
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
let v = {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd256u::loadu(placeholder.as_ptr())
};
#[cfg(any(target_os = "linux", target_os = "macos"))]
let v = {
if check_cross_page(sptr, LANES) {
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd256u::loadu(placeholder.as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
Simd256u::loadu(placeholder[..].as_ptr())
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
{
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd256u::loadu(placeholder.as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd256u::loadu(sptr)
Simd256u::loadu(placeholder[..].as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd256u::loadu(placeholder[..].as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd256u::loadu(sptr)
}
}
}
};
Expand Down
38 changes: 20 additions & 18 deletions src/simd/avx512.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,25 +212,27 @@ pub unsafe fn format_string(value: &str, dst: &mut [u8]) -> usize {
// Handle remaining bytes
let mut placeholder: [u8; LANES] = [0; LANES];
while nb > 0 {
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
let v = {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd512u::loadu(placeholder.as_ptr())
};
#[cfg(any(target_os = "linux", target_os = "macos"))]
let v = {
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd512u::loadu(placeholder.as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd512u::loadu(placeholder.as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd512u::loadu(sptr)
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd512u::loadu(placeholder[..].as_ptr())
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
{
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd512u::loadu(placeholder[..].as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd512u::loadu(placeholder[..].as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd512u::loadu(sptr)
}
}
}
};
Expand Down
40 changes: 21 additions & 19 deletions src/simd/neon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,27 +219,29 @@ pub unsafe fn format_string(value: &str, dst: &mut [u8]) -> usize {
}

// Handle remaining bytes
let mut placeholder: [u8; 16] = [0; 16];
let mut placeholder: [u8; LANES] = [0; LANES];
while nb > 0 {
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
let v = {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
};
#[cfg(any(target_os = "linux", target_os = "macos"))]
let v = {
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd128u::loadu(sptr)
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
{
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd128u::loadu(sptr)
}
}
}
};
Expand Down
42 changes: 22 additions & 20 deletions src/simd/sse2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,27 +215,29 @@ pub unsafe fn format_string(value: &str, dst: &mut [u8]) -> usize {
}

// Handle remaining bytes
let mut placeholder: [u8; 16] = [0; 16];
let mut placeholder: [u8; LANES] = [0; LANES];
while nb > 0 {
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
let v = {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
};
#[cfg(any(target_os = "linux", target_os = "macos"))]
let v = {
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd128u::loadu(sptr)
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
{
if check_cross_page(sptr, LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd128u::loadu(sptr)
}
}
}
};
Expand All @@ -247,7 +249,7 @@ pub unsafe fn format_string(value: &str, dst: &mut [u8]) -> usize {
dptr = dptr.add(nb);
break;
} else {
let cn = mask.trailing_zeros() as usize;
let cn = mask.first_offset();
nb -= cn;
dptr = dptr.add(cn);
sptr = sptr.add(cn);
Expand Down
56 changes: 31 additions & 25 deletions src/simd/v128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
use std::ops::{BitAnd, BitOr, BitOrAssign};

use crate::simd::traits::BitMask;

use super::{Mask, Simd, util::escape_unchecked};

#[cfg(any(target_os = "linux", target_os = "macos"))]
use super::util::check_cross_page;

const LANES: usize = 16;

#[derive(Debug)]
pub struct Simd128u([u8; 16]);

Expand Down Expand Up @@ -124,17 +128,17 @@ pub fn format_string(value: &str, dst: &mut [u8]) -> usize {
dptr = dptr.add(1);

// Main loop: process LANES bytes at a time
while nb >= Simd128u::LANES {
while nb >= LANES {
let v = Simd128u::loadu(sptr);
v.storeu(dptr);
let mask = escaped_mask(v);

if mask == 0 {
nb -= Simd128u::LANES;
dptr = dptr.add(Simd128u::LANES);
sptr = sptr.add(Simd128u::LANES);
nb -= LANES;
dptr = dptr.add(LANES);
sptr = sptr.add(LANES);
} else {
let cn = mask.trailing_zeros() as usize;
let cn = mask.first_offset();
nb -= cn;
dptr = dptr.add(cn);
sptr = sptr.add(cn);
Expand All @@ -143,27 +147,29 @@ pub fn format_string(value: &str, dst: &mut [u8]) -> usize {
}

// Handle remaining bytes
let mut placeholder: [u8; 16] = [0; 16];
let mut placeholder: [u8; LANES] = [0; LANES];
while nb > 0 {
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
let v = {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
};
#[cfg(any(target_os = "linux", target_os = "macos"))]
let v = {
if check_cross_page(sptr, Simd128u::LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder.as_mut_ptr(), nb);
Simd128u::loadu(placeholder.as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd128u::loadu(sptr)
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
{
if check_cross_page(sptr, Simd128u::LANES) {
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
} else {
#[cfg(any(debug_assertions, miri))]
{
std::ptr::copy_nonoverlapping(sptr, placeholder[..].as_mut_ptr(), nb);
Simd128u::loadu(placeholder[..].as_ptr())
}
#[cfg(not(any(debug_assertions, miri)))]
{
Simd128u::loadu(sptr)
}
}
}
};
Expand All @@ -177,7 +183,7 @@ pub fn format_string(value: &str, dst: &mut [u8]) -> usize {
dptr = dptr.add(nb);
break;
} else {
let cn = mask.trailing_zeros() as usize;
let cn = mask.first_offset();
nb -= cn;
dptr = dptr.add(cn);
sptr = sptr.add(cn);
Expand Down
Loading