Fixed #173 now really.

Might break some Arch.Extended libs? E.g. the System.SourceGenerator one?
genaray · Nov 23, 2023 · d734018 · d734018
1 parent 15fb43e
commit d734018
Show file tree

Hide file tree

Showing 16 changed files with 136 additions and 119 deletions.
diff --git a/src/Arch.Benchmarks/ArchetypeIterationBenchmark.cs b/src/Arch.Benchmarks/ArchetypeIterationBenchmark.cs
@@ -39,7 +39,7 @@ public void Setup()
     [Benchmark]
     public void IterationNormalTwoComponents()
     {
-        var size = _globalArchetype.Size;
+        var size = _globalArchetype.ChunkCount;
         var chunks = _globalArchetype.Chunks;
 
         for (var chunkIndex = 0; chunkIndex < size; chunkIndex++)
@@ -63,7 +63,7 @@ public void IterationNormalTwoComponents()
     [Benchmark]
     public void IterationUnsafeAddTwoComponents()
     {
-        var size = _globalArchetype.Size;
+        var size = _globalArchetype.ChunkCount;
         ref var chunk = ref _globalArchetype.Chunks[0];
 
         for (var chunkIndex = 0; chunkIndex < size; chunkIndex++)
@@ -92,7 +92,7 @@ public void IterationUnsafeAddTwoComponents()
     public void IterationParallelUnsafeAdd()
     {
         // Partition the entire source array.
-        var rangePartitioner = Partitioner.Create(0, _globalArchetype.Size);
+        var rangePartitioner = Partitioner.Create(0, _globalArchetype.ChunkCount);
         Parallel.ForEach(rangePartitioner, range =>
         {
             var start = range.Item1;
@@ -126,7 +126,7 @@ public void IterationParallelUnsafeAdd()
     [Benchmark]
     public void IterationNormalEntityTwoComponents()
     {
-        var size = _globalArchetype.Size;
+        var size = _globalArchetype.ChunkCount;
         var chunks = _globalArchetype.Chunks;
 
         for (var chunkIndex = 0; chunkIndex < size; chunkIndex++)
@@ -154,7 +154,7 @@ public void IterationNormalEntityTwoComponents()
     [Benchmark]
     public void IterationUnsafeAddEntityTwoComponents()
     {
-        var size = _globalArchetype.Size;
+        var size = _globalArchetype.ChunkCount;
         ref var chunk = ref _globalArchetype.Chunks[0];
 
         for (var chunkIndex = 0; chunkIndex < size; chunkIndex++)

diff --git a/src/Arch.Benchmarks/ArchetypeIterationTechnqiquesBenchmark.cs b/src/Arch.Benchmarks/ArchetypeIterationTechnqiquesBenchmark.cs
@@ -45,7 +45,7 @@ public void IterationNormalTwoComponents()
     {
         var chunks = _globalArchetype.Chunks;
 
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var chunk = ref chunks[chunkIndex];
             var transforms = chunk.GetArray<Transform>();
@@ -67,7 +67,7 @@ public void IterationUnsafeAddTwoComponents()
     {
         ref var chunk = ref _globalArchetype.Chunks[0];
 
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var currentChunk = ref Unsafe.Add(ref chunk, chunkIndex);
             var transforms = currentChunk.GetArray<Transform>();
@@ -92,7 +92,7 @@ public void IterationNormalTwoComponentsSpan()
     {
         var chunks = _globalArchetype.Chunks;
 
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var chunk = ref chunks[chunkIndex];
             var transforms = chunk.GetSpan<Transform>();
@@ -114,7 +114,7 @@ public void IterationUnsafeAddTwoComponentsSpan()
     {
         ref var chunk = ref _globalArchetype.Chunks[0];
 
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var currentChunk = ref Unsafe.Add(ref chunk, chunkIndex);
             var transforms = currentChunk.GetSpan<Transform>();
@@ -139,7 +139,7 @@ public void IterationUnsafeAddTwoComponentsSpan()
     public void IterationBackwardsUnsafeAdd()
     {
         ref var chunk = ref _globalArchetype.Chunks[0];
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var currentChunk = ref Unsafe.Add(ref chunk, chunkIndex);
             var chunkSize = currentChunk.Size;
@@ -157,7 +157,7 @@ public void IterationBackwardsUnsafeAdd()
     public void IterationBackwardsUnsafeSubstract()
     {
         ref var chunk = ref _globalArchetype.Chunks[0];
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var currentChunk = ref Unsafe.Add(ref chunk, chunkIndex);
             var chunkSize = currentChunk.Size;
@@ -175,7 +175,7 @@ public void IterationBackwardsUnsafeSubstract()
     public void IterationBackwardsLoop()
     {
         ref var chunk = ref _globalArchetype.Chunks[0];
-        for (var chunkIndex = 0; chunkIndex < _globalArchetype.Size; chunkIndex++)
+        for (var chunkIndex = 0; chunkIndex < _globalArchetype.ChunkCount; chunkIndex++)
         {
             ref var currentChunk = ref Unsafe.Add(ref chunk, chunkIndex);
             var chunkSize = currentChunk.Size;

diff --git a/src/Arch.Benchmarks/QueryBenchmark.cs b/src/Arch.Benchmarks/QueryBenchmark.cs
@@ -46,12 +46,13 @@ public void WorldEntityQuery()
     [Benchmark]
     public void EntityExtensionQuery()
     {
+        /*
         _world.Query(in _queryDescription, (Entity entity) =>
         {
             var refs = entity.Get<Transform, Velocity>();
             refs.t0.X += refs.t1.X;
             refs.t0.Y += refs.t1.Y;
-        });
+        });*/
     }
 #endif
 

diff --git a/src/Arch.SourceGen/Queries/AddWithQueryDescription.cs b/src/Arch.SourceGen/Queries/AddWithQueryDescription.cs
@@ -56,7 +56,7 @@ public static void AppendAddWithQueryDescription(this StringBuilder sb, int amou
                 foreach (var archetype in query.GetArchetypeIterator())
                 {
                     // Archetype with T shouldnt be skipped to prevent undefined behaviour.
-                    if(archetype.Entities == 0 || archetype.Has<{{generics}}>())
+                    if(archetype.EntityCount == 0 || archetype.Has<{{generics}}>())
                     {
                         continue;
                     }

diff --git a/src/Arch.SourceGen/Queries/InlineParallelQuery.cs b/src/Arch.SourceGen/Queries/InlineParallelQuery.cs
@@ -28,7 +28,7 @@ public static void AppendHpParallelQuery(this StringBuilder builder, int amount)
                 var query = Query(in description);
                 foreach (var archetype in query.GetArchetypeIterator())
                 {
-                    var archetypeSize = archetype.Size;
+                    var archetypeSize = archetype.ChunkCount;
                     var part = new RangePartitioner(Environment.ProcessorCount, archetypeSize);
                     foreach (var range in part)
                     {
@@ -87,7 +87,7 @@ public static void AppendHpeParallelQuery(this StringBuilder builder, int amount
                 var query = Query(in description);
                 foreach (var archetype in query.GetArchetypeIterator()) {
 
-                    var archetypeSize = archetype.Size;
+                    var archetypeSize = archetype.ChunkCount;
                     var part = new RangePartitioner(Environment.ProcessorCount, archetypeSize);
                     foreach (var range in part)
                     {

diff --git a/src/Arch.SourceGen/Queries/ParallelQuery.cs b/src/Arch.SourceGen/Queries/ParallelQuery.cs
@@ -28,7 +28,7 @@ public static StringBuilder AppendParallelQuery(this StringBuilder sb, int amoun
                 var query = Query(in description);
                 foreach (var archetype in query.GetArchetypeIterator()) {
 
-                    var archetypeSize = archetype.Size;
+                    var archetypeSize = archetype.ChunkCount;
                     var part = new RangePartitioner(Environment.ProcessorCount, archetypeSize);
                     foreach (var range in part)
                     {
@@ -88,7 +88,7 @@ public static StringBuilder AppendParallelEntityQuery(this StringBuilder sb, int
                 var query = Query(in description);
                 foreach (var archetype in query.GetArchetypeIterator())
                 {
-                    var archetypeSize = archetype.Size;
+                    var archetypeSize = archetype.ChunkCount;
                     var part = new RangePartitioner(Environment.ProcessorCount, archetypeSize);
                     foreach (var range in part)
                     {

diff --git a/src/Arch.SourceGen/Queries/RemoveWithQueryDescription.cs b/src/Arch.SourceGen/Queries/RemoveWithQueryDescription.cs
@@ -53,7 +53,7 @@ public static void AppendRemoveWithQueryDescription(this StringBuilder sb, int a
                 foreach (var archetype in query.GetArchetypeIterator())
                 {
                     // Archetype without T shouldnt be skipped to prevent undefined behaviour.
-                    if(archetype.Entities <= 0 || !archetype.Has<{{generics}}>())
+                    if(archetype.EntityCount <= 0 || !archetype.Has<{{generics}}>())
                     {
                         continue;
                     }

diff --git a/src/Arch.Tests/ArchetypeTest.cs b/src/Arch.Tests/ArchetypeTest.cs
@@ -36,17 +36,17 @@ public void CreateChunk()
             archetype.Add(entity, out _);
         }
 
-        That(archetype.Size, Is.EqualTo(1));  // Since we filled it with n entities, it must have one single chunk.
+        That(archetype.ChunkCount, Is.EqualTo(1));  // Since we filled it with n entities, it must have one single chunk.
     }
 
     /// <summary>
-    ///     Checks if the <see cref="Archetype.ChunkSize"/> increases when <see cref="Entity"/>s and their components become too large.
+    ///     Checks if the <see cref="Archetype.ChunkSizeInBytes"/> increases when <see cref="Entity"/>s and their components become too large.
     /// </summary>
     [Test]
     public void ScaleChunkCapacity()
     {
         var archetype = new Archetype(_heavyGroup);
-        That(archetype.ChunkSize, Is.EqualTo(Archetype.BaseSize * 2)); // heavyGroup should be large enough to force the chunk to pick a 32KB chunk instead of 16KB
+        That(archetype.ChunkSizeInBytes, Is.EqualTo(Archetype.BaseSize * 2)); // heavyGroup should be large enough to force the chunk to pick a 32KB chunk instead of 16KB
     }
 
     /// <summary>
@@ -64,7 +64,7 @@ public void CreateMultipleChunk()
             archetype.Add(entity, out _);
         }
 
-        That(archetype.Size, Is.EqualTo(2));
+        That(archetype.ChunkCount, Is.EqualTo(2));
     }
 
     /// <summary>
@@ -83,8 +83,8 @@ public void Reserve()
             archetype.Add(entity, out _);
         }
 
-        That(archetype.Size, Is.EqualTo(10));
-        That(archetype.Capacity, Is.EqualTo(10));
+        That(archetype.ChunkCount, Is.EqualTo(10));
+        That(archetype.ChunkCapacity, Is.EqualTo(10));
     }
 
     /// <summary>
@@ -105,8 +105,8 @@ public void RemoveFromChunkWithReplacement()
         var slot = new Slot(0, 0);
         archetype.Remove(ref slot, out _);
 
-        That(archetype.Size, Is.EqualTo(2));
-        That(archetype.Capacity, Is.EqualTo(2));
+        That(archetype.ChunkCount, Is.EqualTo(2));
+        That(archetype.ChunkCapacity, Is.EqualTo(2));
         That(archetype.Chunks[0].Size, Is.EqualTo(entities - 50));
         That(archetype.Chunks[1].Size, Is.EqualTo(49));
         That(archetype.Chunks[0].Entities[0].Id, Is.EqualTo(archetype.CalculateEntitiesPerChunk(_group) + 50 - 1)); // Last entity from second chunk now replaced the removed entity and is in the first chunk
@@ -130,8 +130,8 @@ public void RemoveChunk()
         var slot = new Slot(0, 0);
         archetype.Remove(ref slot, out _);
 
-        That(archetype.Size, Is.EqualTo(1));
-        That(archetype.Capacity, Is.EqualTo(2));
+        That(archetype.ChunkCount, Is.EqualTo(1));
+        That(archetype.ChunkCapacity, Is.EqualTo(2));
         That(archetype.Chunks[0].Size, Is.EqualTo(entities - 1));
         That(archetype.Chunks[0].Entities[0].Id, Is.EqualTo(archetype.CalculateEntitiesPerChunk(_group))); // Last entity from second chunk now replaced the removed entity and is in the first chunk
     }
@@ -256,7 +256,7 @@ public void CopyTo([Values(1111,2222,3333)] int sourceAmount, [Values(1111,2222,
         }
 
         // Make sure that EVERY single entity was copied correctly
-        That(destination.Entities, Is.EqualTo(sourceAmount+destinationAmount));
+        That(destination.EntityCount, Is.EqualTo(sourceAmount+destinationAmount));
         That(countedSourceItems, Is.EqualTo(sourceAmount));
         That(countedDestinationItems, Is.EqualTo(destinationAmount));
     }
@@ -301,7 +301,7 @@ public void CopyToShift([Values(1111,2222,3333)] int sourceAmount, [Values(1111,
         Archetype.Copy(source, destination);
         source.Clear();
 
-        That(destination.Entities, Is.EqualTo(sourceAmount+destinationAmount));
+        That(destination.EntityCount, Is.EqualTo(sourceAmount+destinationAmount));
         That(source.Entity(ref sourceSlot), Is.EqualTo(destination.Entity(ref resultSlot)));  // Make sure entities were copied correctly.
     }
 }
diff --git a/src/Arch.Tests/EnumeratorTest.cs b/src/Arch.Tests/EnumeratorTest.cs
@@ -122,8 +122,8 @@ public void QueryChunkEnumeration()
             counter++;
         }
 
-        var archetype1ChunkCount = _world.Archetypes[0].Size;
-        var archetype2ChunkCount = _world.Archetypes[1].Size;
+        var archetype1ChunkCount = _world.Archetypes[0].ChunkCount;
+        var archetype2ChunkCount = _world.Archetypes[1].ChunkCount;
         That(counter, Is.EqualTo(archetype1ChunkCount + archetype2ChunkCount));
     }
 }
diff --git a/src/Arch.Tests/WorldTest.cs b/src/Arch.Tests/WorldTest.cs
@@ -101,8 +101,8 @@ public void DestroyAll()
         }
 
         That(_world.Size, Is.EqualTo(0));
-        That(_world.Archetypes[0].Size, Is.EqualTo(1));
-        That(_world.Archetypes[1].Size, Is.EqualTo(1));
+        That(_world.Archetypes[0].ChunkCount, Is.EqualTo(1));
+        That(_world.Archetypes[1].ChunkCount, Is.EqualTo(1));
     }
 
     /// <summary>
@@ -276,8 +276,8 @@ public void TrimExcess()
         var archetype = world.Archetypes[0];
         That(world.Size, Is.EqualTo(1));
         That(world.Capacity, Is.EqualTo(archetype.EntitiesPerChunk));
-        That(archetype.Size, Is.EqualTo(1));
-        That(archetype.Capacity, Is.EqualTo(1));
+        That(archetype.ChunkCount, Is.EqualTo(1));
+        That(archetype.ChunkCapacity, Is.EqualTo(1));
     }
 
     /// <summary>
@@ -304,7 +304,7 @@ public void TrimExcessEmptyArchetypes()
 
         var archetype = world.Archetypes[0];
         That(world.Archetypes.Count, Is.EqualTo(1));
-        That(world.Capacity, Is.EqualTo(archetype.Size * archetype.EntitiesPerChunk));
+        That(world.Capacity, Is.EqualTo(archetype.ChunkCount * archetype.EntitiesPerChunk));
     }
 
     /// <summary>
@@ -547,7 +547,7 @@ public void Remove()
         _world.Remove<Transform>(entity2);
 
         That(_world.GetArchetype(entity2), Is.EqualTo(_world.GetArchetype(entity)));
-        That(_world.GetArchetype(entity).Size, Is.EqualTo(1));
+        That(_world.GetArchetype(entity).ChunkCount, Is.EqualTo(1));
         That(_world.GetArchetype(entity).Chunks[0].Size, Is.EqualTo(2));
     }
 
@@ -601,7 +601,7 @@ public void Remove_NonGeneric()
         _world.RemoveRange(entity2, typeof(Transform));
 
         That(_world.GetArchetype(entity2), Is.EqualTo(_world.GetArchetype(entity)));
-        That(_world.GetArchetype(entity).Size, Is.EqualTo(1));
+        That(_world.GetArchetype(entity).ChunkCount, Is.EqualTo(1));
         That(_world.GetArchetype(entity).Chunks[0].Size, Is.EqualTo(2));
     }
 
@@ -671,7 +671,7 @@ public void GeneratedRemove()
         _world.Remove<Rotation, Ai>(entity2);
 
         That(_world.GetArchetype(entity2), Is.EqualTo(_world.GetArchetype(entity)));
-        That(_world.GetArchetype(entity).Size, Is.EqualTo(1));
+        That(_world.GetArchetype(entity).ChunkCount, Is.EqualTo(1));
         That(_world.GetArchetype(entity).Chunks[0].Size, Is.EqualTo(2));
     }