Skip to content

Commit 33eabba

Browse files
committed
refactor: remove wasm args
- `--expose_wasm` is obsolete - `--module` is now set by benchmarkdotnet
1 parent d38d85a commit 33eabba

4 files changed

Lines changed: 3 additions & 15 deletions

File tree

docs/benchmarking-workflow-dotnet-runtime.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Make sure you have the v8 engine installed and in the PATH. Follow the installat
192192

193193
```cmd
194194
/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
195-
--bdn-arguments="--anyCategories Libraries Runtime --category-exclusion-filter NoInterpreter NoWASM NoMono --logBuildOutput --wasmArgs=\"--module\" --wasmDataDir </path/to/dotnet/runtime>/src/mono/browser --filter <filter>"
195+
--bdn-arguments="--anyCategories Libraries Runtime --category-exclusion-filter NoInterpreter NoWASM NoMono --logBuildOutput --filter <filter>"
196196
```
197197

198198
#### Run the benchmarks with AOT
@@ -201,7 +201,7 @@ Essentially, add `--aotcompilermode wasm` to the `--bdn-arguments=".."`:
201201

202202
```cmd
203203
/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
204-
--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>"
204+
--bdn-arguments="--category-exclusion-filter NoInterpreter NoWASM NoMono --aotcompilermode wasm --logBuildOutput --buildTimeout 3600 --filter <filter>"
205205
```
206206

207207
#### Note about "file ... being used by another process" error

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.1.25555.107</MicrosoftNETILLinkPackageVersion>
1212
<SystemThreadingChannelsPackageVersion>10.0.0-rc.1.25555.107</SystemThreadingChannelsPackageVersion>
1313
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25555.107</MicrosoftExtensionsLoggingPackageVersion>
14-
<BenchmarkDotNetVersion>0.16.0-nightly.20260226.451</BenchmarkDotNetVersion>
14+
<BenchmarkDotNetVersion>0.16.0-nightly.20260302.459</BenchmarkDotNetVersion>
1515
<MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>10.0.0-rc.1.25555.107</MicrosoftNETRuntimeEmscripten3156Nodewinx64Version>
1616
<MicrosoftDotNetXHarnessCLIVersion>11.0.0-prerelease.26064.3</MicrosoftDotNetXHarnessCLIVersion>
1717
</PropertyGroup>

scripts/benchmarks_local.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ def generate_single_benchmark_ci_args(parsed_args: Namespace, specific_run_type:
395395
'--category-exclusion-filter', 'NoInterpreter', 'NoWASM', 'NoMono',
396396
'--cli', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmInterpreter, commit), "wasm_bundle", "dotnet", "dotnet"),
397397
'--wasmEngine', parsed_args.wasm_engine_path,
398-
'--wasmArgs', '\" --expose_wasm --module\"',
399398
'--logBuildOutput',
400399
'--generateBinLog'
401400
]
@@ -410,7 +409,6 @@ def generate_single_benchmark_ci_args(parsed_args: Namespace, specific_run_type:
410409
'--category-exclusion-filter', 'NoInterpreter', 'NoWASM', 'NoMono',
411410
'--cli', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmAOT, commit), "wasm_bundle", "dotnet", "dotnet"),
412411
'--wasmEngine', parsed_args.wasm_engine_path,
413-
'--wasmArgs', '\" --expose_wasm --module\"',
414412
'--aotcompilermode', 'wasm',
415413
'--logBuildOutput',
416414
'--generateBinLog'

scripts/run_performance_job.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -433,14 +433,9 @@ def get_bdn_arguments(
433433
if runtime_type == "wasm":
434434
category_exclusions += ["NoInterpreter", "NoWASM", "NoMono"]
435435

436-
wasm_args = ["--expose_wasm"]
437-
if javascript_engine == "v8":
438-
wasm_args += ["--module"]
439-
440436
assert javascript_engine_path is not None
441437
bdn_arguments += [
442438
"--wasmEngine", javascript_engine_path,
443-
f"\\\"--wasmArgs={' '.join(wasm_args)}\\\"",
444439
"--cli", "$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet",
445440
"--wasmProcessTimeout", "20",
446441
]
@@ -454,14 +449,9 @@ def get_bdn_arguments(
454449
if runtime_type == "wasm_coreclr":
455450
category_exclusions += ["NoWASM", "NoWasmCoreCLR", "NoMono"]
456451

457-
wasm_args = ["--expose_wasm"]
458-
if javascript_engine == "v8":
459-
wasm_args += ["--module"]
460-
461452
assert javascript_engine_path is not None
462453
bdn_arguments += [
463454
"--wasmEngine", javascript_engine_path,
464-
f"\\\"--wasmArgs={' '.join(wasm_args)}\\\"",
465455
"--cli", "$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet",
466456
"--buildTimeout", "1200",
467457
"--wasmProcessTimeout", "20"

0 commit comments

Comments
 (0)