Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak EntityHasher for more speed #10605

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions crates/bevy_utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,20 @@ impl Hasher for EntityHasher {

#[inline]
fn write_u64(&mut self, i: u64) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Demonstration of the overall assembly diff with this change: https://rust.godbolt.org/z/9zxfMdEfv

// We ignore the generation entirely. It's always functionally correct
// to omit things when hashing, so long as it's consistent, just a perf
// trade-off. This hasher is designed for "normal" cases, where nearly
// everything in the table is a live entity, meaning there are few
// generation conflicts. And thus it's overall faster to just ignore
// the generation during hashing, leaving it to the `Entity::eq` to
// confirm the generation matches -- just like `Entity::eq` checks that
// the index is actually the right one, since there's always the chance
// of a conflict in the index despite a good hash function.
//
// This masking actually ends up with negative cost after optimization,
// since it saves needing to do the shift-and-or between the fields.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Demonstration of this by comparing the codegen without the masking to having the masking: https://rust.godbolt.org/z/3vvsT38ar

let index = i & 0xFFFF_FFFF;

// SwissTable (and thus `hashbrown`) cares about two things from the hash:
// - H1: low bits (masked by `2ⁿ-1`) to pick the slot in which to store the item
// - H2: high 7 bits are used to SIMD optimize hash collision probing
Expand All @@ -302,11 +316,10 @@ impl Hasher for EntityHasher {
// <https://extremelearning.com.au/unreasonable-effectiveness-of-quasirandom-sequences/>
// It loses no information because it has a modular inverse.
// (Specifically, `0x144c_bc89_u32 * 0x9e37_79b9_u32 == 1`.)
//
// The low 32 bits are just 1, to leave the entity id there unchanged.
const UPPER_PHI: u64 = 0x9e37_79b9_0000_0001;
// This bit-masking is free, as the optimizer can just not load the generation.
let id = i & 0xFFFF_FFFF;
self.hash = id.wrapping_mul(UPPER_PHI);
self.hash = index.wrapping_mul(UPPER_PHI);
}

#[inline]
Expand Down