Allow to choose the kind of optimization (#964)

* Avoid NoX argument * Fix * Use all * fix ut
neo-project · Feb 27, 2024 · 157a892 · 157a892
1 parent 0412d7e
commit 157a892
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 15 deletions.
diff --git a/src/Neo.Compiler.CSharp/CompilationContext.cs b/src/Neo.Compiler.CSharp/CompilationContext.cs
@@ -132,7 +132,10 @@ internal void Compile()
                 RemoveEmptyInitialize();
                 Instruction[] instructions = GetInstructions().ToArray();
                 instructions.RebuildOffsets();
-                if (!Options.NoOptimize) Optimizer.CompressJumps(instructions);
+                if (Options.Optimize.HasFlag(CompilationOptions.OptimizationType.Basic))
+                {
+                    Optimizer.CompressJumps(instructions);
+                }
                 instructions.RebuildOperands();
             }
         }
@@ -143,7 +146,7 @@ internal void Compile()
             ContractManifest manifest = CreateManifest();
             JObject debugInfo = CreateDebugInformation(folder);
 
-            if (!Options.NoOptimize)
+            if (Options.Optimize.HasFlag(CompilationOptions.OptimizationType.Experimental))
             {
                 try
                 {

diff --git a/src/Neo.Compiler.CSharp/CompilationOptions.cs b/src/Neo.Compiler.CSharp/CompilationOptions.cs
@@ -10,15 +10,26 @@
 
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using System;
 using System.Collections.Generic;
 
 namespace Neo.Compiler
 {
     public class CompilationOptions
     {
+        [Flags]
+        public enum OptimizationType : byte
+        {
+            None = 0,
+            Basic = 1,
+            Experimental = 2,
+
+            All = Basic | Experimental
+        }
+
         public NullableContextOptions Nullable { get; set; }
         public bool Debug { get; set; }
-        public bool NoOptimize { get; set; }
+        public OptimizationType Optimize { get; set; } = OptimizationType.Basic;
         public bool Checked { get; set; }
         public bool NoInline { get; set; }
         public byte AddressVersion { get; set; }

diff --git a/src/Neo.Compiler.CSharp/MethodConvert/MethodConvert.cs b/src/Neo.Compiler.CSharp/MethodConvert/MethodConvert.cs
@@ -103,13 +103,13 @@ private byte AddAnonymousVariable()
 
         private void RemoveAnonymousVariable(byte index)
         {
-            if (!_context.Options.NoOptimize)
+            if (_context.Options.Optimize.HasFlag(CompilationOptions.OptimizationType.Basic))
                 _anonymousVariables.Remove(index);
         }
 
         private void RemoveLocalVariable(ILocalSymbol symbol)
         {
-            if (!_context.Options.NoOptimize)
+            if (_context.Options.Optimize.HasFlag(CompilationOptions.OptimizationType.Basic))
                 _localVariables.Remove(symbol);
         }
 
@@ -226,7 +226,7 @@ public void Convert(SemanticModel model)
                 // it comes from modifier clean up
                 AddInstruction(OpCode.RET);
             }
-            if (!_context.Options.NoOptimize)
+            if (_context.Options.Optimize.HasFlag(CompilationOptions.OptimizationType.Basic))
                 Optimizer.RemoveNops(_instructions);
             _startTarget.Instruction = _instructions[0];
         }

diff --git a/src/Neo.Compiler.CSharp/Options.cs b/src/Neo.Compiler.CSharp/Options.cs
@@ -8,16 +8,20 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using System;
+
 namespace Neo.Compiler
 {
     public class Options : CompilationOptions
     {
-        public enum GenerateArtifactsKind
+        [Flags]
+        public enum GenerateArtifactsKind : byte
         {
-            None,
-            Source,
-            Library,
-            All
+            None = 0,
+            Source = 1,
+            Library = 2,
+
+            All = Source | Library
         }
 
         public string? Output { get; set; }

diff --git a/src/Neo.Compiler.CSharp/Program.cs b/src/Neo.Compiler.CSharp/Program.cs
@@ -201,14 +201,14 @@ private static int ProcessOutput(Options options, string folder, CompilationCont
                 {
                     var artifact = manifest.GetArtifactsSource(baseName, nef);
 
-                    if (options.GenerateArtifacts == Options.GenerateArtifactsKind.All || options.GenerateArtifacts == Options.GenerateArtifactsKind.Source)
+                    if (options.GenerateArtifacts.HasFlag(Options.GenerateArtifactsKind.Source))
                     {
                         path = Path.Combine(outputFolder, $"{baseName}.artifacts.cs");
                         File.WriteAllText(path, artifact);
                         Console.WriteLine($"Created {path}");
                     }
 
-                    if (options.GenerateArtifacts == Options.GenerateArtifactsKind.All || options.GenerateArtifacts == Options.GenerateArtifactsKind.Library)
+                    if (options.GenerateArtifacts.HasFlag(Options.GenerateArtifactsKind.Library))
                     {
                         try
                         {

diff --git a/tests/Neo.SmartContract.Template.UnitTests/templates/TestCleanup.cs b/tests/Neo.SmartContract.Template.UnitTests/templates/TestCleanup.cs
@@ -33,7 +33,7 @@ public void EnsureArtifactsUpToDate()
             var result = new CompilationEngine(new CompilationOptions()
             {
                 Debug = true,
-                NoOptimize = false,
+                Optimize = CompilationOptions.OptimizationType.All,
                 Nullable = Microsoft.CodeAnalysis.NullableContextOptions.Disable
             })
             .CompileSources(

diff --git a/tests/Neo.SmartContract.TestEngine/TestEngine.cs b/tests/Neo.SmartContract.TestEngine/TestEngine.cs
@@ -78,7 +78,7 @@ public List<CompilationContext> AddEntryScripts(bool optimize = true, bool debug
             {
                 AddressVersion = ProtocolSettings.Default.AddressVersion,
                 Debug = debug,
-                NoOptimize = !optimize
+                Optimize = optimize ? Compiler.CompilationOptions.OptimizationType.All : Compiler.CompilationOptions.OptimizationType.None
             }).Compile(files, references);
 
             if (contexts == null || contexts.Count == 0)