From fcb5808032be3889f4660167025ab100cc8c3532 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 14 Sep 2023 11:22:04 -0400 Subject: [PATCH 1/2] [wasm] Fix performance-setup.sh to track change in BDN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `dotnet/performance` got an update for `dotnet/BenchmarkDotNet` via https://github.com/dotnet/performance/pull/3331 . And that bdn update includes https://github.com/dotnet/BenchmarkDotNet/pull/2375, which subtly changes how the arguments get parsed, and breaks the existing scripts: ``` $ pushd "/home/helixbot/work/B807097D/w/AED609DF/e/performance/artifacts/bin/for-running/MicroBenchmarks" $ dotnet exec MicroBenchmarks.dll --wasmArgs "--experimental-wasm-eh --expose_wasm --module" ... MicroBenchmarks 1.0.0-dev © Microsoft Corporation. All rights reserved. ERROR(S): Option 'experimental-wasm-eh --expose_wasm --module' is unknown. ``` Fixes https://github.com/dotnet/runtime/issues/92066 . --- eng/testing/performance/performance-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 8e79b20ca4798a..74b778a63f908e 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -430,7 +430,7 @@ if [[ -n "$wasm_bundle_directory" ]]; then fi # Workaround: escaping the quotes around `--wasmArgs=..` so they get retained for the actual command line - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine $javascript_engine_path --wasmArgs \\\"$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data" + extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine $javascript_engine_path --wasmArgs=\\\"$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data" if [[ "$wasmaot" == "true" ]]; then extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --aotcompilermode wasm --buildTimeout 3600" fi From d8ef0450ae293b5c714c8907f2b05f9a0ed4ad8e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 14 Sep 2023 18:43:43 -0400 Subject: [PATCH 2/2] fix command line --- eng/testing/performance/performance-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/performance/performance-setup.sh b/eng/testing/performance/performance-setup.sh index 74b778a63f908e..1e25a46c39368e 100755 --- a/eng/testing/performance/performance-setup.sh +++ b/eng/testing/performance/performance-setup.sh @@ -430,7 +430,7 @@ if [[ -n "$wasm_bundle_directory" ]]; then fi # Workaround: escaping the quotes around `--wasmArgs=..` so they get retained for the actual command line - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine $javascript_engine_path --wasmArgs=\\\"$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data" + extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine $javascript_engine_path \\\"--wasmArgs=$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data" if [[ "$wasmaot" == "true" ]]; then extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --aotcompilermode wasm --buildTimeout 3600" fi