fix: temp disable XP SIMD until crash resolved (#611)

Author: andrewgazelka

Cargo.lock

@@ -204,9 +204,6 @@ version = '0.10.6'
 [workspace.dependencies.sha2]
 version = '0.10.8'
 
-[workspace.dependencies.simd-utils]
-path = 'crates/simd-utils'
-
 [workspace.dependencies.tokio-util]
 features = ['full']
 version = '0.7.12'

Cargo.toml

@@ -23,7 +23,6 @@ anyhow = {workspace = true}
 base64 = {workspace = true}
 geometry = {workspace = true}
 bitfield-struct = {workspace = true}
-simd-utils = {workspace = true}
 bitvec = {workspace = true}
 papaya = {workspace = true}
 bumpalo = {workspace = true}

crates/hyperion/Cargo.toml

@@ -56,9 +56,6 @@ impl Module for EntityStateSyncModule {
                         const _: () = assert!(size_of::<Xp>() == size_of::<u16>());
                         const _: () = assert!(align_of::<Xp>() == align_of::<u16>());
 
-                        /// Number of lanes in the SIMD vector
-                        const LANES: usize = 64; // up to AVX512
-
                         let compose = table.field_unchecked::<Compose>(0);
                         let compose = compose.first().unwrap();
 
@@ -70,41 +67,39 @@ impl Module for EntityStateSyncModule {
                         let prev_xp: &mut [u16] =
                             core::slice::from_raw_parts_mut(prev_xp.as_mut_ptr().cast(), count);
 
-                        debug_assert_eq!(
-                            prev_xp.as_ptr() as usize & 63,
-                            0,
-                            "prev_xp is not 64-byte aligned"
-                        );
+                        // debug_assert_eq!(
+                        //     prev_xp.as_ptr() as usize & 63,
+                        //     0,
+                        //     "prev_xp is not 64-byte aligned"
+                        // );
 
                         let mut xp = table.field_unchecked::<Xp>(3);
                         let xp = xp.get_mut(..).unwrap();
                         let xp: &mut [u16] =
                             core::slice::from_raw_parts_mut(xp.as_mut_ptr().cast(), count);
 
-                        debug_assert_eq!(xp.as_ptr() as usize & 63, 0, "xp is not 64-byte aligned");
+                        // debug_assert_eq!(xp.as_ptr() as usize & 63, 0, "xp is not 64-byte aligned");
 
-                        simd_utils::copy_and_get_diff::<_, LANES>(
-                            prev_xp,
-                            xp,
-                            |idx, prev, current| {
-                                debug_assert!(prev != current);
+                        for (idx, (prev, current)) in itertools::zip_eq(prev_xp, xp).enumerate() {
+                            if prev != current {
+                                continue;
+                            }
 
-                                let net = net.get(idx).unwrap();
+                            let net = net.get(idx).unwrap();
 
-                                let current = Xp::from(*current);
-                                let visual = current.get_visual();
+                            let current = Xp::from(*current);
+                            let visual = current.get_visual();
 
-                                let packet = play::ExperienceBarUpdateS2c {
-                                    bar: visual.prop,
-                                    level: VarInt(i32::from(visual.level)),
-                                    total_xp: VarInt::default(),
-                                };
+                            let packet = play::ExperienceBarUpdateS2c {
+                                bar: visual.prop,
+                                level: VarInt(i32::from(visual.level)),
+                                total_xp: VarInt::default(),
+                            };
 
-                                compose
-                                    .unicast(&packet, *net, SystemId(100), &world)
-                                    .unwrap();
-                            },
-                        );
+                            compose
+                                .unicast(&packet, *net, SystemId(100), &world)
+                                .unwrap();
+                        }
                     }
                 }
             });

crates/hyperion/src/egress/sync_entity_state.rs

@@ -38,10 +38,7 @@ use std::{
 use anyhow::{Context, bail};
 use derive_more::{Deref, DerefMut};
 use egress::EgressModule;
-use flecs_ecs::{
-    prelude::*,
-    sys::{ecs_os_get_api, ecs_os_set_api, ecs_os_set_api_defaults},
-};
+use flecs_ecs::prelude::*;
 pub use glam;
 use glam::IVec2;
 use ingress::IngressModule;
@@ -202,19 +199,19 @@ impl Hyperion {
                 .map_err(|_| anyhow::anyhow!("failed to create compression level"))?,
         });
 
-        unsafe {
-            ecs_os_set_api_defaults();
-            let mut os_api = ecs_os_get_api();
-
-            let (malloc, calloc, realloc, free) = alloc::setup_custom_allocators();
-
-            os_api.malloc_ = malloc;
-            os_api.calloc_ = calloc;
-            os_api.realloc_ = realloc;
-            os_api.free_ = free;
-
-            ecs_os_set_api(&mut os_api);
-        }
+        // unsafe {
+        //     ecs_os_set_api_defaults();
+        //     let mut os_api = ecs_os_get_api();
+        //
+        //     let (malloc, calloc, realloc, free) = alloc::setup_custom_allocators();
+        //
+        //     os_api.malloc_ = malloc;
+        //     os_api.calloc_ = calloc;
+        //     os_api.realloc_ = realloc;
+        //     os_api.free_ = free;
+        //
+        //     ecs_os_set_api(&mut os_api);
+        // }
 
         let world = World::new();