mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run alloc benchmarks in Miri and fix UB

Browse Source
This commit is contained in:
Ralf Jung 2022-11-07 10:33:54 +01:00
parent 9b735a7132
commit 780952f922
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/alloc/src/alloc/tests.rs
View File

@ -22,7 +22,6 @@ fn allocate_zeroed() {
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn alloc_owned_small(b: &mut Bencher) { fn alloc_owned_small(b: &mut Bencher) {
b.iter(|| { b.iter(|| {
let _: Box<_> = Box::new(10); let _: Box<_> = Box::new(10);

34
library/alloc/src/collections/vec_deque/tests.rs
View File

@ -3,7 +3,6 @@ use core::iter::TrustedLen;
use super::*; use super::*;
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_push_back_100(b: &mut test::Bencher) { fn bench_push_back_100(b: &mut test::Bencher) {
let mut deq = VecDeque::with_capacity(101); let mut deq = VecDeque::with_capacity(101);
b.iter(|| { b.iter(|| {
@ -16,7 +15,6 @@ fn bench_push_back_100(b: &mut test::Bencher) {
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_push_front_100(b: &mut test::Bencher) { fn bench_push_front_100(b: &mut test::Bencher) {
let mut deq = VecDeque::with_capacity(101); let mut deq = VecDeque::with_capacity(101);
b.iter(|| { b.iter(|| {
@ -29,12 +27,15 @@ fn bench_push_front_100(b: &mut test::Bencher) {
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_pop_back_100(b: &mut test::Bencher) { fn bench_pop_back_100(b: &mut test::Bencher) {
let mut deq = VecDeque::<i32>::with_capacity(101); let size = 100;
let mut deq = VecDeque::<i32>::with_capacity(size+1);
// We'll mess with private state to pretend like `deq` is filled.
// Make sure the buffer is initialized so that we don't read uninit memory.
unsafe { deq.ptr().write_bytes(0u8, size+1) };
b.iter(|| { b.iter(|| {
deq.head = 100; deq.head = size;
deq.tail = 0; deq.tail = 0;
while !deq.is_empty() { while !deq.is_empty() {
test::black_box(deq.pop_back()); test::black_box(deq.pop_back());
@ -43,9 +44,9 @@ fn bench_pop_back_100(b: &mut test::Bencher) {
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_retain_whole_10000(b: &mut test::Bencher) { fn bench_retain_whole_10000(b: &mut test::Bencher) {
let v = (1..100000).collect::<VecDeque<u32>>(); let size = if cfg!(miri) { 1000 } else { 100000 };
let v = (1..size).collect::<VecDeque<u32>>();
b.iter(|| { b.iter(|| {
let mut v = v.clone(); let mut v = v.clone();
@ -54,9 +55,9 @@ fn bench_retain_whole_10000(b: &mut test::Bencher) {
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_retain_odd_10000(b: &mut test::Bencher) { fn bench_retain_odd_10000(b: &mut test::Bencher) {
let v = (1..100000).collect::<VecDeque<u32>>(); let size = if cfg!(miri) { 1000 } else { 100000 };
let v = (1..size).collect::<VecDeque<u32>>();
b.iter(|| { b.iter(|| {
let mut v = v.clone(); let mut v = v.clone();
@ -65,23 +66,26 @@ fn bench_retain_odd_10000(b: &mut test::Bencher) {
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_retain_half_10000(b: &mut test::Bencher) { fn bench_retain_half_10000(b: &mut test::Bencher) {
let v = (1..100000).collect::<VecDeque<u32>>(); let size = if cfg!(miri) { 1000 } else { 100000 };
let v = (1..size).collect::<VecDeque<u32>>();
b.iter(|| { b.iter(|| {
let mut v = v.clone(); let mut v = v.clone();
v.retain(|x| *x > 50000) v.retain(|x| *x > size/2)
}) })
} }
#[bench] #[bench]
#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
fn bench_pop_front_100(b: &mut test::Bencher) { fn bench_pop_front_100(b: &mut test::Bencher) {
let mut deq = VecDeque::<i32>::with_capacity(101); let size = 100;
let mut deq = VecDeque::<i32>::with_capacity(size+1);
// We'll mess with private state to pretend like `deq` is filled.
// Make sure the buffer is initialized so that we don't read uninit memory.
unsafe { deq.ptr().write_bytes(0u8, size+1) };
b.iter(|| { b.iter(|| {
deq.head = 100; deq.head = size;
deq.tail = 0; deq.tail = 0;
while !deq.is_empty() { while !deq.is_empty() {
test::black_box(deq.pop_front()); test::black_box(deq.pop_front());