diff --git a/docs/benchmarking-workflow-dotnet-runtime.md b/docs/benchmarking-workflow-dotnet-runtime.md index 3be755f652f..44d1ecd0d75 100644 --- a/docs/benchmarking-workflow-dotnet-runtime.md +++ b/docs/benchmarking-workflow-dotnet-runtime.md @@ -192,7 +192,7 @@ Make sure you have the v8 engine installed and in the PATH. Follow the installat ```cmd /path/to/dotnet/performance$ python3 ./scripts/benchmarks_ci.py -f net11.0 --dotnet-path artifacts/bin/dotnet-latest --wasm --run-isolated --bdn-artifacts artifacts/BenchmarkDotNet.Artifacts - --bdn-arguments="--anyCategories Libraries Runtime --category-exclusion-filter NoInterpreter NoWASM NoMono --logBuildOutput --wasmArgs=\"--module\" --wasmDataDir /src/mono/browser --filter " + --bdn-arguments="--anyCategories Libraries Runtime --category-exclusion-filter NoInterpreter NoWASM NoMono --logBuildOutput --filter " ``` #### Run the benchmarks with AOT @@ -201,7 +201,7 @@ Essentially, add `--aotcompilermode wasm` to the `--bdn-arguments=".."`: ```cmd /path/to/dotnet/performance$ python3 ./scripts/benchmarks_ci.py --csproj src/benchmarks/micro/MicroBenchmarks.csproj -f net11.0 --dotnet-path artifacts/bin/dotnet-latest --wasm --run-isolated --bdn-artifacts artifacts/BenchmarkDotNet.Artifacts - --bdn-arguments="--category-exclusion-filter NoInterpreter NoWASM NoMono --aotcompilermode wasm --logBuildOutput --buildTimeout 3600 --wasmArgs=\"--module\" --wasmDataDir /src/mono/browser --filter " + --bdn-arguments="--category-exclusion-filter NoInterpreter NoWASM NoMono --aotcompilermode wasm --logBuildOutput --buildTimeout 3600 --filter " ``` #### Note about "file ... being used by another process" error diff --git a/eng/Versions.props b/eng/Versions.props index 076418f3b57..4ee55593eff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 10.0.0-rc.1.25555.107 10.0.0-rc.1.25555.107 10.0.0-rc.1.25555.107 - 0.16.0-nightly.20260226.451 + 0.16.0-nightly.20260302.459 10.0.0-rc.1.25555.107 11.0.0-prerelease.26064.3 diff --git a/scripts/benchmarks_local.py b/scripts/benchmarks_local.py index ae0be0a01c2..7e04b64a6ae 100644 --- a/scripts/benchmarks_local.py +++ b/scripts/benchmarks_local.py @@ -388,14 +388,11 @@ def generate_single_benchmark_ci_args(parsed_args: Namespace, specific_run_type: # for commit in all_commits: There is not a way to run multiple Wasm's at once via CI, instead will split single run vs multi-run scenarios elif specific_run_type == RunType.WasmInterpreter: benchmark_ci_args += ['--wasm', '--dotnet-path', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmInterpreter, commit), "wasm_bundle", "dotnet")] - # Ensure there is a space at the beginning of `--wasmArgs` argument, so BDN - # can correctly read them as sub-arguments for `--wasmArgs` bdn_args_unescaped += [ '--anyCategories', 'Libraries', 'Runtime', '--category-exclusion-filter', 'NoInterpreter', 'NoWASM', 'NoMono', '--cli', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmInterpreter, commit), "wasm_bundle", "dotnet", "dotnet"), '--wasmEngine', parsed_args.wasm_engine_path, - '--wasmArgs', '\" --expose_wasm --module\"', '--logBuildOutput', '--generateBinLog' ] @@ -403,14 +400,11 @@ def generate_single_benchmark_ci_args(parsed_args: Namespace, specific_run_type: elif specific_run_type == RunType.WasmAOT: benchmark_ci_args += ['--wasm', '--dotnet-path', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmAOT, commit), "wasm_bundle", "dotnet")] - # Ensure there is a space at the beginning of `--wasmArgs` argument, so BDN - # can correctly read them as sub-arguments for `--wasmArgs` bdn_args_unescaped += [ '--anyCategories', 'Libraries', 'Runtime', '--category-exclusion-filter', 'NoInterpreter', 'NoWASM', 'NoMono', '--cli', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmAOT, commit), "wasm_bundle", "dotnet", "dotnet"), '--wasmEngine', parsed_args.wasm_engine_path, - '--wasmArgs', '\" --expose_wasm --module\"', '--aotcompilermode', 'wasm', '--logBuildOutput', '--generateBinLog' diff --git a/scripts/run_performance_job.py b/scripts/run_performance_job.py index 4620029fd05..6ece62f227c 100644 --- a/scripts/run_performance_job.py +++ b/scripts/run_performance_job.py @@ -433,14 +433,9 @@ def get_bdn_arguments( if runtime_type == "wasm": category_exclusions += ["NoInterpreter", "NoWASM", "NoMono"] - wasm_args = ["--expose_wasm"] - if javascript_engine == "v8": - wasm_args += ["--module"] - assert javascript_engine_path is not None bdn_arguments += [ "--wasmEngine", javascript_engine_path, - f"\\\"--wasmArgs={' '.join(wasm_args)}\\\"", "--cli", "$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet", "--wasmProcessTimeout", "20", ] @@ -454,14 +449,9 @@ def get_bdn_arguments( if runtime_type == "wasm_coreclr": category_exclusions += ["NoWASM", "NoWasmCoreCLR", "NoMono"] - wasm_args = ["--expose_wasm"] - if javascript_engine == "v8": - wasm_args += ["--module"] - assert javascript_engine_path is not None bdn_arguments += [ "--wasmEngine", javascript_engine_path, - f"\\\"--wasmArgs={' '.join(wasm_args)}\\\"", "--cli", "$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet", "--buildTimeout", "1200", "--wasmProcessTimeout", "20"