Performance Pass (Flat Refactor)

Spec.Test/WastJson/Actions.cs

@@ -51,10 +51,17 @@ public Value[] Invoke(ref WasmRuntime runtime, ref Module? module)
             }
             if (addr == null)
                 throw new InvalidDataException(
-                    $"Could not get exported function {moduleName}.{Field}");    
-
+                    $"Could not get exported function {moduleName}.{Field}");
+
+            var options = new InvokerOptions();
+            if (runtime.TraceExecution)
+            {
+                Console.Error.WriteLine($"\nInvoking wasm function {Field}");
+                options.LogInstructionExecution = InstructionLogging.All;
+            }
+
             //Compute type from action.Args and action.Expected
-            var invoker = runtime.CreateStackInvoker(addr.Value);
+            var invoker = runtime.CreateStackInvoker(addr.Value, options);
 
             var pVals = Args.Select(arg => arg.AsValue).ToArray();
             return invoker(pVals);

Spec.Test/WastJson/WastJson.cs

@@ -33,5 +33,7 @@ public class WastJson
         public string Path { get; set; } = "";
 
         public override string ToString() => $"{SourceFilename}";
+
+        public bool TraceExecution;
     }
 }

Spec.Test/WastJsonTestData.cs

@@ -49,6 +49,8 @@ static WastJsonTestData()
                 .Select(cfg => cfg.Value ?? "")
                 .ToHashSet();
 
+        public static bool TraceExecution => Configuration["TraceExecution"] == "True";
+
         public IEnumerator<object[]> GetEnumerator()
         {
             var files = Directory.GetFiles(JsonDirectory, "*.json", SearchOption.AllDirectories).OrderBy(path => path);
@@ -88,6 +90,7 @@ static WastJson.WastJson LoadTestDefinition(string jsonPath)
                 throw new JsonException($"Error while parsing {jsonPath}");
 
             testDefinition.Path = Path.GetDirectoryName(jsonPath)!;
+            testDefinition.TraceExecution = TraceExecution;
             return testDefinition;
         }
     }

Spec.Test/WastTests.cs

@@ -42,6 +42,7 @@ public void RunWast(WastJson.WastJson file)
             WasmRuntime runtime = new();
             env.BindToRuntime(runtime);
             runtime.TranspileModules = false;
+            runtime.TraceExecution = file.TraceExecution;
 
             Module? module = null;
             foreach (var command in file.Commands)

Spec.Test/testsettings.json

@@ -1,6 +1,7 @@
 {
   "JsonDirectory": "../../../generated-json",
   "RunTranspilerTests": true,
+  "TraceExecution": false,
   "Single": null,
   "SkipWasts": [
     "comments.wast",

Wacs.Console/Program.cs

@@ -16,6 +16,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using CommandLine;
@@ -121,10 +122,22 @@ static int RunWithOptions(CommandLineOptions opts)
 
             var runtime = new WasmRuntime();
 
+            var parseTimer = new Stopwatch();
+            if (opts.LogProg)
+            {
+                parseTimer.Start();
+            }
+
             //Parse the module
             using var fileStream = new FileStream(opts.WasmModule, FileMode.Open);
             var module = BinaryModuleParser.ParseWasm(fileStream);
 
+            if (opts.LogProg)
+            {
+                parseTimer.Stop();
+                System.Console.Error.WriteLine($"Parsing module took {parseTimer.ElapsedMilliseconds:#0.###}ms");
+            }
+
             if (opts.Render)
             {
                 string outputFilePath = Path.ChangeExtension(opts.WasmModule, ".wat");
@@ -210,13 +223,13 @@ static int RunWithOptions(CommandLineOptions opts)
             if (opts.LogProg)
                 System.Console.Error.WriteLine($"Instantiating Module {moduleName}");
 
+            if (opts.Transpile)
+                runtime.TranspileModules = true;
+
             //Validation normally happens after instantiation, but you can skip it if you did it after parsing, or you're like super confident.
-            var modInst = runtime.InstantiateModule(module, new RuntimeOptions { SkipModuleValidation = true });
+            var modInst = runtime.InstantiateModule(module, new RuntimeOptions { SkipModuleValidation = true, TimeInstantiation = opts.LogProg});
             runtime.RegisterModule(moduleName, modInst);
 
-            if (opts.Transpile)
-                runtime.TranspileModule(modInst);
-
             var callOptions = new InvokerOptions
             {
                 LogGas = opts.LogGas,
@@ -225,6 +238,7 @@ static int RunWithOptions(CommandLineOptions opts)
                 LogInstructionExecution = opts.LogInstructionExecution,
                 CalculateLineNumbers = opts.CalculateLineNumbers,
                 CollectStats = opts.CollectStats,
+                SynchronousExecution = true,
             };
 
             //Wasm/WASI entry points

Wacs.Console/Wacs.Console.csproj

@@ -20,6 +20,10 @@
     <PackageId>Wacs.Console</PackageId>
     <Product>Wacs.Console</Product>
   </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>TRACE;STRICT_EXECUTION</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Wacs.Core\Wacs.Core.csproj" />

Wacs.Core/Attributes/OpCodeAttribute.cs

@@ -1,18 +1,16 @@
-// /*
-//  * Copyright 2024 Kelvin Nishikawa
-//  *
-//  * Licensed under the Apache License, Version 2.0 (the "License");
-//  * you may not use this file except in compliance with the License.
-//  * You may obtain a copy of the License at
-//  *
-//  *     http://www.apache.org/licenses/LICENSE-2.0
-//  *
-//  * Unless required by applicable law or agreed to in writing, software
-//  * distributed under the License is distributed on an "AS IS" BASIS,
-//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  * See the License for the specific language governing permissions and
-//  * limitations under the License.
-//  */
+// Copyright 2024 Kelvin Nishikawa
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 

Wacs.Core/Attributes/WasmTypeAttribute.cs

@@ -1,18 +1,16 @@
-// /*
-//  * Copyright 2024 Kelvin Nishikawa
-//  *
-//  * Licensed under the Apache License, Version 2.0 (the "License");
-//  * you may not use this file except in compliance with the License.
-//  * You may obtain a copy of the License at
-//  *
-//  *     http://www.apache.org/licenses/LICENSE-2.0
-//  *
-//  * Unless required by applicable law or agreed to in writing, software
-//  * distributed under the License is distributed on an "AS IS" BASIS,
-//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  * See the License for the specific language governing permissions and
-//  * limitations under the License.
-//  */
+// Copyright 2024 Kelvin Nishikawa
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;
 using Wacs.Core.Types.Defs;

Wacs.Core/Attributes/WatTokenAttribute.cs

@@ -1,18 +1,16 @@
-// /*
-//  * Copyright 2024 Kelvin Nishikawa
-//  *
-//  * Licensed under the Apache License, Version 2.0 (the "License");
-//  * you may not use this file except in compliance with the License.
-//  * You may obtain a copy of the License at
-//  *
-//  *     http://www.apache.org/licenses/LICENSE-2.0
-//  *
-//  * Unless required by applicable law or agreed to in writing, software
-//  * distributed under the License is distributed on an "AS IS" BASIS,
-//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  * See the License for the specific language governing permissions and
-//  * limitations under the License.
-//  */
+// Copyright 2024 Kelvin Nishikawa
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 using System;