RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 02:57:44 +00:00
Code Issues Activity

Merge pull request #7934 from drinkcat/wc-faster

Browse source 
wc: Speed optimization
This commit is contained in:
Sylvestre Ledru 2025-05-15 08:44:50 +02:00 • committed by GitHub
commit c76c0ad2dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/uu/wc/src/count_fast.rs
View file

@ -32,7 +32,7 @@ use libc::S_IFIFO;
#[cfg(any(target_os = "linux", target_os = "android"))]
use uucore::pipes::{pipe, splice, splice_exact};
const BUF_SIZE: usize = 16 * 1024;
const BUF_SIZE: usize = 256 * 1024;
#[cfg(any(target_os = "linux", target_os = "android"))]
const SPLICE_SIZE: usize = 128 * 1024;
@ -197,6 +197,23 @@ pub(crate) fn count_bytes_fast<T: WordCountable>(handle: &mut T) -> (usize, Opti
}
}
/// A simple structure used to align a BUF_SIZE buffer to 32-byte boundary.
///
/// This is useful as bytecount uses 256-bit wide vector operations that run much
/// faster on aligned data (at least on x86 with AVX2 support).
#[repr(align(32))]
struct AlignedBuffer {
data: [u8; BUF_SIZE],
}
impl Default for AlignedBuffer {
fn default() -> Self {
Self {
data: [0; BUF_SIZE],
}
}
}
/// Returns a WordCount that counts the number of bytes, lines, and/or the number of Unicode characters encoded in UTF-8 read via a Reader.
///
/// This corresponds to the `-c`, `-l` and `-m` command line flags to wc.
@ -213,9 +230,9 @@ pub(crate) fn count_bytes_chars_and_lines_fast<
handle: &mut R,
) -> (WordCount, Option<io::Error>) {
let mut total = WordCount::default();
let mut buf = [0; BUF_SIZE];
let buf: &mut [u8] = &mut AlignedBuffer::default().data;
loop {
match handle.read(&mut buf) {
match handle.read(buf) {
Ok(0) => return (total, None),
Ok(n) => {
if COUNT_BYTES {