Hint optimizer about reserved capacity

This commit is contained in:
Kornel 2023-10-09 15:05:32 +01:00
parent 608e9682f0
commit 029fbd67ef
3 changed files with 29 additions and 5 deletions

View File

@ -305,10 +305,13 @@ pub fn reserve_for_push(&mut self, len: usize) {
/// The same as `reserve`, but returns on errors instead of panicking or aborting. /// The same as `reserve`, but returns on errors instead of panicking or aborting.
pub fn try_reserve(&mut self, len: usize, additional: usize) -> Result<(), TryReserveError> { pub fn try_reserve(&mut self, len: usize, additional: usize) -> Result<(), TryReserveError> {
if self.needs_to_grow(len, additional) { if self.needs_to_grow(len, additional) {
self.grow_amortized(len, additional) self.grow_amortized(len, additional)?;
} else {
Ok(())
} }
unsafe {
// Inform the optimizer that the reservation has succeeded or wasn't needed
core::intrinsics::assume(!self.needs_to_grow(len, additional));
}
Ok(())
} }
/// Ensures that the buffer contains at least enough space to hold `len + /// Ensures that the buffer contains at least enough space to hold `len +
@ -339,7 +342,14 @@ pub fn try_reserve_exact(
len: usize, len: usize,
additional: usize, additional: usize,
) -> Result<(), TryReserveError> { ) -> Result<(), TryReserveError> {
if self.needs_to_grow(len, additional) { self.grow_exact(len, additional) } else { Ok(()) } if self.needs_to_grow(len, additional) {
self.grow_exact(len, additional)?;
}
unsafe {
// Inform the optimizer that the reservation has succeeded or wasn't needed
core::intrinsics::assume(!self.needs_to_grow(len, additional));
}
Ok(())
} }
/// Shrinks the buffer down to the specified capacity. If the given amount /// Shrinks the buffer down to the specified capacity. If the given amount

View File

@ -0,0 +1,14 @@
// compile-flags: -O
#![crate_type = "lib"]
// CHECK-LABEL: @should_reserve_once
#[no_mangle]
pub fn should_reserve_once(v: &mut Vec<u8>) {
// CHECK: tail call void @llvm.assume
v.try_reserve(3).unwrap();
// CHECK-NOT: call {{.*}}reserve
// CHECK-NOT: call {{.*}}do_reserve_and_handle
// CHECK-NOT: call {{.*}}__rust_alloc(
v.extend([1, 2, 3]);
}

View File

@ -1,3 +1,3 @@
thread 'main' panicked at library/alloc/src/raw_vec.rs:535:5: thread 'main' panicked at library/alloc/src/raw_vec.rs:545:5:
capacity overflow capacity overflow
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace