Made some more minor optimizations to allocations and inlining.

MeltyPlayer · Oct 23, 2023 · 904eea5 · 904eea5
1 parent 545c9e7
commit 904eea5
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 15 deletions.
diff --git a/FinModelUtility/Directory.Build.props b/FinModelUtility/Directory.Build.props
@@ -1,4 +1,9 @@
 <Project>
+  <PropertyGroup>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="$(MSBuildProjectName.Contains('Tests'))">
     <CollectCoverage>true</CollectCoverage>
     <CoverletOutput>TestResults/</CoverletOutput>

diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/GlTransform.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/GlTransform.cs
@@ -32,7 +32,7 @@ public static unsafe void UniformMatrix4(int location, Matrix4x4 matrix) {
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static unsafe void UniformMatrix4s(int location, Matrix4x4[] matrices) {
+    public static unsafe void UniformMatrix4s(int location, ReadOnlySpan<Matrix4x4> matrices) {
       fixed (float* ptr = &(matrices[0].M11)) {
         GL.UniformMatrix4(location, matrices.Length, false, ptr);
       }

diff --git a/FinModelUtility/Fin/Fin/src/image/formats/BImage.cs b/FinModelUtility/Fin/Fin/src/image/formats/BImage.cs
@@ -93,8 +93,8 @@ public override unsafe bool Equals(object? obj) {
                               out var otherB,
                               out var otherA);
 
-                if (thisR != otherR || 
-                    thisG != otherG || 
+                if (thisR != otherR ||
+                    thisG != otherG ||
                     thisB != otherG ||
                     thisA != otherA) {
                   match = false;
@@ -125,9 +125,7 @@ public override unsafe int GetHashCode() {
       var span = new Span<TPixel>(ptr, pixelCount).AsBytes();
 
       var hash = FluentHash.Start();
-      for (var i = 0; i < span.Length; ++i) {
-        hash.With(span[i]);
-      }
+      hash.With(span);
 
       this.cachedHash_ = hash;
       return hash;

diff --git a/FinModelUtility/Fin/Fin/src/util/hash/FluentHash.cs b/FinModelUtility/Fin/Fin/src/util/hash/FluentHash.cs
@@ -1,4 +1,7 @@
-namespace fin.util.hash {
+using System;
+using System.Runtime.CompilerServices;
+
+namespace fin.util.hash {
   public struct FluentHash {
     public int Hash { get; private set; }
     private readonly int primeCoefficient_;
@@ -8,21 +11,38 @@ private FluentHash(int startingPrimeHash, int primeCoefficient) {
       this.primeCoefficient_ = primeCoefficient;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static FluentHash Start() => FluentHash.Start(17, 23);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static FluentHash Start(int startingPrimeHash,
                                    int primeCoefficient)
-      => new FluentHash(startingPrimeHash, primeCoefficient);
+      => new(startingPrimeHash, primeCoefficient);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public FluentHash With<T>(T other) where T : notnull {
       this.Hash = this.Hash * this.primeCoefficient_ + other.GetHashCode();
       return this;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public FluentHash With(ReadOnlySpan<byte> other) {
+      var hash = this.Hash;
+      for (var i = 0; i < other.Length; ++i) {
+        hash = hash * this.primeCoefficient_ + other[i];
+      }
+
+      this.Hash = hash;
+      return this;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator int(FluentHash d) => d.Hash;
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public override int GetHashCode() => this.Hash;
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public override bool Equals(object? other)
       => other?.GetHashCode() == this.GetHashCode();
   }

diff --git a/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj b/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DebugType>embedded</DebugType>
     <SelfContained>true</SelfContained>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>

diff --git a/FinModelUtility/Formats/Modl/Modl/src/schema/anim/WeirdFloatMath.cs b/FinModelUtility/Formats/Modl/Modl/src/schema/anim/WeirdFloatMath.cs
@@ -1,5 +1,5 @@
 namespace modl.schema.anim {
-  internal static class WeirdFloatMath {
+  public static class WeirdFloatMath {
     public static ulong Concat44(uint first, uint second)
       => ((ulong) first << 32) | second;
 

diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64/src/BitLogic.cs b/FinModelUtility/Games/SuperMario64/SuperMario64/src/BitLogic.cs
@@ -1,6 +1,12 @@
-namespace sm64 {
+using System.Runtime.CompilerServices;
+
+namespace sm64 {
   public static class BitLogic {
-    public static uint BytesToInt(byte[] b, int offset, int length) {
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static uint BytesToInt(
+        ReadOnlySpan<byte> b,
+        int offset,
+        int length) {
       switch (length) {
         case 1: return b[0 + offset];
         case 2: return (uint) (b[0 + offset] << 8 | b[1 + offset]);

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DebugType>full</DebugType>
     <SelfContained>true</SelfContained>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>

diff --git a/FinModelUtility/Utility of Time CSharp/Utility of Time CSharp.csproj b/FinModelUtility/Utility of Time CSharp/Utility of Time CSharp.csproj
@@ -15,8 +15,6 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>