Skip to content

Commit 8b2b6b2

Browse files
a-sivaCommit Queue
authored andcommitted
Reland ""[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory""
This reverts commit 74c5aa3. Reason for revert: Fix golem breakage by not changing the script dart_precompiled_runtime2 TEST=ci Original change's description: > Revert ""[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory"" > > This reverts commit f81a402. > > Reason for revert: golem benchmarks are failing to run > > TEST=ci > > Original change's description: > > "[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory" > > > > Fixed golem breakage by temporarily copying dartaotruntime to dart_precompiled_runtime > > > > This reverts commit 75e6a74. > > > > TEST=ci > > Change-Id: I9efe40643c59bc617f6fb484b89b038deaffbb93 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393941 Reviewed-by: Alexander Aprelev <[email protected]> Commit-Queue: Siva Annamalai <[email protected]>
1 parent 365941b commit 8b2b6b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+244
-148
lines changed

BUILD.gn

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ group("run_ffi_unit_tests") {
9191
group("runtime_precompiled") {
9292
import("runtime/runtime_args.gni")
9393
deps = [
94-
"runtime/bin:dart_precompiled_runtime",
94+
"runtime/bin:dartaotruntime",
9595
"runtime/bin:gen_snapshot",
9696
"runtime/bin:gen_snapshot($host_toolchain)",
9797
"runtime/bin:process_test",
@@ -115,7 +115,15 @@ group("create_platform_sdk") {
115115
}
116116

117117
group("dart2js") {
118-
deps = [ "utils/compiler:dart2js" ]
118+
import("runtime/runtime_args.gni")
119+
if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
120+
deps = [
121+
":runtime_precompiled",
122+
"utils/compiler:dart2js_sdk_aot",
123+
]
124+
} else {
125+
deps = [ "utils/compiler:dart2js" ]
126+
}
119127
}
120128

121129
group("dart2wasm_platform") {
@@ -153,7 +161,19 @@ group("dartanalyzer") {
153161
}
154162

155163
group("ddc") {
156-
deps = [ "utils/ddc:dartdevc" ]
164+
import("runtime/runtime_args.gni")
165+
if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
166+
deps = [
167+
":runtime_precompiled",
168+
"utils/bazel:kernel_worker_aot",
169+
"utils/ddc:dartdevc_aot",
170+
]
171+
} else {
172+
deps = [
173+
"utils/bazel:kernel_worker",
174+
"utils/ddc:dartdevc",
175+
]
176+
}
157177
}
158178

159179
group("analysis_server") {
@@ -372,7 +392,7 @@ if (is_fuchsia) {
372392

373393
test_binaries = [
374394
"dart",
375-
"dart_precompiled_runtime",
395+
"dartaotruntime",
376396
"run_vm_tests",
377397
]
378398

benchmarks/NativeCall/native/native_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <string.h>
88

99
// TODO(dartbug.com/40579): This requires static linking to either link
10-
// dart.exe or dart_precompiled_runtime.exe on Windows.
10+
// dart.exe or dartaotruntime.exe on Windows.
1111
// The sample currently fails on Windows in AOT mode.
1212
#include "include/dart_api.h"
1313

docs/Kernel-developer-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Run end-to-end tests using dartk + VM:
2828

2929
Optionally (this is slow) run end-to-end tests using AOT:
3030
```
31-
./tools/build.py dart_precompiled_runtime
31+
./tools/build.py runtime_precompiled
3232
./tools/test.py -cdartkp -rdart_precompiled language co19
3333
```
3434

pkg/dartdev/lib/src/sdk.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class Sdk {
5454
? path.absolute(
5555
sdkPath,
5656
Platform.isWindows
57-
? 'dart_precompiled_runtime_product.exe'
58-
: 'dart_precompiled_runtime_product',
57+
? 'dartaotruntime_product.exe'
58+
: 'dartaotruntime_product',
5959
)
6060
: path.absolute(
6161
sdkPath,

pkg/dev_compiler/test/worker/worker_test.dart

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,19 @@ void main() {
2525
var dartAotRuntime = p.absolute(
2626
sdkPath,
2727
Platform.isWindows
28-
? 'dart_precompiled_runtime_product.exe'
29-
: 'dart_precompiled_runtime_product');
28+
? 'dartaotruntime_product.exe'
29+
: 'dartaotruntime_product');
30+
var snapshotName = _resolvePath('gen/dartdevc_aot_product.dart.snapshot');
3031
if (!File(dartAotRuntime).existsSync()) {
3132
dartAotRuntime = p.absolute(
3233
sdkPath,
3334
Platform.isWindows
34-
? 'dart_precompiled_runtime.exe'
35-
: 'dart_precompiled_runtime');
35+
? 'dartaotruntime_product.exe'
36+
: 'dartaotruntime_product');
37+
snapshotName = _resolvePath('gen/dartdevc_aot.dart.snapshot');
3638
}
3739
final executableArgs = <String>[
38-
_resolvePath('gen/dartdevc_aot.dart.snapshot'),
40+
snapshotName,
3941
'--sound-null-safety',
4042
'--dart-sdk-summary',
4143
_resolvePath('ddc_outline.dill'),

pkg/dynamic_modules/test/runner/util.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ Uri genSnapshotBin =
8686
buildRootUri.resolve(useProduct ? 'gen_snapshot_product' : 'gen_snapshot');
8787
Uri dart2bytecodeSnapshot =
8888
buildRootUri.resolve('gen/dart2bytecode.dart.snapshot');
89-
Uri aotRuntimeBin = buildRootUri.resolve(useProduct
90-
? 'dart_precompiled_runtime_product'
91-
: 'dart_precompiled_runtime');
89+
Uri aotRuntimeBin = buildRootUri
90+
.resolve(useProduct ? 'dartaotruntime_product' : 'dartaotruntime');
9291
Uri vmPlatformDill = buildRootUri.resolve('vm_platform_strong.dill');
9392

9493
// Encodes test results in the format expected by Dart's CI infrastructure.

pkg/front_end/lib/src/linux_and_intel_specific_perf.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int _perfPid = -1;
4141
/// You might also want the dartaotruntime to include debug symbols:
4242
///
4343
/// ```
44-
/// cp out/ReleaseX64/dart_precompiled_runtime_product \
44+
/// cp out/ReleaseX64/dartaotruntime_product \
4545
/// out/ReleaseX64/dart-sdk/bin/dartaotruntime
4646
/// ```
4747
///

pkg/smith/lib/configuration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class Configuration {
251251
.pathSegments
252252
.lastWhere((e) => e.isNotEmpty);
253253
final executableNoExtension = executableName.split('.').first;
254-
if (executableNoExtension == 'dart_precompiled_runtime') {
254+
if (executableNoExtension == 'dartaotruntime') {
255255
runtime = Runtime.dartPrecompiled;
256256
} else if (executableNoExtension == 'dart') {
257257
runtime = Runtime.vm;

pkg/test_runner/lib/src/build_configurations.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ List<String> _selectBuildTargets(Configuration inner) {
8080
final compiler = inner.compiler;
8181
const targetsForCompilers = {
8282
Compiler.dartk: ['runtime'],
83-
Compiler.dartkp: ['runtime', 'dart_precompiled_runtime'],
83+
Compiler.dartkp: ['runtime', 'runtime_precompiled'],
8484
Compiler.appJitk: ['runtime'],
8585
Compiler.fasta: ['create_sdk', 'ddc_stable_test', 'kernel_platform_files'],
8686
Compiler.ddc: ['ddc_stable_test'],

pkg/test_runner/lib/src/compiler_configuration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ class BytecodeCompilerConfiguration extends CompilerConfiguration {
16011601

16021602
String dartAotRuntime() => _useSdk
16031603
? '${_configuration.buildDirectory}/dart-sdk/bin/dartaotruntime'
1604-
: '${_configuration.buildDirectory}/dart_precompiled_runtime';
1604+
: '${_configuration.buildDirectory}/dartaotruntime';
16051605

16061606
String dart2bytecodeSnapshot() => _useSdk
16071607
? '${_configuration.buildDirectory}/dart-sdk/bin/snapshots/dart2bytecode.dart.snapshot'

0 commit comments

Comments
 (0)