Merge pull request #915 from ludovic111/perf/paletted-pack

🤖 Agent: reviewed; verify passes. Re-checked all four perf-server-10 PRs merged on current main (after #887 #931 #912 #916): fmt/clippy clean, horizon-client tests 893 passed, lan, dedicated_server, server_world_gen, chunk_stage, world_reopen, server_entities, server_player_targets, server_dimension_players pass, lan_e2e growth/plates/eating/hurt/chat/light pass in both modes (eating with --server-thread failed once in the long sequence, then passed twice alone). Numbers in the PR.
This commit is contained in:
Ludovic Marie
2026-10-19 01:23:19 +02:00
committed by GitHub
+18 -6
View File
@@ -57,6 +57,19 @@ pub fn storage_len(bits: u8, entries: usize) -> usize {
}
}
/// SimpleBitStorage's longs for `values` at `bits` each, a long at a time.
fn pack<T>(values: &[T], bits: u8, id: impl Fn(&T) -> u64) -> Vec<i64> {
let per = 64 / bits as usize;
values
.chunks(per)
.map(|word| {
word.iter()
.enumerate()
.fold(0u64, |w, (k, v)| w | id(v) << (k * bits as usize)) as i64
})
.collect()
}
/// One PalettedContainer as sent.
#[derive(Clone, Debug, PartialEq)]
pub struct Paletted {
@@ -160,12 +173,11 @@ impl Paletted {
data: Vec::new(),
};
}
let mut data = vec![0i64; storage_len(bits, values.len())];
let per = 64 / bits as usize;
for (i, (&v, &id)) in values.iter().zip(&ids).enumerate() {
let id = if has_palette { u64::from(id) } else { v as u64 };
data[i / per] |= (id << ((i % per) * bits as usize)) as i64;
}
let data = if has_palette {
pack(&ids, bits, |&id| u64::from(id))
} else {
pack(values, bits, |&v| v as u64)
};
Self {
bits,
palette: if has_palette { palette } else { Vec::new() },