[WASM] Fix rename of main.js to test-main.js (#1916)

Co-authored-by: pavelsavara <[email protected]>
Co-authored-by: Adam Sitnik <[email protected]>

Author: 3 people

docs/articles/guides/console-args.md

@@ -222,6 +222,6 @@ dotnet run -c Release -- --filter * --runtimes netcoreapp2.0 netcoreapp2.1 --sta
 * `--runOncePerIteration` run the benchmark exactly once per iteration.
 * `--buildTimeout` build timeout in seconds.
 * `--wasmEngine` full path to a java script engine used to run the benchmarks, used by Wasm toolchain.
-* `--wasmMainJS` path to the main.js file used by Wasm toolchain. Mandatory when using \"--runtimes wasm\"
+* `--wasmMainJS` path to the test-main.js file used by Wasm toolchain. Mandatory when using \"--runtimes wasm\"
 * `--expose_wasm` arguments for the JavaScript engine used by Wasm toolchain.
 * `--customRuntimePack` specify the path to a custom runtime pack. Only used for wasm currently.

src/BenchmarkDotNet/Templates/WasmAotCsProj.txt

@@ -13,7 +13,7 @@
     <PublishTrimmed>true</PublishTrimmed>
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
     <RunAOTCompilation>true</RunAOTCompilation>
-    <WasmMainJSPath>$(RuntimeSrcDir)\src\mono\wasm\test-main.js</WasmMainJSPath>
+    <WasmMainJSPath>$(RuntimeSrcDir)\src\mono\wasm\$MAINJS$</WasmMainJSPath>
     <WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <WasmNativeWorkload>false</WasmNativeWorkload>

src/BenchmarkDotNet/Templates/WasmCsProj.txt

@@ -12,7 +12,7 @@
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
     <PublishTrimmed>false</PublishTrimmed>
     <RunAOTCompilation>false</RunAOTCompilation>
-    <WasmMainJSPath>$(RuntimeSrcDir)\src\mono\wasm\test-main.js</WasmMainJSPath>
+    <WasmMainJSPath>$(RuntimeSrcDir)\src\mono\wasm\$MAINJS$/WasmMainJSPath>
     <WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <WasmNativeWorkload>false</WasmNativeWorkload>

src/BenchmarkDotNet/Toolchains/Executor.cs

@@ -116,7 +116,10 @@ private ProcessStartInfo CreateStartInfo(BenchmarkCase benchmarkCase, ArtifactsP
                 case WasmRuntime wasm:
                     start.FileName = wasm.JavaScriptEngine;
                     start.RedirectStandardInput = false;
-                    start.Arguments = $"{wasm.JavaScriptEngineArguments} main.js -- --run {artifactsPaths.ProgramName}.dll {args} ";
+
+                    string main_js = runtime.RuntimeMoniker < RuntimeMoniker.WasmNet70 ? "main.js" : "test-main.js";
+
+                    start.Arguments = $"{wasm.JavaScriptEngineArguments} {main_js} -- --run {artifactsPaths.ProgramName}.dll {args} ";
                     start.WorkingDirectory = artifactsPaths.BinariesDirectoryPath;
                     break;
                 case MonoAotLLVMRuntime _:

src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs

@@ -13,12 +13,14 @@ public class WasmGenerator : CsProjGenerator
     {
         private readonly string CustomRuntimePack;
         private readonly bool Aot;
+        private readonly string MainJS;
 
         public WasmGenerator(string targetFrameworkMoniker, string cliPath, string packagesPath, string customRuntimePack, bool aot)
             : base(targetFrameworkMoniker, cliPath, packagesPath, runtimeFrameworkVersion: null)
         {
             Aot = aot;
             CustomRuntimePack = customRuntimePack;
+            MainJS = (targetFrameworkMoniker == "net5.0" || targetFrameworkMoniker == "net6.0") ? "main.js" : "test-main.js";
         }
 
         protected override void GenerateProject(BuildPartition buildPartition, ArtifactsPaths artifactsPaths, ILogger logger)
@@ -56,6 +58,7 @@ protected  void GenerateProjectAot(BuildPartition buildPartition, ArtifactsPaths
                     .Replace("$COPIEDSETTINGS$", customProperties)
                     .Replace("$CONFIGURATIONNAME$", buildPartition.BuildConfiguration)
                     .Replace("$SDKNAME$", sdkName)
+                    .Replace("$MAINJS$", MainJS)
                     .ToString();
 
                 File.WriteAllText(artifactsPaths.ProjectFilePath, content);
@@ -84,14 +87,15 @@ protected void GenerateProjectInterpreter(BuildPartition buildPartition, Artifac
                     .Replace("$CONFIGURATIONNAME$", buildPartition.BuildConfiguration)
                     .Replace("$SDKNAME$", sdkName)
                     .Replace("$RUNTIMEPACK$", CustomRuntimePack ?? "")
+                    .Replace("$MAINJS$", MainJS)
                     .Replace("$TARGET$", CustomRuntimePack != null ? "PublishWithCustomRuntimePack" : "Publish")
                 .ToString();
 
                 File.WriteAllText(artifactsPaths.ProjectFilePath, content);
             }
         }
 
-        protected override string GetExecutablePath(string binariesDirectoryPath, string programName) => Path.Combine(binariesDirectoryPath, "main.js");
+        protected override string GetExecutablePath(string binariesDirectoryPath, string programName) => Path.Combine(binariesDirectoryPath, MainJS);
 
         protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration)
         {