forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract monomorphic get_insert_bundle_info function (#1910)

Browse Source 
This shrinks breakout from 316k to 310k when using `--feature dynamic`.

I haven't run the ecs benchmark to test performance as my laptop is too noisy for reliable benchmarking.
This commit is contained in:
bjorn3 2021-04-22 19:34:34 +00:00
parent 7c274e5a44
commit 6719c2c390
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crates/bevy_ecs/src/world/entity_ref.rs
View File

@ -2,7 +2,7 @@ use crate::{
archetype::{Archetype, ArchetypeId, Archetypes, ComponentStatus}, archetype::{Archetype, ArchetypeId, Archetypes, ComponentStatus},
bundle::{Bundle, BundleInfo}, bundle::{Bundle, BundleInfo},
component::{Component, ComponentId, ComponentTicks, Components, StorageType}, component::{Component, ComponentId, ComponentTicks, Components, StorageType},
entity::{Entity, EntityLocation}, entity::{Entities, Entity, EntityLocation},
storage::{SparseSet, Storages}, storage::{SparseSet, Storages},
world::{Mut, World}, world::{Mut, World},
}; };
@ -182,7 +182,6 @@ impl<'w> EntityMut<'w> {
}) })
} }
// TODO: factor out non-generic part to cut down on monomorphization (just check perf)
// TODO: move relevant methods to World (add/remove bundle) // TODO: move relevant methods to World (add/remove bundle)
pub fn insert_bundle<T: Bundle>(&mut self, bundle: T) -> &mut Self { pub fn insert_bundle<T: Bundle>(&mut self, bundle: T) -> &mut Self {
let entity = self.entity; let entity = self.entity;
@ -195,19 +194,28 @@ impl<'w> EntityMut<'w> {
let bundle_info = self.world.bundles.init_info::<T>(components); let bundle_info = self.world.bundles.init_info::<T>(components);
let current_location = self.location; let current_location = self.location;
let (archetype, bundle_status, archetype_index) = unsafe { // Use a non-generic function to cut down on monomorphization
unsafe fn get_insert_bundle_info<'a>(
entities: &mut Entities,
archetypes: &'a mut Archetypes,
components: &mut Components,
storages: &mut Storages,
bundle_info: &BundleInfo,
current_location: EntityLocation,
entity: Entity,
) -> (&'a Archetype, &'a Vec<ComponentStatus>, EntityLocation) {
// SAFE: component ids in `bundle_info` and self.location are valid // SAFE: component ids in `bundle_info` and self.location are valid
let new_archetype_id = add_bundle_to_archetype( let new_archetype_id = add_bundle_to_archetype(
archetypes, archetypes,
storages, storages,
components, components,
self.location.archetype_id, current_location.archetype_id,
bundle_info, bundle_info,
); );
if new_archetype_id == current_location.archetype_id { if new_archetype_id == current_location.archetype_id {
let archetype = &archetypes[current_location.archetype_id]; let archetype = &archetypes[current_location.archetype_id];
let edge = archetype.edges().get_add_bundle(bundle_info.id).unwrap(); let edge = archetype.edges().get_add_bundle(bundle_info.id).unwrap();
(archetype, &edge.bundle_status, current_location.index) (archetype, &edge.bundle_status, current_location)
} else { } else {
let (old_table_row, old_table_id) = { let (old_table_row, old_table_id) = {
let old_archetype = &mut archetypes[current_location.archetype_id]; let old_archetype = &mut archetypes[current_location.archetype_id];
@ -241,22 +249,34 @@ impl<'w> EntityMut<'w> {
new_location new_location
}; };
self.location = new_location; entities.meta[entity.id as usize].location = new_location;
entities.meta[self.entity.id as usize].location = new_location;
let (old_archetype, new_archetype) = let (old_archetype, new_archetype) =
archetypes.get_2_mut(current_location.archetype_id, new_archetype_id); archetypes.get_2_mut(current_location.archetype_id, new_archetype_id);
let edge = old_archetype let edge = old_archetype
.edges() .edges()
.get_add_bundle(bundle_info.id) .get_add_bundle(bundle_info.id)
.unwrap(); .unwrap();
(&*new_archetype, &edge.bundle_status, new_location.index) (&*new_archetype, &edge.bundle_status, new_location)
// Sparse set components are intentionally ignored here. They don't need to move // Sparse set components are intentionally ignored here. They don't need to move
} }
}
let (archetype, bundle_status, new_location) = unsafe {
get_insert_bundle_info(
entities,
archetypes,
components,
storages,
bundle_info,
current_location,
entity,
)
}; };
self.location = new_location;
let table = &storages.tables[archetype.table_id()]; let table = &storages.tables[archetype.table_id()];
let table_row = archetype.entity_table_row(archetype_index); let table_row = archetype.entity_table_row(new_location.index);
// SAFE: table row is valid // SAFE: table row is valid
unsafe { unsafe {
bundle_info.write_components( bundle_info.write_components(