Migrate to core::hint::black_box() (#16980)

# Objective

Many of our benchmarks use
[`criterion::black_box()`](https://docs.rs/criterion/latest/criterion/fn.black_box.html),
which is used to prevent the compiler from optimizing away computation
that we're trying to time. This can be slow, though, because
`criterion::black_box()` forces a point read each time it is called
through
[`ptr::road_volatile()`](https://doc.rust-lang.org/stable/std/ptr/fn.read_volatile.html).

In Rust 1.66, the standard library introduced
[`core::hint::black_box()`](https://doc.rust-lang.org/nightly/std/hint/fn.black_box.html)
(and `std::hint::black_box()`). This is an intended replacement for
`criterion`'s version that uses compiler intrinsics instead of volatile
pointer reads, and thus has no runtime overhead. This increases
benchmark accuracy, which is always nice 👍

Note that benchmarks may _appear_ to improve in performance after this
change, but that's just because we are eliminating the pointer read
overhead.

## Solution

- Deny `criterion::black_box` in `clippy.toml`.
- Fix all imports.

## Testing

- `cargo clippy -p benches --benches`
This commit is contained in:
BD103 2024-12-29 14:33:42 -05:00 committed by GitHub
parent f391522483
commit 17ad855653
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 48 additions and 23 deletions

View File

@ -1,3 +1,5 @@
use core::hint::black_box;
use bevy_ecs::{ use bevy_ecs::{
component::{Component, Mutable}, component::{Component, Mutable},
entity::Entity, entity::Entity,
@ -5,7 +7,7 @@ use bevy_ecs::{
query::QueryFilter, query::QueryFilter,
world::World, world::World,
}; };
use criterion::{black_box, criterion_group, Criterion}; use criterion::{criterion_group, Criterion};
use rand::{prelude::SliceRandom, SeedableRng}; use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng; use rand_chacha::ChaCha8Rng;

View File

@ -1,5 +1,7 @@
use core::hint::black_box;
use bevy_ecs::{component::Component, prelude::*, schedule::ExecutorKind, world::World}; use bevy_ecs::{component::Component, prelude::*, schedule::ExecutorKind, world::World};
use criterion::{black_box, criterion_group, BenchmarkId, Criterion}; use criterion::{criterion_group, BenchmarkId, Criterion};
criterion_group!(benches, empty_archetypes); criterion_group!(benches, empty_archetypes);

View File

@ -1,10 +1,12 @@
use core::hint::black_box;
use bevy_ecs::bundle::Bundle; use bevy_ecs::bundle::Bundle;
use bevy_ecs::reflect::AppTypeRegistry; use bevy_ecs::reflect::AppTypeRegistry;
use bevy_ecs::{component::Component, reflect::ReflectComponent, world::World}; use bevy_ecs::{component::Component, reflect::ReflectComponent, world::World};
use bevy_hierarchy::{BuildChildren, CloneEntityHierarchyExt}; use bevy_hierarchy::{BuildChildren, CloneEntityHierarchyExt};
use bevy_math::Mat4; use bevy_math::Mat4;
use bevy_reflect::{GetTypeRegistration, Reflect}; use bevy_reflect::{GetTypeRegistration, Reflect};
use criterion::{black_box, criterion_group, criterion_main, Bencher, Criterion}; use criterion::{criterion_group, criterion_main, Bencher, Criterion};
criterion_group!(benches, reflect_benches, clone_benches); criterion_group!(benches, reflect_benches, clone_benches);
criterion_main!(benches); criterion_main!(benches);

View File

@ -1,9 +1,11 @@
use core::hint::black_box;
use bevy_ecs::{ use bevy_ecs::{
component::Component, entity::Entity, event::Event, observer::Trigger, world::World, component::Component, entity::Entity, event::Event, observer::Trigger, world::World,
}; };
use bevy_hierarchy::{BuildChildren, Parent}; use bevy_hierarchy::{BuildChildren, Parent};
use criterion::{black_box, Criterion}; use criterion::Criterion;
use rand::SeedableRng; use rand::SeedableRng;
use rand::{seq::IteratorRandom, Rng}; use rand::{seq::IteratorRandom, Rng};
use rand_chacha::ChaCha8Rng; use rand_chacha::ChaCha8Rng;

View File

@ -1,6 +1,8 @@
use core::hint::black_box;
use bevy_ecs::{entity::Entity, event::Event, observer::Trigger, world::World}; use bevy_ecs::{entity::Entity, event::Event, observer::Trigger, world::World};
use criterion::{black_box, Criterion}; use criterion::Criterion;
use rand::{prelude::SliceRandom, SeedableRng}; use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng; use rand_chacha::ChaCha8Rng;
fn deterministic_rand() -> ChaCha8Rng { fn deterministic_rand() -> ChaCha8Rng {

View File

@ -1,9 +1,11 @@
use core::hint::black_box;
use bevy_ecs::{ use bevy_ecs::{
component::Component, component::Component,
system::Commands, system::Commands,
world::{Command, CommandQueue, World}, world::{Command, CommandQueue, World},
}; };
use criterion::{black_box, Criterion}; use criterion::Criterion;
#[derive(Component)] #[derive(Component)]
struct A; struct A;

View File

@ -1,3 +1,5 @@
use core::hint::black_box;
use bevy_ecs::{ use bevy_ecs::{
bundle::Bundle, bundle::Bundle,
component::Component, component::Component,
@ -5,7 +7,7 @@ use bevy_ecs::{
system::{Query, SystemState}, system::{Query, SystemState},
world::World, world::World,
}; };
use criterion::{black_box, Criterion}; use criterion::Criterion;
use rand::{prelude::SliceRandom, SeedableRng}; use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng; use rand_chacha::ChaCha8Rng;

View File

@ -1,4 +1,6 @@
use criterion::{black_box, criterion_group, Criterion}; use core::hint::black_box;
use criterion::{criterion_group, Criterion};
use bevy_math::prelude::*; use bevy_math::prelude::*;

View File

@ -1,6 +1,8 @@
use core::hint::black_box;
use bevy_math::{Dir3, Mat4, Ray3d, Vec3}; use bevy_math::{Dir3, Mat4, Ray3d, Vec3};
use bevy_picking::mesh_picking::ray_cast; use bevy_picking::mesh_picking::ray_cast;
use criterion::{black_box, criterion_group, Criterion}; use criterion::{criterion_group, Criterion};
fn ptoxznorm(p: u32, size: u32) -> (f32, f32) { fn ptoxznorm(p: u32, size: u32) -> (f32, f32) {
let ij = (p / (size), p % (size)); let ij = (p / (size), p % (size));

View File

@ -1,10 +1,10 @@
use core::{iter, time::Duration}; use core::{hint::black_box, iter, time::Duration};
use benches::bench; use benches::bench;
use bevy_reflect::{DynamicList, List}; use bevy_reflect::{DynamicList, List};
use criterion::{ use criterion::{
black_box, criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
BenchmarkId, Criterion, PlotConfiguration, Throughput, Criterion, PlotConfiguration, Throughput,
}; };
criterion_group!( criterion_group!(

View File

@ -1,11 +1,11 @@
use core::{fmt::Write, iter, time::Duration}; use core::{fmt::Write, hint::black_box, iter, time::Duration};
use benches::bench; use benches::bench;
use bevy_reflect::{DynamicMap, Map}; use bevy_reflect::{DynamicMap, Map};
use bevy_utils::HashMap; use bevy_utils::HashMap;
use criterion::{ use criterion::{
black_box, criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
BenchmarkId, Criterion, PlotConfiguration, Throughput, Criterion, PlotConfiguration, Throughput,
}; };
criterion_group!( criterion_group!(

View File

@ -1,8 +1,8 @@
use core::{fmt::Write, str, time::Duration}; use core::{fmt::Write, hint::black_box, str, time::Duration};
use benches::bench; use benches::bench;
use bevy_reflect::ParsedPath; use bevy_reflect::ParsedPath;
use criterion::{black_box, criterion_group, BatchSize, BenchmarkId, Criterion, Throughput}; use criterion::{criterion_group, BatchSize, BenchmarkId, Criterion, Throughput};
use rand::{distributions::Uniform, Rng, SeedableRng}; use rand::{distributions::Uniform, Rng, SeedableRng};
use rand_chacha::ChaCha8Rng; use rand_chacha::ChaCha8Rng;

View File

@ -1,10 +1,10 @@
use core::time::Duration; use core::{hint::black_box, time::Duration};
use benches::bench; use benches::bench;
use bevy_reflect::{DynamicStruct, GetField, PartialReflect, Reflect, Struct}; use bevy_reflect::{DynamicStruct, GetField, PartialReflect, Reflect, Struct};
use criterion::{ use criterion::{
black_box, criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
BenchmarkId, Criterion, PlotConfiguration, Throughput, Criterion, PlotConfiguration, Throughput,
}; };
criterion_group!( criterion_group!(

View File

@ -1,4 +1,6 @@
use criterion::{black_box, criterion_group, Criterion}; use core::hint::black_box;
use criterion::{criterion_group, Criterion};
use bevy_render::view::RenderLayers; use bevy_render::view::RenderLayers;

View File

@ -1,4 +1,6 @@
use criterion::{black_box, criterion_group, Criterion}; use core::hint::black_box;
use criterion::{criterion_group, Criterion};
use bevy_render::mesh::TorusMeshBuilder; use bevy_render::mesh::TorusMeshBuilder;

View File

@ -1,5 +1,7 @@
use core::hint::black_box;
use bevy_tasks::{ParallelIterator, TaskPoolBuilder}; use bevy_tasks::{ParallelIterator, TaskPoolBuilder};
use criterion::{black_box, criterion_group, BenchmarkId, Criterion}; use criterion::{criterion_group, BenchmarkId, Criterion};
struct ParChunks<'a, T>(core::slice::Chunks<'a, T>); struct ParChunks<'a, T>(core::slice::Chunks<'a, T>);
impl<'a, T> ParallelIterator<core::slice::Iter<'a, T>> for ParChunks<'a, T> impl<'a, T> ParallelIterator<core::slice::Iter<'a, T>> for ParChunks<'a, T>

View File

@ -41,4 +41,5 @@ disallowed-methods = [
{ path = "f32::asinh", reason = "use bevy_math::ops::asinh instead for libm determinism" }, { path = "f32::asinh", reason = "use bevy_math::ops::asinh instead for libm determinism" },
{ path = "f32::acosh", reason = "use bevy_math::ops::acosh instead for libm determinism" }, { path = "f32::acosh", reason = "use bevy_math::ops::acosh instead for libm determinism" },
{ path = "f32::atanh", reason = "use bevy_math::ops::atanh instead for libm determinism" }, { path = "f32::atanh", reason = "use bevy_math::ops::atanh instead for libm determinism" },
{ path = "criterion::black_box", reason = "use core::hint::black_box instead" },
] ]