diff --git a/docs/articles/configs/toolchains.md b/docs/articles/configs/toolchains.md index 385c9ffcbd..4b0bf1c8ba 100644 --- a/docs/articles/configs/toolchains.md +++ b/docs/articles/configs/toolchains.md @@ -336,13 +336,6 @@ And FINALLY build Mono Runtime with Web Assembly support: ./build.sh --arch wasm --os Browser -c release ``` -Before you run the benchmarks, you need to make sure that following two file exists: - -```cmd -runtime/src/mono/wasm/runtime-test.js -runtime/build.sh -``` - And that you have .NET 5 feed added to your `nuget.config` file: ```xml diff --git a/samples/BenchmarkDotNet.Samples/IntroWasm.cs b/samples/BenchmarkDotNet.Samples/IntroWasm.cs index cf50d5671d..d2e55aca68 100644 --- a/samples/BenchmarkDotNet.Samples/IntroWasm.cs +++ b/samples/BenchmarkDotNet.Samples/IntroWasm.cs @@ -18,8 +18,6 @@ public class IntroWasmCmdConfig // --runtimes Wasm // path to dotnet cli // --cli /home/adam/projects/runtime/dotnet.sh - // path to main js: - // --wasmMainJs /home/adam/projects/runtime/src/mono/wasm/runtime-test.js public static void Run(string[] args) => BenchmarkSwitcher.FromAssembly(typeof(IntroWasmCmdConfig).Assembly).Run(args); [Benchmark] diff --git a/src/BenchmarkDotNet/Templates/WasmAotCsProj.txt b/src/BenchmarkDotNet/Templates/WasmAotCsProj.txt index c41be5c8be..066bcdec05 100644 --- a/src/BenchmarkDotNet/Templates/WasmAotCsProj.txt +++ b/src/BenchmarkDotNet/Templates/WasmAotCsProj.txt @@ -13,7 +13,7 @@ true true true - $(RuntimeSrcDir)\src\mono\wasm\runtime-test.js + $(RuntimeSrcDir)\src\mono\wasm\test-main.js true false false diff --git a/src/BenchmarkDotNet/Templates/WasmCsProj.txt b/src/BenchmarkDotNet/Templates/WasmCsProj.txt index cdeec4be27..10c68b0653 100644 --- a/src/BenchmarkDotNet/Templates/WasmCsProj.txt +++ b/src/BenchmarkDotNet/Templates/WasmCsProj.txt @@ -12,7 +12,7 @@ browser-wasm false false - $(RuntimeSrcDir)\src\mono\wasm\runtime-test.js + $(RuntimeSrcDir)\src\mono\wasm\test-main.js true false false diff --git a/src/BenchmarkDotNet/Toolchains/Executor.cs b/src/BenchmarkDotNet/Toolchains/Executor.cs index 936a938ce5..82f4c7f329 100644 --- a/src/BenchmarkDotNet/Toolchains/Executor.cs +++ b/src/BenchmarkDotNet/Toolchains/Executor.cs @@ -117,7 +117,7 @@ private ProcessStartInfo CreateStartInfo(BenchmarkCase benchmarkCase, ArtifactsP case WasmRuntime wasm: start.FileName = wasm.JavaScriptEngine; start.RedirectStandardInput = false; - start.Arguments = $"{wasm.JavaScriptEngineArguments} runtime.js -- --run {artifactsPaths.ProgramName}.dll {args} "; + start.Arguments = $"{wasm.JavaScriptEngineArguments} main.js -- --run {artifactsPaths.ProgramName}.dll {args} "; start.WorkingDirectory = artifactsPaths.BinariesDirectoryPath; break; case MonoAotLLVMRuntime _: diff --git a/src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs b/src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs index 08c60ced37..c99fd52f67 100644 --- a/src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs +++ b/src/BenchmarkDotNet/Toolchains/MonoWasm/WasmGenerator.cs @@ -91,7 +91,7 @@ protected void GenerateProjectInterpreter(BuildPartition buildPartition, Artifac } } - protected override string GetExecutablePath(string binariesDirectoryPath, string programName) => Path.Combine(binariesDirectoryPath, "runtime.js"); + protected override string GetExecutablePath(string binariesDirectoryPath, string programName) => Path.Combine(binariesDirectoryPath, "main.js"); protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration) {