Feature: Golf common built-in types using #define.

Author: DeanEdisGG

ShaderShrinker/Shrinker.Parser/Optimizations/GolfExtensions.cs

@@ -11,9 +11,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net;
 using Shrinker.Parser.SyntaxNodes;
 
 namespace Shrinker.Parser.Optimizations
@@ -42,6 +40,7 @@ public static void GolfDefineCommonTerms(this SyntaxNode rootNode)
             var userDefinedNames = rootNode.FindUserDefinedNames();
             var defineMap = new Dictionary<string, string[]>
             {
+                { "float", new[] { "F", "f", "_f" } },
                 { "abs", new[] { "A" } },
                 { "acos", new[] { "AC" } },
                 { "acosh", new[] { "ACH" } },
@@ -63,7 +62,7 @@ public static void GolfDefineCommonTerms(this SyntaxNode rootNode)
                 { "distance", new[] { "DST" } },
                 { "dot", new[] { "D" } },
                 { "faceforward", new[] { "FF" } },
-                { "floor", new[] { "F" } },
+                { "floor", new[] { "FL" } },
                 { "fract", new[] { "FC" } },
                 { "fwidth", new[] { "FW" } },
                 { "greaterThan", new[] { "GT" } },
@@ -122,13 +121,12 @@ public static void GolfDefineCommonTerms(this SyntaxNode rootNode)
 
             var keywordNodes = 
                 rootNode.TheTree
-                    .OfType<GlslFunctionCallSyntaxNode>()
-                    .Where(o => defineMap.ContainsKey(o.Name))
+                    .Where(o => o is IRenamable or VariableDeclarationSyntaxNode && defineMap.ContainsKey(GetSupportedBuiltinName(o)))
                     .ToList();
             foreach (var keyword in defineMap.Keys)
             {
                 // How many occurrences are in the code?
-                var nodes = keywordNodes.Where(o => o.Name == keyword).ToList();
+                var nodes = keywordNodes.Where(o => GetSupportedBuiltinName(o) == keyword).ToList();
                 if (nodes.Count <= 1)
                     continue; // Not worth it.
 
@@ -144,7 +142,13 @@ public static void GolfDefineCommonTerms(this SyntaxNode rootNode)
                     continue; // Could replace with #define, but not worth it.
 
                 // We'll get a space saving - Replace the nodes...
-                nodes.ForEach(o => o.Rename(replacement));
+                foreach (var node in nodes)
+                {
+                    if (node is IRenamable r)
+                        r.Rename(replacement);
+                    else
+                        ((VariableDeclarationSyntaxNode)node).RenameType(replacement);
+                }
 
                 // ...and add a #define.
                 var existingDefine = rootNode.Children.OfType<PragmaDefineSyntaxNode>().FirstOrDefault();
@@ -153,6 +157,21 @@ public static void GolfDefineCommonTerms(this SyntaxNode rootNode)
             }
         }
 
+        private static string GetSupportedBuiltinName(SyntaxNode node)
+        {
+            if (node is IRenamable n)
+                return n.Name;
+            if (node is VariableDeclarationSyntaxNode decl)
+            {
+                var name = decl.VariableType.Content;
+                if (name.StartsWith("const"))
+                    name = name.Substring(5).TrimStart();
+                return name;
+            }
+
+            return null;
+        }
+
         private static string NameWithoutDotSuffix(string name) => name.Split('.').First();
 
         private static Dictionary<string, string> BuildGolfRenameMap(SyntaxNode rootNode)

ShaderShrinker/Shrinker.Parser/SyntaxNodes/VariableDeclarationSyntaxNode.cs

@@ -19,7 +19,7 @@ namespace Shrinker.Parser.SyntaxNodes
 {
     public class VariableDeclarationSyntaxNode : SyntaxNode
     {
-        public TypeToken VariableType { get; }
+        public TypeToken VariableType { get; private set; }
 
         public IEnumerable<VariableAssignmentSyntaxNode> Definitions => Children.OfType<VariableAssignmentSyntaxNode>().ToList();
 
@@ -56,5 +56,8 @@ public override string UiName
         public bool IsSameType(VariableDeclarationSyntaxNode other) =>
             VariableType.Content == other.VariableType.Content &&
             VariableType.IsConst == other.VariableType.IsConst;
+
+        public void RenameType(string newTypeName) =>
+            VariableType = new TypeToken(VariableType.IsConst ? $"const {newTypeName}" : newTypeName);
     }
 }

ShaderShrinker/UnitTests/GolfTests.cs

@@ -95,6 +95,7 @@ public void CheckGolfingCodeNames(
         public void CheckGolfingCommonTerms(
             [Values(
                        "void f() { vec3 a; vec3 b; }|void f() { vec3 a; vec3 b; }",
+                       "void f(vec3 q) { const vec3 a = vec3(1); vec3 b; vec3 c; vec3 d; vec3 e; vec3 f; vec3 g; vec3 h; vec3 i; }|#define v3 vec3 void f(v3 q) { const v3 a = v3(1); v3 b; v3 c; v3 d; v3 e; v3 f; v3 g; v3 h; v3 i; }",
                        "float f(float a, float b) { return smoothstep(0.0, 1.0, a) + smoothstep(0.5, 1.5, b) + smoothstep(0.0, 1.0, a + b); }|#define S smoothstep float f(float a, float b) { return S(0.0, 1.0, a) + S(0.5, 1.5, b) + S(0.0, 1.0, a + b); }"
                    )]
             string codeAndGolfed)