diff --git a/scripts/benchmarks_local.py b/scripts/benchmarks_local.py index 65809dac1c1..466d046795e 100644 --- a/scripts/benchmarks_local.py +++ b/scripts/benchmarks_local.py @@ -388,24 +388,28 @@ 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'] + # 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', '--wasmDataDir', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmInterpreter, commit), "wasm_bundle", "wasm-data"), '--wasmEngine', parsed_args.wasm_engine_path, - '--wasmArgs', '\"--experimental-wasm-eh --expose_wasm --module\"', + '--wasmArgs', '\" --experimental-wasm-eh --expose_wasm --module\"', '--logBuildOutput', '--generateBinLog' ] elif specific_run_type == RunType.WasmAOT: benchmark_ci_args += ['--wasm'] + # 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', '--wasmDataDir', os.path.join(get_run_artifact_path(parsed_args, RunType.WasmAOT, commit), "wasm_bundle", "wasm-data"), '--wasmEngine', parsed_args.wasm_engine_path, - '--wasmArgs', '\"--experimental-wasm-eh --expose_wasm --module\"', + '--wasmArgs', '\" --experimental-wasm-eh --expose_wasm --module\"', '--aotcompilermode', 'wasm', '--logBuildOutput', '--generateBinLog' @@ -622,4 +626,4 @@ def __main(args: list): # TODO: Compare the results of the benchmarks with results comparer (Currently will need to be done manually) if __name__ == "__main__": - __main(sys.argv[1:]) \ No newline at end of file + __main(sys.argv[1:]) diff --git a/scripts/performance_setup.py b/scripts/performance_setup.py index f5e8ea6e996..5920ab4fff7 100644 --- a/scripts/performance_setup.py +++ b/scripts/performance_setup.py @@ -256,8 +256,10 @@ def run(args: PerformanceSetupArgs): if args.wasm_bundle_directory is not None: wasm_bundle_directory_path = payload_directory shutil.copytree(args.wasm_bundle_directory, wasm_bundle_directory_path) - - wasm_args = "--experimental-wasm-eh --expose_wasm" + + # Ensure there is a space at the beginning, so BDN can correctly read them + # as arguments to `--wasmArgs` + wasm_args = " --experimental-wasm-eh --expose_wasm" if args.javascript_engine == "v8": wasm_args += " --module" @@ -359,4 +361,4 @@ def run(args: PerformanceSetupArgs): helix_source_prefix=helix_source_prefix, build_config=build_config, runtime_type=runtime_type, - only_sanity_check=args.only_sanity_check) \ No newline at end of file + only_sanity_check=args.only_sanity_check)