Skip to content

Commit 11a7ff2

Browse files
committed
use bevy_utils::HashMap for better performance. TypeId is predefined … (#7642)
…u64, so hash safety is not a concern # Objective - While reading the code, just noticed the BundleInfo's HashMap is std::collections::HashMap, which uses a slow but safe hasher. ## Solution - Use bevy_utils::HashMap instead benchmark diff (I run several times in a linux box, the perf improvement is consistent, though numbers varies from time to time, I paste my last run result here): ``` bash cargo bench -- spawn Compiling bevy_ecs v0.9.0 (/home/lishuo/developer/pr/bevy/crates/bevy_ecs) Compiling bevy_app v0.9.0 (/home/lishuo/developer/pr/bevy/crates/bevy_app) Compiling benches v0.1.0 (/home/lishuo/developer/pr/bevy/benches) Finished bench [optimized] target(s) in 1m 17s Running benches/bevy_ecs/change_detection.rs (/home/lishuo/developer/pr/bevy/benches/target/release/deps/change_detection-86c5445d0dc34529) Gnuplot not found, using plotters backend Running benches/bevy_ecs/benches.rs (/home/lishuo/developer/pr/bevy/benches/target/release/deps/ecs-e49b3abe80bfd8c0) Gnuplot not found, using plotters backend spawn_commands/2000_entities time: [153.94 µs 159.19 µs 164.37 µs] change: [-14.706% -11.050% -6.9633%] (p = 0.00 < 0.05) Performance has improved. spawn_commands/4000_entities time: [328.77 µs 339.11 µs 349.11 µs] change: [-7.6331% -3.9932% +0.0487%] (p = 0.06 > 0.05) No change in performance detected. spawn_commands/6000_entities time: [445.01 µs 461.29 µs 477.36 µs] change: [-16.639% -13.358% -10.006%] (p = 0.00 < 0.05) Performance has improved. spawn_commands/8000_entities time: [657.94 µs 677.71 µs 696.95 µs] change: [-8.8708% -5.2591% -1.6847%] (p = 0.01 < 0.05) Performance has improved. get_or_spawn/individual time: [452.02 µs 466.70 µs 482.07 µs] change: [-17.218% -14.041% -10.728%] (p = 0.00 < 0.05) Performance has improved. get_or_spawn/batched time: [291.12 µs 301.12 µs 311.31 µs] change: [-12.281% -8.9163% -5.3660%] (p = 0.00 < 0.05) Performance has improved. spawn_world/1_entities time: [81.668 ns 84.284 ns 86.860 ns] change: [-12.251% -6.7872% -1.5402%] (p = 0.02 < 0.05) Performance has improved. spawn_world/10_entities time: [789.78 ns 821.96 ns 851.95 ns] change: [-19.738% -14.186% -8.0733%] (p = 0.00 < 0.05) Performance has improved. spawn_world/100_entities time: [7.9906 µs 8.2449 µs 8.5013 µs] change: [-12.417% -6.6837% -0.8766%] (p = 0.02 < 0.05) Change within noise threshold. spawn_world/1000_entities time: [81.602 µs 84.161 µs 86.833 µs] change: [-13.656% -8.6520% -3.0491%] (p = 0.00 < 0.05) Performance has improved. Found 1 outliers among 100 measurements (1.00%) 1 (1.00%) high mild Benchmarking spawn_world/10000_entities: Warming up for 500.00 ms Warning: Unable to complete 100 samples in 4.0s. You may wish to increase target time to 4.0s, enable flat sampling, or reduce sample count to 70. spawn_world/10000_entities time: [813.02 µs 839.76 µs 865.41 µs] change: [-12.133% -6.1970% -0.2302%] (p = 0.05 < 0.05) Change within noise threshold. ``` --- ## Changelog > This section is optional. If this was a trivial fix, or has no externally-visible impact, you can delete this section. - use bevy_utils::HashMap for Bundles::bundle_ids ## Migration Guide > This section is optional. If there are no breaking changes, you can delete this section. - Not a breaking change, hashmap is internal impl.
1 parent 0bce784 commit 11a7ff2

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

crates/bevy_ecs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async-channel = "1.4"
2424
event-listener = "2.5"
2525
thread_local = "1.1.4"
2626
fixedbitset = "0.4.2"
27-
fxhash = "0.2"
27+
rustc-hash = "1.1"
2828
downcast-rs = "1.2"
2929
serde = { version = "1", features = ["derive"] }
3030

crates/bevy_ecs/src/archetype.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ use crate::{
2626
storage::{ImmutableSparseSet, SparseArray, SparseSet, SparseSetIndex, TableId, TableRow},
2727
};
2828
use std::{
29-
collections::HashMap,
3029
hash::Hash,
3130
ops::{Index, IndexMut},
3231
};
@@ -601,7 +600,7 @@ impl SparseSetIndex for ArchetypeComponentId {
601600
pub struct Archetypes {
602601
pub(crate) archetypes: Vec<Archetype>,
603602
pub(crate) archetype_component_count: usize,
604-
archetype_ids: HashMap<ArchetypeIdentity, ArchetypeId>,
603+
archetype_ids: bevy_utils::HashMap<ArchetypeIdentity, ArchetypeId>,
605604
}
606605

607606
impl Archetypes {

crates/bevy_ecs/src/bundle.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ use crate::{
1212
component::{Component, ComponentId, ComponentStorage, Components, StorageType, Tick},
1313
entity::{Entities, Entity, EntityLocation},
1414
storage::{SparseSetIndex, SparseSets, Storages, Table, TableRow},
15+
TypeIdMap,
1516
};
1617
use bevy_ecs_macros::all_tuples;
1718
use bevy_ptr::OwningPtr;
18-
use std::{any::TypeId, collections::HashMap};
19+
use std::any::TypeId;
1920

2021
/// The `Bundle` trait enables insertion and removal of [`Component`]s from an entity.
2122
///
@@ -683,7 +684,7 @@ impl<'a, 'b> BundleSpawner<'a, 'b> {
683684
#[derive(Default)]
684685
pub struct Bundles {
685686
bundle_infos: Vec<BundleInfo>,
686-
bundle_ids: HashMap<TypeId, BundleId>,
687+
bundle_ids: TypeIdMap<BundleId>,
687688
}
688689

689690
impl Bundles {

crates/bevy_ecs/src/component.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::{
55
storage::{SparseSetIndex, Storages},
66
system::{Local, Resource},
77
world::{FromWorld, World},
8+
TypeIdMap,
89
};
910
pub use bevy_ecs_macros::Component;
1011
use bevy_ptr::{OwningPtr, UnsafeCellDeref};
@@ -400,8 +401,8 @@ impl ComponentDescriptor {
400401
#[derive(Debug, Default)]
401402
pub struct Components {
402403
components: Vec<ComponentInfo>,
403-
indices: std::collections::HashMap<TypeId, usize, fxhash::FxBuildHasher>,
404-
resource_indices: std::collections::HashMap<TypeId, usize, fxhash::FxBuildHasher>,
404+
indices: TypeIdMap<usize>,
405+
resource_indices: TypeIdMap<usize>,
405406
}
406407

407408
impl Components {

crates/bevy_ecs/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ pub mod storage;
1919
pub mod system;
2020
pub mod world;
2121

22+
use std::any::TypeId;
23+
2224
pub use bevy_ptr as ptr;
2325

2426
/// Most commonly used re-exported types.
@@ -52,6 +54,9 @@ pub mod prelude {
5254

5355
pub use bevy_ecs_macros::all_tuples;
5456

57+
/// A specialized hashmap type with Key of `TypeId`
58+
type TypeIdMap<V> = rustc_hash::FxHashMap<TypeId, V>;
59+
5560
#[cfg(test)]
5661
mod tests {
5762
use crate as bevy_ecs;

0 commit comments

Comments
 (0)