Skip to content

Commit 630e262

Browse files
a-sivaCommit Queue
authored andcommitted
Revert "[SDK] Second step in removing references to dart_precompiled_runtime"
This reverts commit 8576547. Reason for revert: breaks dart2wasm golem benchmarks Original change's description: > [SDK] Second step in removing references to dart_precompiled_runtime > > TEST=ci > > Change-Id: I7b625de2090aa31fd649f0f67055c032f5878772 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395065 > Reviewed-by: Alexander Aprelev <[email protected]> > Commit-Queue: Siva Annamalai <[email protected]> Change-Id: I524191ca9e26bb1d298eb56543bc0f419bfab4d3 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395462 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: Brian Quinlan <[email protected]> Commit-Queue: Siva Annamalai <[email protected]>
1 parent 024a967 commit 630e262

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

pkg/dart2wasm/tool/compile_benchmark

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ BIN_DIR="$OUT_DIR/$DART_CONFIGURATION"
3535

3636
BINARYEN="$BIN_DIR/wasm-opt"
3737
DART="$BIN_DIR/dart"
38-
DART_AOT_RUNTIME="$BIN_DIR/dartaotruntime"
38+
DART_AOT_RUNTIME="$BIN_DIR/dart_precompiled_runtime"
3939
LIBRARIES_JSON_ARG="--libraries-spec=$SDK_DIR/sdk/lib/libraries.json"
4040

4141
function find_flags {

pkg/vm/tool/dart_precompiled_runtime2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ fi
3333
export DART_CONFIGURATION=${DART_CONFIGURATION:-ReleaseX64}
3434
BIN_DIR="$OUT_DIR$DART_CONFIGURATION"
3535

36-
exec "$BIN_DIR"/dartaotruntime "$@"
36+
exec "$BIN_DIR"/dart_precompiled_runtime "$@"

tools/bots/test_matrix.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"dart2wasm_hostasserts": [
7474
".dart_tool/package_config.json",
7575
"out/ReleaseX64/dart",
76+
"out/ReleaseX64/dart_precompiled_runtime",
7677
"out/ReleaseX64/dartaotruntime",
7778
"out/ReleaseX64/dart2js_platform.dill",
7879
"out/ReleaseX64/dart2wasm.snapshot",
@@ -2770,7 +2771,7 @@
27702771
"runtime",
27712772
"dart2wasm",
27722773
"create_sdk",
2773-
"dartaotruntime"
2774+
"dart_precompiled_runtime"
27742775
]
27752776
},
27762777
{
@@ -2805,7 +2806,7 @@
28052806
"runtime",
28062807
"dart2wasm",
28072808
"create_sdk",
2808-
"dartaotruntime"
2809+
"dart_precompiled_runtime"
28092810
]
28102811
},
28112812
{
@@ -2838,7 +2839,7 @@
28382839
"runtime",
28392840
"dart2wasm",
28402841
"create_sdk",
2841-
"dartaotruntime"
2842+
"dart_precompiled_runtime"
28422843
]
28432844
},
28442845
{
@@ -2871,7 +2872,7 @@
28712872
"runtime",
28722873
"dart2wasm",
28732874
"create_sdk",
2874-
"dartaotruntime"
2875+
"dart_precompiled_runtime"
28752876
]
28762877
},
28772878
{
@@ -3371,6 +3372,7 @@
33713372
"runtime",
33723373
"gen_snapshot",
33733374
"dartaotruntime",
3375+
"dart_precompiled_runtime",
33743376
"dart2js_platform.dill",
33753377
"dart2js_platform_unsound.dill",
33763378
"kernel-service.dart.snapshot",

tools/bots/try_benchmarks.sh

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ EOF
181181
rm -rf tmp
182182
elif [ "$command" = linux-x64-build ]; then
183183
# NOTE: These are duplicated in tools/bots/test_matrix.json, keep in sync.
184-
./tools/build.py --mode=release --arch=x64 create_sdk runtime gen_snapshot dartaotruntime dart2js_platform.dill dart2js_platform_unsound.dill kernel-service.dart.snapshot ddc_stable_test ddc_canary_test dart2wasm_benchmark
184+
./tools/build.py --mode=release --arch=x64 create_sdk runtime gen_snapshot dartaotruntime dart_precompiled_runtime dart2js_platform.dill dart2js_platform_unsound.dill kernel-service.dart.snapshot ddc_stable_test ddc_canary_test dart2wasm_benchmark
185185
elif [ "$command" = linux-x64-archive ]; then
186186
export GZIP=-1
187187
strip -w \
@@ -260,6 +260,25 @@ EOF
260260
-K '_ZN4dart7Version4str_E' \
261261
-K '_ZN4dart7Version7commit_E' \
262262
-K '_ZN4dart9Bootstrap*_paths_E' out/ReleaseX64/dartaotruntime
263+
strip -w \
264+
-K 'kDartVmSnapshotData' \
265+
-K 'kDartVmSnapshotInstructions' \
266+
-K 'kDartCoreIsolateSnapshotData' \
267+
-K 'kDartCoreIsolateSnapshotInstructions' \
268+
-K '_ZN4dart3bin26observatory_assets_archiveE' \
269+
-K '_ZN4dart3bin30observatory_assets_archive_lenE' \
270+
-K '_ZN4dart3bin7Builtin22_builtin_source_paths_E' \
271+
-K '_ZN4dart3bin7Builtin*_paths_E' \
272+
-K '_ZN4dart3binL17vm_snapshot_data_E' \
273+
-K '_ZN4dart3binL24isolate_snapshot_buffer_E' \
274+
-K '_ZN4dart3binL27core_isolate_snapshot_data_E' \
275+
-K '_ZN4dart3binL27observatory_assets_archive_E' \
276+
-K '_ZN4dart3binL27vm_isolate_snapshot_buffer_E' \
277+
-K '_ZN4dart3binL29core_isolate_snapshot_buffer_E' \
278+
-K '_ZN4dart7Version14snapshot_hash_E' \
279+
-K '_ZN4dart7Version4str_E' \
280+
-K '_ZN4dart7Version7commit_E' \
281+
-K '_ZN4dart9Bootstrap*_paths_E' out/ReleaseX64/dart_precompiled_runtime
263282
tar -czf linux-x64.tar.gz \
264283
--exclude .git \
265284
--exclude .gitignore \
@@ -282,6 +301,7 @@ EOF
282301
third_party/d8/linux/x64 \
283302
third_party/firefox_jsshell/ \
284303
out/ReleaseX64/dartaotruntime \
304+
out/ReleaseX64/dart_precompiled_runtime \
285305
out/ReleaseX64/gen/utils/ddc \
286306
out/ReleaseX64/ddc_outline_unsound.dill \
287307
out/ReleaseX64/ddc_outline.dill \

0 commit comments

Comments
 (0)