From c8b963d05113221d91516e93604b23498fbb45d9 Mon Sep 17 00:00:00 2001 From: Asriel Camora Date: Sat, 11 Nov 2023 23:58:46 -0800 Subject: [PATCH] Memory optimization stuff --- Simulator/SimulationState.cs | 11 +---------- Solver/NodeScoresBuffer.cs | 13 +++++++------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Simulator/SimulationState.cs b/Simulator/SimulationState.cs index 74cac04..8147cdb 100644 --- a/Simulator/SimulationState.cs +++ b/Simulator/SimulationState.cs @@ -18,7 +18,7 @@ public record struct SimulationState public ActionStates ActionStates; // https://github.com/ffxiv-teamcraft/simulator/blob/0682dfa76043ff4ccb38832c184d046ceaff0733/src/model/tables.ts#L2 - private static readonly int[] HQPercentTable = { + private static ReadOnlySpan HQPercentTable => new[] { 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 20, 20, 21, 22, 23, 24, 26, 28, 31, 34, 38, 42, 47, 52, 58, 64, 68, 71, @@ -44,13 +44,4 @@ public record struct SimulationState ActionCount = 0; ActionStates = new(); } - -#if IS_DETERMINISTIC - public override readonly string ToString() - { - var b = new System.Text.StringBuilder(); - PrintMembers(b); - return Convert.ToHexString(System.Security.Cryptography.SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(b.ToString()))); - } -#endif } diff --git a/Solver/NodeScoresBuffer.cs b/Solver/NodeScoresBuffer.cs index fecfb40..5d45e59 100644 --- a/Solver/NodeScoresBuffer.cs +++ b/Solver/NodeScoresBuffer.cs @@ -7,11 +7,11 @@ namespace Craftimizer.Solver; // Adapted from https://github.com/dtao/ConcurrentList/blob/4fcf1c76e93021a41af5abb2d61a63caeba2adad/ConcurrentList/ConcurrentList.cs public struct NodeScoresBuffer { - public sealed class ScoresBatch + public readonly struct ScoresBatch { - public Memory ScoreSum; - public Memory MaxScore; - public Memory Visits; + public readonly Memory ScoreSum; + public readonly Memory MaxScore; + public readonly Memory Visits; public ScoresBatch() { @@ -40,9 +40,10 @@ public struct NodeScoresBuffer var idx = Count++; - var (arrayIdx, _) = GetArrayIndex(idx); + var (arrayIdx, subIdx) = GetArrayIndex(idx); - Data[arrayIdx] ??= new(); + if (subIdx == 0) + Data[arrayIdx] = new(); } public readonly void Visit((int arrayIdx, int subIdx) at, float score)