Fixes

Author: metalgearsloth

src/Arch.Benchmarks/TryGetBenchmark.cs

@@ -5,9 +5,10 @@ namespace Arch.Benchmarks;
 
 [HtmlExporter]
 [MemoryDiagnoser]
-[HardwareCounters(HardwareCounter.CacheMisses)]
 public class TryGetBenchmark
 {
+    [Params(10000, 100000, 1000000)] public int Amount;
+
     private static World _world;
     private static List<Entity> _entities;
 
@@ -18,15 +19,15 @@ public void Setup()
     {
         _world = World.Create();
 
-        _entities = new List<Entity>(1_000_000);
-        for (var index = 0; index < 1_000_000; index++)
+        _entities = new List<Entity>(Amount);
+        for (var index = 0; index < Amount; index++)
         {
             _entities.Add(_world.Create(new Transform(), new Velocity()));
         }
     }
 
     [Benchmark]
-    public void TryGetGenericRef()
+    public void TryGetGenericRefSuccess()
     {
         for (var index = 0; index < _entities.Count; index++)
         {
@@ -41,7 +42,22 @@ public void TryGetGenericRef()
     }
 
     [Benchmark]
-    public void TryGetGeneric()
+    public void TryGetGenericRefFail()
+    {
+        for (var index = 0; index < _entities.Count; index++)
+        {
+            var entity = _entities[index];
+            var pos = _world.TryGetRef<Position2D>(entity, out var exists);
+
+            if (!exists)
+            {
+                _consumer.Consume(pos);
+            }
+        }
+    }
+
+    [Benchmark]
+    public void TryGetGenericSuccess()
     {
         for (var index = 0; index < _entities.Count; index++)
         {
@@ -55,16 +71,48 @@ public void TryGetGeneric()
     }
 
     [Benchmark]
-    public void TryGet()
+    public void TryGetGenericFail()
+    {
+        for (var index = 0; index < _entities.Count; index++)
+        {
+            var entity = _entities[index];
+
+            if (!_world.TryGet<Position2D>(entity, out var pos))
+            {
+                _consumer.Consume(pos);
+            }
+        }
+    }
+
+    [Benchmark]
+    public void TryGetSuccess()
     {
+        var xformType = Component.GetComponentType(typeof(Transform));
+
         for (var index = 0; index < _entities.Count; index++)
         {
             var entity = _entities[index];
 
-            if (_world.TryGet(entity, Component.GetComponentType(typeof(Transform)), out var xform))
+            if (_world.TryGet(entity, xformType, out var xform))
             {
                 _consumer.Consume(xform);
             }
         }
     }
+
+    [Benchmark]
+    public void TryGetFail()
+    {
+        var xformType = Component.GetComponentType(typeof(Position2D));
+
+        for (var index = 0; index < _entities.Count; index++)
+        {
+            var entity = _entities[index];
+
+            if (!_world.TryGet(entity, xformType, out var pos))
+            {
+                _consumer.Consume(pos);
+            }
+        }
+    }
 }

src/Arch/Core/Archetype.cs

@@ -307,7 +307,24 @@ internal Archetype(Signature signature, int baseChunkSize, int baseChunkEntityCo
     internal bool TryIndex<T>(out int i)
     {
         var id = Component<T>.ComponentType.Id;
-        Debug.Assert(id != -1, $"Index is out of bounds, component {typeof(T)} with id {id} does not exist in this chunk.");
+        Debug.Assert(id != -1, $"Supplied component index is invalid");
+
+        if (id >= _componentIdToArrayIndex.Length)
+        {
+            i = -1;
+            return false;
+        }
+
+        i = _componentIdToArrayIndex.DangerousGetReferenceAt(id);
+        return i != -1;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [Pure]
+    internal bool TryIndex(ComponentType type, out int i)
+    {
+        var id = type.Id;
+        Debug.Assert(id != -1, $"Supplied component index is invalid");
 
         if (id >= _componentIdToArrayIndex.Length)
         {

src/Arch/Core/World.cs

@@ -1121,7 +1121,7 @@ public ref T Get<T>(Entity entity)
     [Pure]
     public bool TryGet<T>(Entity entity, out T? component)
     {
-        ref var slot = ref EntityInfo.EntitySlots[entity.Id];
+        ref var slot = ref EntityInfo.EntityData[entity.Id];
 
         if (!slot.Archetype.TryIndex<T>(out int compIndex))
         {
@@ -1130,7 +1130,7 @@ public bool TryGet<T>(Entity entity, out T? component)
         }
 
         ref var chunk = ref slot.Archetype.GetChunk(slot.Slot.ChunkIndex);
-        Debug.Assert(compIndex != -1 && compIndex < chunk.Components.Length, $"Index is out of bounds, component {typeof(T)} with id {compIndex} does not exist in this chunk.");
+        Debug.Assert(compIndex != -1 && compIndex < chunk.Components.Length, $"Index is out of bounds, component {typeof(T)} with id {compIndex} does not exist in this archetype.");
         var array = Unsafe.As<T[]>(chunk.Components.DangerousGetReferenceAt(compIndex));
         component = array[slot.Slot.Index];
         return true;
@@ -1147,7 +1147,7 @@ public bool TryGet<T>(Entity entity, out T? component)
     [Pure]
     public ref T TryGetRef<T>(Entity entity, out bool exists)
     {
-        ref var slot = ref EntityInfo.EntitySlots[entity.Id];
+        ref var slot = ref EntityInfo.EntityData[entity.Id];
 
         if (!(exists = slot.Archetype.Has<T>()))
         {
@@ -1398,14 +1398,18 @@ public void GetRange(Entity entity, Span<ComponentType> types, Span<object?> com
     [Pure]
     public bool TryGet(Entity entity, ComponentType type, out object? component)
     {
-        component = default;
-        if (!Has(entity, type))
+        ref var slot = ref EntityInfo.EntityData[entity.Id];
+
+        if (!slot.Archetype.TryIndex(type, out int compIndex))
         {
+            component = default;
             return false;
         }
 
-        var entitySlot = EntityInfo.GetEntitySlot(entity.Id);
-        component = entitySlot.Archetype.Get(ref entitySlot.Slot, type);
+        ref var chunk = ref slot.Archetype.GetChunk(slot.Slot.ChunkIndex);
+        Debug.Assert(compIndex != -1 && compIndex < chunk.Components.Length, $"Index is out of bounds, component {type} with id {compIndex} does not exist in this archetype.");
+        var array = Unsafe.As<object[]>(chunk.Components.DangerousGetReferenceAt(compIndex));
+        component = array[slot.Slot.Index];
         return true;
     }