bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #137360 - real-eren:rustc_span/use-chunks-exact, r=Noratrieb

Browse source 
Use `as_chunks` in `analyze_source_file_sse2`

Follow-up to #136460. Uses a slightly cleaner method of iterating over chunks of bytes.
This commit is contained in:
León Orell Valerian Liehr 2025-02-25 13:32:53 +01:00 • committed by GitHub
commit da31d840de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_span/src/analyze_source_file.rs
View file

@ -68,9 +68,7 @@ cfg_match! {
const CHUNK_SIZE: usize = 16; const CHUNK_SIZE: usize = 16;
let src_bytes = src.as_bytes(); let (chunks, tail) = src.as_bytes().as_chunks::<CHUNK_SIZE>();
let chunk_count = src.len() / CHUNK_SIZE;
// This variable keeps track of where we should start decoding a // This variable keeps track of where we should start decoding a
// chunk. If a multi-byte character spans across chunk boundaries, // chunk. If a multi-byte character spans across chunk boundaries,
@ -78,11 +76,10 @@ cfg_match! {
// handled it. // handled it.
let mut intra_chunk_offset = 0; let mut intra_chunk_offset = 0;
for chunk_index in 0..chunk_count { for (chunk_index, chunk) in chunks.iter().enumerate() {
let ptr = src_bytes.as_ptr() as *const __m128i;
// We don't know if the pointer is aligned to 16 bytes, so we // We don't know if the pointer is aligned to 16 bytes, so we
// use `loadu`, which supports unaligned loading. // use `loadu`, which supports unaligned loading.
let chunk = unsafe { _mm_loadu_si128(ptr.add(chunk_index)) }; let chunk = unsafe { _mm_loadu_si128(chunk.as_ptr() as *const __m128i) };
// For character in the chunk, see if its byte value is < 0, which // For character in the chunk, see if its byte value is < 0, which
// indicates that it's part of a UTF-8 char. // indicates that it's part of a UTF-8 char.
@ -123,7 +120,7 @@ cfg_match! {
} }
// There might still be a tail left to analyze // There might still be a tail left to analyze
let tail_start = chunk_count * CHUNK_SIZE + intra_chunk_offset; let tail_start = src.len() - tail.len() + intra_chunk_offset;
if tail_start < src.len() { if tail_start < src.len() {
analyze_source_file_generic( analyze_source_file_generic(
&src[tail_start..], &src[tail_start..],

1
compiler/rustc_span/src/lib.rs
View file

@ -31,6 +31,7 @@
#![feature(round_char_boundary)] #![feature(round_char_boundary)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(rustdoc_internals)] #![feature(rustdoc_internals)]
#![feature(slice_as_chunks)]
#![warn(unreachable_pub)] #![warn(unreachable_pub)]
// tidy-alphabetical-end // tidy-alphabetical-end