1.0.9

BlueAmulet · Sep 15, 2024 · 0920563 · 0920563
1 parent d2b609a
commit 0920563
Show file tree

Hide file tree

Showing 8 changed files with 258 additions and 79 deletions.
diff --git a/Packages/blueamulet.udonsharpoptimizer/Editor/BlueAmulet.UdonSharpOptimizer.asmdef b/Packages/blueamulet.udonsharpoptimizer/Editor/BlueAmulet.UdonSharpOptimizer.asmdef
@@ -6,6 +6,7 @@
         "VRC.SDK3.Editor",
         "VRC.SDKBase",
         "VRC.SDKBase.Editor",
+        "UdonSharp.Runtime",
         "UdonSharp.Editor"
     ],
     "includePlatforms": [

diff --git a/Packages/blueamulet.udonsharpoptimizer/Editor/Optimizer.cs b/Packages/blueamulet.udonsharpoptimizer/Editor/Optimizer.cs
diff --git a/Packages/blueamulet.udonsharpoptimizer/Editor/OptimizerEditorWindow.cs b/Packages/blueamulet.udonsharpoptimizer/Editor/OptimizerEditorWindow.cs
@@ -13,6 +13,8 @@ internal class OptimizerEditorWindow : EditorWindow
         SerializedProperty _optimization3;
         SerializedProperty _optimization4;
         SerializedProperty _optimizationVar;
+        SerializedProperty _optimizationBR;
+        SerializedProperty _optimizationSL;
         SerializedProperty _optimizationThis;
 
         [MenuItem("Tools/UdonSharp Optimizer")]
@@ -31,6 +33,8 @@ public void OnEnable()
             _optimization3 = _settingsSO.FindProperty(nameof(OptimizerSettings.EnableOPT03));
             _optimization4 = _settingsSO.FindProperty(nameof(OptimizerSettings.EnableOPT04));
             _optimizationVar = _settingsSO.FindProperty(nameof(OptimizerSettings.EnableVariableReduction));
+            _optimizationBR = _settingsSO.FindProperty(nameof(OptimizerSettings.EnableBlockReduction));
+            _optimizationSL = _settingsSO.FindProperty(nameof(OptimizerSettings.EnableStoreLoad));
             _optimizationThis = _settingsSO.FindProperty(nameof(OptimizerSettings.EnableThisBugFix));
         }
 
@@ -73,9 +77,12 @@ public void OnGUI()
                 EditorGUILayout.PropertyField(_optimization2, false);
                 EditorGUILayout.PropertyField(_optimization3, false);
                 EditorGUILayout.PropertyField(_optimization4, false);
+                EditorGUILayout.Space();
                 EditorGUILayout.PropertyField(_optimizationVar, false);
                 using (new EditorGUI.DisabledScope(!_settings.EnableVariableReduction))
                 {
+                    EditorGUILayout.PropertyField(_optimizationBR, false);
+                    EditorGUILayout.PropertyField(_optimizationSL, false);
                     EditorGUILayout.PropertyField(_optimizationThis, false);
                 }
             }

diff --git a/Packages/blueamulet.udonsharpoptimizer/Editor/OptimizerInject.cs b/Packages/blueamulet.udonsharpoptimizer/Editor/OptimizerInject.cs
@@ -1,5 +1,5 @@
 /*
- * Unoffical UdonSharp Optimizer
+ * Unofficial UdonSharp Optimizer
  * Integrates the Optimizer with UdonSharp
  * Written by BlueAmulet
  */
@@ -25,7 +25,7 @@ internal static class OptimizerInject
         private static readonly MethodInfo optimizerInject = AccessTools.Method(typeof(Optimizer), nameof(Optimizer.OptimizeProgram));
 
         private static bool patchSuccess;
-        public static bool PatchSuccess { get => patchSuccess; }
+        public static bool PatchSuccess => patchSuccess;
 
         static OptimizerInject()
         {
@@ -117,7 +117,7 @@ private static IEnumerable<CodeInstruction> TranspilerDump(IEnumerable<CodeInstr
             return instrs;
         }
 
-        public static int LocalIndex(CodeInstruction code)
+        private static int LocalIndex(CodeInstruction code)
         {
             if (code.opcode == OpCodes.Ldloc_0 || code.opcode == OpCodes.Stloc_0) return 0;
             else if (code.opcode == OpCodes.Ldloc_1 || code.opcode == OpCodes.Stloc_1) return 1;

diff --git a/Packages/blueamulet.udonsharpoptimizer/Editor/OptimizerSettings.cs b/Packages/blueamulet.udonsharpoptimizer/Editor/OptimizerSettings.cs
@@ -24,6 +24,10 @@ internal class OptimizerSettings : ScriptableObject
         public bool EnableOPT04 = true;
         [Tooltip("Reduce amount of temporary variables")]
         public bool EnableVariableReduction = true;
+        [Tooltip("Map variables to same variable in different blocks")]
+        public bool EnableBlockReduction = true;
+        [Tooltip("Map Store+Load variables to same variable")]
+        public bool EnableStoreLoad = true;
         [Tooltip("Fix extra __this_ variables")]
         public bool EnableThisBugFix = true;
 

diff --git a/Packages/blueamulet.udonsharpoptimizer/README.txt b/Packages/blueamulet.udonsharpoptimizer/README.txt
@@ -16,4 +16,5 @@ Changelog:
 1.0.5 - Added ExternWrite+Copy check for variables, added missing jump checks
 1.0.6 - Added tail call optimization
 1.0.7 - Single .unitypackage installation
-1.0.8 - Added basic Settings panel
+1.0.8 - Added basic Settings panel
+1.0.9 - Moved TCO into first pass, added block based variable reduction
diff --git a/Packages/blueamulet.udonsharpoptimizer/package.json b/Packages/blueamulet.udonsharpoptimizer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "blueamulet.udonsharpoptimizer",
   "displayName": "UdonSharpOptimizer",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "UdonSharp postprocessor to reduce instruction and variable counts",
   "gitDependencies": {},
   "vpmDependencies": {

diff --git a/README.md b/README.md
@@ -26,3 +26,4 @@ UdonSharp makes a *LOT* of temporary variables. We detect places where we can re
 1.0.6 - Added tail call optimization  
 1.0.7 - Single .unitypackage installation  
 1.0.8 - Added basic Settings panel  
+1.0.9 - Moved TCO into first pass, added block based variable reduction