Skip to content

Commit cbe1688

Browse files
committed
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.
1 parent ee94d48 commit cbe1688

File tree

11 files changed

+23
-21
lines changed

11 files changed

+23
-21
lines changed

benches/benches/bevy_ecs/change_detection.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rand::{prelude::SliceRandom, SeedableRng};
1010
use rand_chacha::ChaCha8Rng;
1111

1212
criterion_group!(
13-
change_detection_benches,
13+
benches,
1414
all_added_detection,
1515
all_changed_detection,
1616
few_changed_detection,
@@ -297,7 +297,9 @@ fn add_archetypes_entities<T: Component<Mutability = Mutable> + Default>(
297297
}
298298
}
299299
}
300-
fn multiple_archetype_none_changed_detection_generic<T: Component<Mutability = Mutable> + Default + BenchModify>(
300+
fn multiple_archetype_none_changed_detection_generic<
301+
T: Component<Mutability = Mutable> + Default + BenchModify,
302+
>(
301303
group: &mut BenchGroup,
302304
archetype_count: u16,
303305
entity_count: u32,

benches/benches/bevy_ecs/components/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mod insert_simple_unbatched;
1313
use archetype_updates::*;
1414

1515
criterion_group!(
16-
components_benches,
16+
benches,
1717
add_remove,
1818
add_remove_big,
1919
add_remove_very_big,

benches/benches/bevy_ecs/empty_archetypes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use bevy_ecs::{component::Component, prelude::*, world::World};
22
use criterion::{black_box, criterion_group, BenchmarkId, Criterion};
33

4-
criterion_group!(empty_archetypes_benches, empty_archetypes);
4+
criterion_group!(benches, empty_archetypes);
55

66
#[derive(Component)]
77
struct A<const N: u16>(f32);

benches/benches/bevy_ecs/events/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use criterion::*;
33
mod iter;
44
mod send;
55

6-
criterion_group!(event_benches, send, iter);
6+
criterion_group!(benches, send, iter);
77

88
fn send(c: &mut Criterion) {
99
let mut group = c.benchmark_group("events_send");

benches/benches/bevy_ecs/fragmentation/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use core::hint::black_box;
44
use criterion::*;
55
use glam::*;
66

7-
criterion_group!(fragmentation_benches, iter_frag_empty);
7+
criterion_group!(benches, iter_frag_empty);
88

99
#[derive(Component, Default)]
1010
struct Table<const X: usize = 0>(usize);

benches/benches/bevy_ecs/iteration/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mod par_iter_simple_foreach_hybrid;
2525
use heavy_compute::*;
2626

2727
criterion_group!(
28-
iterations_benches,
28+
benches,
2929
iter_frag,
3030
iter_frag_sparse,
3131
iter_simple,

benches/benches/bevy_ecs/main.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ mod scheduling;
1818
mod world;
1919

2020
criterion_main!(
21-
change_detection::change_detection_benches,
22-
components::components_benches,
23-
empty_archetypes::empty_archetypes_benches,
24-
events::event_benches,
25-
iteration::iterations_benches,
26-
fragmentation::fragmentation_benches,
27-
observers::observer_benches,
28-
scheduling::scheduling_benches,
29-
world::world_benches,
30-
param::param_benches,
21+
change_detection::benches,
22+
components::benches,
23+
empty_archetypes::benches,
24+
events::benches,
25+
iteration::benches,
26+
fragmentation::benches,
27+
observers::benches,
28+
scheduling::benches,
29+
world::benches,
30+
param::benches,
3131
);

benches/benches/bevy_ecs/observers/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ mod simple;
55
use propagation::*;
66
use simple::*;
77

8-
criterion_group!(observer_benches, event_propagation, observe_simple);
8+
criterion_group!(benches, event_propagation, observe_simple);

benches/benches/bevy_ecs/param/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ use combinator_system::*;
88
use dyn_param::*;
99
use param_set::*;
1010

11-
criterion_group!(param_benches, combinator_system, dyn_param, param_set);
11+
criterion_group!(benches, combinator_system, dyn_param, param_set);

benches/benches/bevy_ecs/scheduling/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use running_systems::*;
99
use schedule::*;
1010

1111
criterion_group!(
12-
scheduling_benches,
12+
benches,
1313
run_condition_yes,
1414
run_condition_no,
1515
run_condition_yes_with_query,

benches/benches/bevy_ecs/world/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mod entity_hash;
1919
use entity_hash::*;
2020

2121
criterion_group!(
22-
world_benches,
22+
benches,
2323
empty_commands,
2424
spawn_commands,
2525
insert_commands,

0 commit comments

Comments
 (0)