-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #74245 - Manishearth:rollup-r0xq9dn, r=Manishearth
Rollup of 10 pull requests Successful merges: - #72920 (Stabilize `transmute` in constants and statics but not const fn) - #73715 (debuginfo: Mangle tuples to be natvis friendly, typedef basic types) - #74066 (Optimize is_ascii for str and [u8].) - #74116 (Fix cross compilation of LLVM to aarch64 Windows targets) - #74167 (linker: illumos ld does not support --eh-frame-hdr) - #74168 (Add a help to use `in_band_lifetimes` in nightly) - #74197 (Reword incorrect `self` token suggestion) - #74213 (Minor refactor for rustc_resolve diagnostics match) - #74240 (Fix #74081 and add the test case from #74236) - #74241 (update miri) Failed merges: r? @ghost
- Loading branch information
Showing
71 changed files
with
955 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| use super::{LONG, MEDIUM, SHORT}; | ||
| use test::black_box; | ||
| use test::Bencher; | ||
|
|
||
| macro_rules! benches { | ||
| ($( fn $name: ident($arg: ident: &[u8]) $body: block )+) => { | ||
| benches!(mod short SHORT[..] $($name $arg $body)+); | ||
| benches!(mod medium MEDIUM[..] $($name $arg $body)+); | ||
| benches!(mod long LONG[..] $($name $arg $body)+); | ||
| // Ensure we benchmark cases where the functions are called with strings | ||
| // that are not perfectly aligned or have a length which is not a | ||
| // multiple of size_of::<usize>() (or both) | ||
| benches!(mod unaligned_head MEDIUM[1..] $($name $arg $body)+); | ||
| benches!(mod unaligned_tail MEDIUM[..(MEDIUM.len() - 1)] $($name $arg $body)+); | ||
| benches!(mod unaligned_both MEDIUM[1..(MEDIUM.len() - 1)] $($name $arg $body)+); | ||
| }; | ||
|
|
||
| (mod $mod_name: ident $input: ident [$range: expr] $($name: ident $arg: ident $body: block)+) => { | ||
| mod $mod_name { | ||
| use super::*; | ||
| $( | ||
| #[bench] | ||
| fn $name(bencher: &mut Bencher) { | ||
| bencher.bytes = $input[$range].len() as u64; | ||
| let mut vec = $input.as_bytes().to_vec(); | ||
| bencher.iter(|| { | ||
| let $arg: &[u8] = &black_box(&mut vec)[$range]; | ||
| black_box($body) | ||
| }) | ||
| } | ||
| )+ | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| benches! { | ||
| fn case00_libcore(bytes: &[u8]) { | ||
| bytes.is_ascii() | ||
| } | ||
|
|
||
| fn case01_iter_all(bytes: &[u8]) { | ||
| bytes.iter().all(|b| b.is_ascii()) | ||
| } | ||
|
|
||
| fn case02_align_to(bytes: &[u8]) { | ||
| is_ascii_align_to(bytes) | ||
| } | ||
|
|
||
| fn case03_align_to_unrolled(bytes: &[u8]) { | ||
| is_ascii_align_to_unrolled(bytes) | ||
| } | ||
| } | ||
|
|
||
| // These are separate since it's easier to debug errors if they don't go through | ||
| // macro expansion first. | ||
| fn is_ascii_align_to(bytes: &[u8]) -> bool { | ||
| if bytes.len() < core::mem::size_of::<usize>() { | ||
| return bytes.iter().all(|b| b.is_ascii()); | ||
| } | ||
| // SAFETY: transmuting a sequence of `u8` to `usize` is always fine | ||
| let (head, body, tail) = unsafe { bytes.align_to::<usize>() }; | ||
| head.iter().all(|b| b.is_ascii()) | ||
| && body.iter().all(|w| !contains_nonascii(*w)) | ||
| && tail.iter().all(|b| b.is_ascii()) | ||
| } | ||
|
|
||
| fn is_ascii_align_to_unrolled(bytes: &[u8]) -> bool { | ||
| if bytes.len() < core::mem::size_of::<usize>() { | ||
| return bytes.iter().all(|b| b.is_ascii()); | ||
| } | ||
| // SAFETY: transmuting a sequence of `u8` to `[usize; 2]` is always fine | ||
| let (head, body, tail) = unsafe { bytes.align_to::<[usize; 2]>() }; | ||
| head.iter().all(|b| b.is_ascii()) | ||
| && body.iter().all(|w| !contains_nonascii(w[0] | w[1])) | ||
| && tail.iter().all(|b| b.is_ascii()) | ||
| } | ||
|
|
||
| #[inline] | ||
| fn contains_nonascii(v: usize) -> bool { | ||
| const NONASCII_MASK: usize = 0x80808080_80808080u64 as usize; | ||
| (NONASCII_MASK & v) != 0 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.