Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/benchmarking-workflow-dotnet-runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 </path/to/dotnet/runtime/>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 </path/to/dotnet/runtime>/src/mono/browser --filter <filter>"
--bdn-arguments="--anyCategories Libraries Runtime --category-exclusion-filter NoInterpreter NoWASM NoMono --logBuildOutput --filter <filter>"
```

#### Run the benchmarks with AOT
Expand All @@ -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 </path/to/dotnet/runtime/>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 </path/to/dotnet/runtime>/src/mono/browser --filter <filter>"
--bdn-arguments="--category-exclusion-filter NoInterpreter NoWASM NoMono --aotcompilermode wasm --logBuildOutput --buildTimeout 3600 --filter <filter>"
```

#### Note about "file ... being used by another process" error
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.1.25555.107</MicrosoftNETILLinkPackageVersion>
<SystemThreadingChannelsPackageVersion>10.0.0-rc.1.25555.107</SystemThreadingChannelsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25555.107</MicrosoftExtensionsLoggingPackageVersion>
<BenchmarkDotNetVersion>0.16.0-nightly.20260226.451</BenchmarkDotNetVersion>
<BenchmarkDotNetVersion>0.16.0-nightly.20260302.459</BenchmarkDotNetVersion>
<MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>10.0.0-rc.1.25555.107</MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>
<MicrosoftDotNetXHarnessCLIVersion>11.0.0-prerelease.26064.3</MicrosoftDotNetXHarnessCLIVersion>
</PropertyGroup>
Expand Down
6 changes: 0 additions & 6 deletions scripts/benchmarks_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,29 +388,23 @@ 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'
]
os.environ['RestoreAdditionalProjectSources'] = os.path.join(get_run_artifact_path(parsed_args, RunType.WasmInterpreter, commit), "wasm_bundle")

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'
Expand Down
10 changes: 0 additions & 10 deletions scripts/run_performance_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand All @@ -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"
Expand Down