From cbe1688dcd7998771ec99f8765896fa859c7da00 Mon Sep 17 00:00:00 2001 From: BD103 <59022059+BD103@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:39:16 -0500 Subject: [PATCH] refactor: make all `criterion_group!`s named `benches` Now the distinguishing factor will be their module path, removing the need to rename the group itself if it switches modules. --- benches/benches/bevy_ecs/change_detection.rs | 6 ++++-- benches/benches/bevy_ecs/components/mod.rs | 2 +- benches/benches/bevy_ecs/empty_archetypes.rs | 2 +- benches/benches/bevy_ecs/events/mod.rs | 2 +- benches/benches/bevy_ecs/fragmentation/mod.rs | 2 +- benches/benches/bevy_ecs/iteration/mod.rs | 2 +- benches/benches/bevy_ecs/main.rs | 20 +++++++++---------- benches/benches/bevy_ecs/observers/mod.rs | 2 +- benches/benches/bevy_ecs/param/mod.rs | 2 +- benches/benches/bevy_ecs/scheduling/mod.rs | 2 +- benches/benches/bevy_ecs/world/mod.rs | 2 +- 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/benches/benches/bevy_ecs/change_detection.rs b/benches/benches/bevy_ecs/change_detection.rs index 7414dae65f..a07320cf18 100644 --- a/benches/benches/bevy_ecs/change_detection.rs +++ b/benches/benches/bevy_ecs/change_detection.rs @@ -10,7 +10,7 @@ use rand::{prelude::SliceRandom, SeedableRng}; use rand_chacha::ChaCha8Rng; criterion_group!( - change_detection_benches, + benches, all_added_detection, all_changed_detection, few_changed_detection, @@ -297,7 +297,9 @@ fn add_archetypes_entities + Default>( } } } -fn multiple_archetype_none_changed_detection_generic + Default + BenchModify>( +fn multiple_archetype_none_changed_detection_generic< + T: Component + Default + BenchModify, +>( group: &mut BenchGroup, archetype_count: u16, entity_count: u32, diff --git a/benches/benches/bevy_ecs/components/mod.rs b/benches/benches/bevy_ecs/components/mod.rs index e77e23d730..495cb0fd45 100644 --- a/benches/benches/bevy_ecs/components/mod.rs +++ b/benches/benches/bevy_ecs/components/mod.rs @@ -13,7 +13,7 @@ mod insert_simple_unbatched; use archetype_updates::*; criterion_group!( - components_benches, + benches, add_remove, add_remove_big, add_remove_very_big, diff --git a/benches/benches/bevy_ecs/empty_archetypes.rs b/benches/benches/bevy_ecs/empty_archetypes.rs index 254dde4614..84dad61a65 100644 --- a/benches/benches/bevy_ecs/empty_archetypes.rs +++ b/benches/benches/bevy_ecs/empty_archetypes.rs @@ -1,7 +1,7 @@ use bevy_ecs::{component::Component, prelude::*, world::World}; use criterion::{black_box, criterion_group, BenchmarkId, Criterion}; -criterion_group!(empty_archetypes_benches, empty_archetypes); +criterion_group!(benches, empty_archetypes); #[derive(Component)] struct A(f32); diff --git a/benches/benches/bevy_ecs/events/mod.rs b/benches/benches/bevy_ecs/events/mod.rs index 5d20ef25cd..15492bc92c 100644 --- a/benches/benches/bevy_ecs/events/mod.rs +++ b/benches/benches/bevy_ecs/events/mod.rs @@ -3,7 +3,7 @@ use criterion::*; mod iter; mod send; -criterion_group!(event_benches, send, iter); +criterion_group!(benches, send, iter); fn send(c: &mut Criterion) { let mut group = c.benchmark_group("events_send"); diff --git a/benches/benches/bevy_ecs/fragmentation/mod.rs b/benches/benches/bevy_ecs/fragmentation/mod.rs index 0f9396a409..97864990a3 100644 --- a/benches/benches/bevy_ecs/fragmentation/mod.rs +++ b/benches/benches/bevy_ecs/fragmentation/mod.rs @@ -4,7 +4,7 @@ use core::hint::black_box; use criterion::*; use glam::*; -criterion_group!(fragmentation_benches, iter_frag_empty); +criterion_group!(benches, iter_frag_empty); #[derive(Component, Default)] struct Table(usize); diff --git a/benches/benches/bevy_ecs/iteration/mod.rs b/benches/benches/bevy_ecs/iteration/mod.rs index f4755606b8..5a9661a70e 100644 --- a/benches/benches/bevy_ecs/iteration/mod.rs +++ b/benches/benches/bevy_ecs/iteration/mod.rs @@ -25,7 +25,7 @@ mod par_iter_simple_foreach_hybrid; use heavy_compute::*; criterion_group!( - iterations_benches, + benches, iter_frag, iter_frag_sparse, iter_simple, diff --git a/benches/benches/bevy_ecs/main.rs b/benches/benches/bevy_ecs/main.rs index 39fc70f21a..83f0cde028 100644 --- a/benches/benches/bevy_ecs/main.rs +++ b/benches/benches/bevy_ecs/main.rs @@ -18,14 +18,14 @@ mod scheduling; mod world; criterion_main!( - change_detection::change_detection_benches, - components::components_benches, - empty_archetypes::empty_archetypes_benches, - events::event_benches, - iteration::iterations_benches, - fragmentation::fragmentation_benches, - observers::observer_benches, - scheduling::scheduling_benches, - world::world_benches, - param::param_benches, + change_detection::benches, + components::benches, + empty_archetypes::benches, + events::benches, + iteration::benches, + fragmentation::benches, + observers::benches, + scheduling::benches, + world::benches, + param::benches, ); diff --git a/benches/benches/bevy_ecs/observers/mod.rs b/benches/benches/bevy_ecs/observers/mod.rs index 0b8c3f2486..01a72ca908 100644 --- a/benches/benches/bevy_ecs/observers/mod.rs +++ b/benches/benches/bevy_ecs/observers/mod.rs @@ -5,4 +5,4 @@ mod simple; use propagation::*; use simple::*; -criterion_group!(observer_benches, event_propagation, observe_simple); +criterion_group!(benches, event_propagation, observe_simple); diff --git a/benches/benches/bevy_ecs/param/mod.rs b/benches/benches/bevy_ecs/param/mod.rs index 20955fc29e..da2246ccf3 100644 --- a/benches/benches/bevy_ecs/param/mod.rs +++ b/benches/benches/bevy_ecs/param/mod.rs @@ -8,4 +8,4 @@ use combinator_system::*; use dyn_param::*; use param_set::*; -criterion_group!(param_benches, combinator_system, dyn_param, param_set); +criterion_group!(benches, combinator_system, dyn_param, param_set); diff --git a/benches/benches/bevy_ecs/scheduling/mod.rs b/benches/benches/bevy_ecs/scheduling/mod.rs index 60d1620a89..01f6f32c1f 100644 --- a/benches/benches/bevy_ecs/scheduling/mod.rs +++ b/benches/benches/bevy_ecs/scheduling/mod.rs @@ -9,7 +9,7 @@ use running_systems::*; use schedule::*; criterion_group!( - scheduling_benches, + benches, run_condition_yes, run_condition_no, run_condition_yes_with_query, diff --git a/benches/benches/bevy_ecs/world/mod.rs b/benches/benches/bevy_ecs/world/mod.rs index 652221c126..0da09362b1 100644 --- a/benches/benches/bevy_ecs/world/mod.rs +++ b/benches/benches/bevy_ecs/world/mod.rs @@ -19,7 +19,7 @@ mod entity_hash; use entity_hash::*; criterion_group!( - world_benches, + benches, empty_commands, spawn_commands, insert_commands,