Skip to content

[wasm] Fix scripts to track change in BDN #3344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 14, 2023
Merged

[wasm] Fix scripts to track change in BDN #3344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecdd5d9
[wasm] Fix scripts to track change in BDN
radical Sep 14, 2023
a0d3588
address feedback, and add comments
radical Sep 14, 2023
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
10 changes: 7 additions & 3 deletions scripts/benchmarks_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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:])
__main(sys.argv[1:])
8 changes: 5 additions & 3 deletions scripts/performance_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
only_sanity_check=args.only_sanity_check)