Reland "[SDK] Second step in removing references to dart_precompiled_runtime"
This reverts commit 630e26283379b2cc12c95e8c22355394430dd511.
Reason for revert: Failing golem benchmarks were already failing from before this CL
TEST=ci
Original change's description:
> Revert "[SDK] Second step in removing references to dart_precompiled_runtime"
>
> This reverts commit 85765475d3300b6b81c72a2fe7102440961a4422.
>
> 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 <aam@google.com>
> > Commit-Queue: Siva Annamalai <asiva@google.com>
>
> 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 <rubber-stamper@appspot.gserviceaccount.com>
> Reviewed-by: Brian Quinlan <bquinlan@google.com>
> Commit-Queue: Siva Annamalai <asiva@google.com>
Change-Id: I2ec45bb7cad086ed66a9a41df2d19b4c1fdcb131
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395640
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Siva Annamalai <asiva@google.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
diff --git a/pkg/dart2wasm/tool/compile_benchmark b/pkg/dart2wasm/tool/compile_benchmark
index eefae07..495fd45 100755
--- a/pkg/dart2wasm/tool/compile_benchmark
+++ b/pkg/dart2wasm/tool/compile_benchmark
@@ -35,7 +35,7 @@
BINARYEN="$BIN_DIR/wasm-opt"
DART="$BIN_DIR/dart"
-DART_AOT_RUNTIME="$BIN_DIR/dart_precompiled_runtime"
+DART_AOT_RUNTIME="$BIN_DIR/dartaotruntime"
LIBRARIES_JSON_ARG="--libraries-spec=$SDK_DIR/sdk/lib/libraries.json"
function find_flags {
diff --git a/pkg/vm/tool/dart_precompiled_runtime2 b/pkg/vm/tool/dart_precompiled_runtime2
index 3d76580..f5d1112 100755
--- a/pkg/vm/tool/dart_precompiled_runtime2
+++ b/pkg/vm/tool/dart_precompiled_runtime2
@@ -33,4 +33,4 @@
export DART_CONFIGURATION=${DART_CONFIGURATION:-ReleaseX64}
BIN_DIR="$OUT_DIR$DART_CONFIGURATION"
-exec "$BIN_DIR"/dart_precompiled_runtime "$@"
+exec "$BIN_DIR"/dartaotruntime "$@"
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 4b85e90..c44e0d4 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -73,7 +73,6 @@
"dart2wasm_hostasserts": [
".dart_tool/package_config.json",
"out/ReleaseX64/dart",
- "out/ReleaseX64/dart_precompiled_runtime",
"out/ReleaseX64/dartaotruntime",
"out/ReleaseX64/dart2js_platform.dill",
"out/ReleaseX64/dart2wasm.snapshot",
@@ -2771,7 +2770,7 @@
"runtime",
"dart2wasm",
"create_sdk",
- "dart_precompiled_runtime"
+ "dartaotruntime"
]
},
{
@@ -2806,7 +2805,7 @@
"runtime",
"dart2wasm",
"create_sdk",
- "dart_precompiled_runtime"
+ "dartaotruntime"
]
},
{
@@ -2839,7 +2838,7 @@
"runtime",
"dart2wasm",
"create_sdk",
- "dart_precompiled_runtime"
+ "dartaotruntime"
]
},
{
@@ -2872,7 +2871,7 @@
"runtime",
"dart2wasm",
"create_sdk",
- "dart_precompiled_runtime"
+ "dartaotruntime"
]
},
{
@@ -3372,7 +3371,6 @@
"runtime",
"gen_snapshot",
"dartaotruntime",
- "dart_precompiled_runtime",
"dart2js_platform.dill",
"dart2js_platform_unsound.dill",
"kernel-service.dart.snapshot",
diff --git a/tools/bots/try_benchmarks.sh b/tools/bots/try_benchmarks.sh
index 62075db..11c7f22 100755
--- a/tools/bots/try_benchmarks.sh
+++ b/tools/bots/try_benchmarks.sh
@@ -181,7 +181,7 @@
rm -rf tmp
elif [ "$command" = linux-x64-build ]; then
# NOTE: These are duplicated in tools/bots/test_matrix.json, keep in sync.
- ./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
+ ./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
elif [ "$command" = linux-x64-archive ]; then
export GZIP=-1
strip -w \
@@ -260,25 +260,6 @@
-K '_ZN4dart7Version4str_E' \
-K '_ZN4dart7Version7commit_E' \
-K '_ZN4dart9Bootstrap*_paths_E' out/ReleaseX64/dartaotruntime
- strip -w \
- -K 'kDartVmSnapshotData' \
- -K 'kDartVmSnapshotInstructions' \
- -K 'kDartCoreIsolateSnapshotData' \
- -K 'kDartCoreIsolateSnapshotInstructions' \
- -K '_ZN4dart3bin26observatory_assets_archiveE' \
- -K '_ZN4dart3bin30observatory_assets_archive_lenE' \
- -K '_ZN4dart3bin7Builtin22_builtin_source_paths_E' \
- -K '_ZN4dart3bin7Builtin*_paths_E' \
- -K '_ZN4dart3binL17vm_snapshot_data_E' \
- -K '_ZN4dart3binL24isolate_snapshot_buffer_E' \
- -K '_ZN4dart3binL27core_isolate_snapshot_data_E' \
- -K '_ZN4dart3binL27observatory_assets_archive_E' \
- -K '_ZN4dart3binL27vm_isolate_snapshot_buffer_E' \
- -K '_ZN4dart3binL29core_isolate_snapshot_buffer_E' \
- -K '_ZN4dart7Version14snapshot_hash_E' \
- -K '_ZN4dart7Version4str_E' \
- -K '_ZN4dart7Version7commit_E' \
- -K '_ZN4dart9Bootstrap*_paths_E' out/ReleaseX64/dart_precompiled_runtime
tar -czf linux-x64.tar.gz \
--exclude .git \
--exclude .gitignore \
@@ -301,7 +282,6 @@
third_party/d8/linux/x64 \
third_party/firefox_jsshell/ \
out/ReleaseX64/dartaotruntime \
- out/ReleaseX64/dart_precompiled_runtime \
out/ReleaseX64/gen/utils/ddc \
out/ReleaseX64/ddc_outline_unsound.dill \
out/ReleaseX64/ddc_outline.dill \
