"[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensure…

…s 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 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 1b331d0. > > Reason for revert: golem builds are failing > > 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 > > > > TEST=ci > > Change-Id: Id0f383eabb496c06c0acebc639c8e3b056ba82d0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393781 Commit-Queue: Siva Annamalai <asiva@google.com> Reviewed-by: Ryan Macnak <rmacnak@google.com>
dart-lang · Nov 6, 2024 · f81a402 · f81a402
1 parent 1d4c570
commit f81a402
Show file tree

Hide file tree

Showing 46 changed files with 220 additions and 150 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -86,7 +86,7 @@ group("run_ffi_unit_tests") {
 group("runtime_precompiled") {
   import("runtime/runtime_args.gni")
   deps = [
-    "runtime/bin:dart_precompiled_runtime",
+    "runtime/bin:dartaotruntime",
     "runtime/bin:gen_snapshot",
     "runtime/bin:gen_snapshot($host_toolchain)",
     "runtime/bin:process_test",
@@ -110,7 +110,15 @@ group("create_platform_sdk") {
 }
 
 group("dart2js") {
-  deps = [ "utils/compiler:dart2js" ]
+  import("runtime/runtime_args.gni")
+  if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
+    deps = [
+      ":runtime_precompiled",
+      "utils/compiler:dart2js_sdk_aot",
+    ]
+  } else {
+    deps = [ "utils/compiler:dart2js" ]
+  }
 }
 
 group("dart2wasm_platform") {
@@ -148,7 +156,19 @@ group("dartanalyzer") {
 }
 
 group("ddc") {
-  deps = [ "utils/ddc:dartdevc" ]
+  import("runtime/runtime_args.gni")
+  if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
+    deps = [
+      ":runtime_precompiled",
+      "utils/bazel:kernel_worker_aot",
+      "utils/ddc:dartdevc_aot",
+    ]
+  } else {
+    deps = [
+      "utils/bazel:kernel_worker",
+      "utils/ddc:dartdevc",
+    ]
+  }
 }
 
 group("analysis_server") {
@@ -367,7 +387,7 @@ if (is_fuchsia) {
 
   test_binaries = [
     "dart",
-    "dart_precompiled_runtime",
+    "dartaotruntime",
     "run_vm_tests",
   ]
 

diff --git a/benchmarks/NativeCall/native/native_functions.c b/benchmarks/NativeCall/native/native_functions.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 // TODO(dartbug.com/40579): This requires static linking to either link
-// dart.exe or dart_precompiled_runtime.exe on Windows.
+// dart.exe or dartaotruntime.exe on Windows.
 // The sample currently fails on Windows in AOT mode.
 #include "include/dart_api.h"
 

diff --git a/docs/Kernel-developer-notes.md b/docs/Kernel-developer-notes.md
@@ -28,7 +28,7 @@ Run end-to-end tests using dartk + VM:
 
 Optionally (this is slow) run end-to-end tests using AOT:
 ```
-./tools/build.py dart_precompiled_runtime
+./tools/build.py runtime_precompiled
 ./tools/test.py -cdartkp -rdart_precompiled language co19
 ```
 

diff --git a/pkg/dart2wasm/tool/compile_benchmark b/pkg/dart2wasm/tool/compile_benchmark
@@ -35,7 +35,7 @@ BIN_DIR="$OUT_DIR/$DART_CONFIGURATION"
 
 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/dartdev/lib/src/sdk.dart b/pkg/dartdev/lib/src/sdk.dart
@@ -54,8 +54,8 @@ class Sdk {
       ? path.absolute(
           sdkPath,
           Platform.isWindows
-              ? 'dart_precompiled_runtime_product.exe'
-              : 'dart_precompiled_runtime_product',
+              ? 'dartaotruntime_product.exe'
+              : 'dartaotruntime_product',
         )
       : path.absolute(
           sdkPath,

diff --git a/pkg/dev_compiler/test/worker/worker_test.dart b/pkg/dev_compiler/test/worker/worker_test.dart
@@ -25,17 +25,19 @@ void main() {
   var dartAotRuntime = p.absolute(
       sdkPath,
       Platform.isWindows
-          ? 'dart_precompiled_runtime_product.exe'
-          : 'dart_precompiled_runtime_product');
+          ? 'dartaotruntime_product.exe'
+          : 'dartaotruntime_product');
+  var snapshotName = _resolvePath('gen/dartdevc_aot_product.dart.snapshot');
   if (!File(dartAotRuntime).existsSync()) {
     dartAotRuntime = p.absolute(
         sdkPath,
         Platform.isWindows
-            ? 'dart_precompiled_runtime.exe'
-            : 'dart_precompiled_runtime');
+            ? 'dartaotruntime_product.exe'
+            : 'dartaotruntime_product');
+    snapshotName = _resolvePath('gen/dartdevc_aot.dart.snapshot');
   }
   final executableArgs = <String>[
-    _resolvePath('gen/dartdevc_aot.dart.snapshot'),
+    snapshotName,
     '--sound-null-safety',
     '--dart-sdk-summary',
     _resolvePath('ddc_outline.dill'),

diff --git a/pkg/dynamic_modules/test/runner/util.dart b/pkg/dynamic_modules/test/runner/util.dart
@@ -86,9 +86,8 @@ Uri genSnapshotBin =
     buildRootUri.resolve(useProduct ? 'gen_snapshot_product' : 'gen_snapshot');
 Uri dart2bytecodeSnapshot =
     buildRootUri.resolve('gen/dart2bytecode.dart.snapshot');
-Uri aotRuntimeBin = buildRootUri.resolve(useProduct
-    ? 'dart_precompiled_runtime_product'
-    : 'dart_precompiled_runtime');
+Uri aotRuntimeBin = buildRootUri
+    .resolve(useProduct ? 'dartaotruntime_product' : 'dartaotruntime');
 Uri vmPlatformDill = buildRootUri.resolve('vm_platform_strong.dill');
 
 // Encodes test results in the format expected by Dart's CI infrastructure.

diff --git a/pkg/front_end/lib/src/linux_and_intel_specific_perf.dart b/pkg/front_end/lib/src/linux_and_intel_specific_perf.dart
@@ -41,7 +41,7 @@ int _perfPid = -1;
 /// You might also want the dartaotruntime to include debug symbols:
 ///
 /// ```
-/// cp out/ReleaseX64/dart_precompiled_runtime_product \
+/// cp out/ReleaseX64/dartaotruntime_product \
 ///   out/ReleaseX64/dart-sdk/bin/dartaotruntime
 /// ```
 ///

diff --git a/pkg/smith/lib/configuration.dart b/pkg/smith/lib/configuration.dart
@@ -251,7 +251,7 @@ class Configuration {
           .pathSegments
           .lastWhere((e) => e.isNotEmpty);
       final executableNoExtension = executableName.split('.').first;
-      if (executableNoExtension == 'dart_precompiled_runtime') {
+      if (executableNoExtension == 'dartaotruntime') {
         runtime = Runtime.dartPrecompiled;
       } else if (executableNoExtension == 'dart') {
         runtime = Runtime.vm;

diff --git a/pkg/test_runner/lib/src/build_configurations.dart b/pkg/test_runner/lib/src/build_configurations.dart
@@ -80,7 +80,7 @@ List<String> _selectBuildTargets(Configuration inner) {
   final compiler = inner.compiler;
   const targetsForCompilers = {
     Compiler.dartk: ['runtime'],
-    Compiler.dartkp: ['runtime', 'dart_precompiled_runtime'],
+    Compiler.dartkp: ['runtime', 'runtime_precompiled'],
     Compiler.appJitk: ['runtime'],
     Compiler.fasta: ['create_sdk', 'ddc_stable_test', 'kernel_platform_files'],
     Compiler.ddc: ['ddc_stable_test'],

diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart
@@ -1601,7 +1601,7 @@ class BytecodeCompilerConfiguration extends CompilerConfiguration {
 
   String dartAotRuntime() => _useSdk
       ? '${_configuration.buildDirectory}/dart-sdk/bin/dartaotruntime'
-      : '${_configuration.buildDirectory}/dart_precompiled_runtime';
+      : '${_configuration.buildDirectory}/dartaotruntime';
 
   String dart2bytecodeSnapshot() => _useSdk
       ? '${_configuration.buildDirectory}/dart-sdk/bin/snapshots/dart2bytecode.dart.snapshot'

diff --git a/pkg/test_runner/lib/src/process_queue.dart b/pkg/test_runner/lib/src/process_queue.dart
@@ -646,19 +646,17 @@ class CommandExecutorImpl implements CommandExecutor {
     steps.add(() => device.runAdbShellCommand(['rm', '-Rf', deviceTestDir]));
     steps.add(() => device.runAdbShellCommand(['mkdir', '-p', deviceTestDir]));
     steps.add(() => device.pushCachedData(
-        '$buildPath/exe.stripped/dart_precompiled_runtime',
-        '$devicedir/dart_precompiled_runtime'));
+        '$buildPath/exe.stripped/dartaotruntime', '$devicedir/dartaotruntime'));
     steps.add(() => device.pushCachedData(
-        '$buildPath/dart_precompiled_runtime.sym',
-        '$devicedir/dart_precompiled_runtime.sym'));
+        '$buildPath/dartaotruntime.sym', '$devicedir/dartaotruntime.sym'));
     steps.add(
         () => device.pushCachedData(processTest, '$devicedir/process_test'));
     steps.add(() => device.pushCachedData(
         abstractSocketTest, '$devicedir/abstract_socket_test'));
     steps.add(() => device.runAdbShellCommand([
           'chmod',
           '777',
-          '$devicedir/dart_precompiled_runtime $devicedir/process_test $devicedir/abstract_socket_test'
+          '$devicedir/dartaotruntime $devicedir/process_test $devicedir/abstract_socket_test'
         ]));
 
     steps.addAll(_pushLibraries(command, device, devicedir, deviceTestDir));
@@ -671,7 +669,7 @@ class CommandExecutorImpl implements CommandExecutor {
     steps.add(() => device.runAdbShellCommand([
           'export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$deviceTestDir;'
               'export TEST_COMPILATION_DIR=$deviceTestDir;'
-              '$devicedir/dart_precompiled_runtime',
+              '$devicedir/dartaotruntime',
           '--android-log-to-stderr',
           ...arguments,
         ], timeout: timeoutDuration));

diff --git a/pkg/test_runner/lib/src/runtime_configuration.dart b/pkg/test_runner/lib/src/runtime_configuration.dart
@@ -118,7 +118,7 @@ abstract class RuntimeConfiguration {
       // cannot.
       dir = dir.replaceAll("SIMARM_X64", "SIMARM");
 
-      dartExecutable = '$dir/dart_precompiled_runtime$executableExtension';
+      dartExecutable = '$dir/dartaotruntime$executableExtension';
     }
 
     TestUtils.ensureExists(dartExecutable, _configuration);
@@ -431,7 +431,7 @@ class DartPrecompiledRuntimeConfiguration extends DartVmRuntimeConfiguration {
     if (script != null &&
         type != 'application/dart-precompiled' &&
         type != 'application/dart-bytecode') {
-      throw "dart_precompiled cannot run files of type '$type'.";
+      throw "dartaotruntime cannot run files of type '$type'.";
     }
 
     var executable = dartPrecompiledBinaryFileName;
@@ -496,7 +496,7 @@ class DartPrecompiledAdbRuntimeConfiguration
     var script = artifact?.filename;
     var type = artifact?.mimeType;
     if (script != null && type != 'application/dart-precompiled') {
-      throw "dart_precompiled cannot run files of type '$type'.";
+      throw "dartaotruntime cannot run files of type '$type'.";
     }
 
     var processTest = processTestBinaryFileName;

diff --git a/pkg/vm/tool/dart_precompiled_runtime2 b/pkg/vm/tool/dart_precompiled_runtime2
@@ -33,4 +33,4 @@ fi
 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/runtime/BUILD.gn b/runtime/BUILD.gn
@@ -51,7 +51,7 @@ config("dart_product_config") {
   }
 }
 
-config("dart_precompiled_runtime_config") {
+config("dart_aotruntime_config") {
   defines = []
   defines += [
     "DART_PRECOMPILED_RUNTIME",

diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
@@ -903,15 +903,32 @@ dart_executable("dart") {
   }
 }
 
-dart_executable("dart_precompiled_runtime") {
+# This rule is here to ensure benchmark suites do not break, it can be
+# removed once the benchmark suites are updated.
+group("dart_precompiled_runtime") {
+  deps = [
+    ":copy_dart_precompiled_runtime",
+    ":dartaotruntime",
+  ]
+}
+
+copy("copy_dart_precompiled_runtime") {
+  visibility = [ ":dart_precompiled_runtime" ]
+  deps = [ ":dartaotruntime" ]
+  src_dir = get_label_info(":dartaotruntime", "root_out_dir")
+  sources = [ "$src_dir/dartaotruntime${executable_suffix}" ]
+  outputs = [ "$root_out_dir/dart_precompiled_runtime${executable_suffix}" ]
+}
+
+dart_executable("dartaotruntime") {
   extra_configs = [
-    "..:dart_precompiled_runtime_config",
+    "..:dart_aotruntime_config",
     "..:add_empty_macho_section_config",
   ]
   extra_deps = [
     ":icudtl_cc",
-    "..:libdart_precompiled_runtime",
-    "../platform:libdart_platform_precompiled_runtime",
+    "..:libdart_aotruntime",
+    "../platform:libdart_platform_aotruntime",
   ]
   if (dart_runtime_mode != "release") {
     extra_deps += [ "../observatory:standalone_observatory_archive" ]
@@ -944,15 +961,15 @@ dart_executable("dart_precompiled_runtime") {
   }
 }
 
-dart_executable("dart_precompiled_runtime_product") {
+dart_executable("dartaotruntime_product") {
   use_product_mode = true
   extra_configs = [
-    "..:dart_precompiled_runtime_config",
+    "..:dart_aotruntime_config",
     "..:add_empty_macho_section_config",
   ]
   extra_deps = [
-    "..:libdart_precompiled_runtime_product",
-    "../platform:libdart_platform_precompiled_runtime_product",
+    "..:libdart_aotruntime_product",
+    "../platform:libdart_platform_aotruntime_product",
   ]
   extra_sources = [
     "builtin.cc",
@@ -978,17 +995,17 @@ dart_executable("dart_precompiled_runtime_product") {
 if (build_analyze_snapshot) {
   dart_executable("analyze_snapshot") {
     use_product_mode = dart_runtime_mode == "release"
-    extra_configs = [ "..:dart_precompiled_runtime_config" ]
+    extra_configs = [ "..:dart_aotruntime_config" ]
 
     if (use_product_mode) {
       extra_deps = [
-        "..:libdart_precompiled_runtime_product",
-        "../platform:libdart_platform_precompiled_runtime_product",
+        "..:libdart_aotruntime_product",
+        "../platform:libdart_platform_aotruntime_product",
       ]
     } else {
       extra_deps = [
-        "..:libdart_precompiled_runtime",
-        "../platform:libdart_platform_precompiled_runtime",
+        "..:libdart_aotruntime",
+        "../platform:libdart_platform_aotruntime",
       ]
     }
 

diff --git a/...rt_precompiled_runtime_test_component.cml → ...ime/bin/dartaotruntime_test_component.cml b/...rt_precompiled_runtime_test_component.cml → ...ime/bin/dartaotruntime_test_component.cml
@@ -7,7 +7,7 @@
     "//runtime/vm.shard.cml",
   ],
   program: {
-    binary: "exe.stripped/dart_precompiled_runtime",
+    binary: "exe.stripped/dartaotruntime",
     runner: "elf_test_runner",
   },
   capabilities: [

diff --git a/runtime/bin/entrypoints_verification_test.cc b/runtime/bin/entrypoints_verification_test.cc
@@ -7,7 +7,7 @@
 #include <string.h>
 
 // TODO(dartbug.com/40579): This requires static linking to either link
-// dart.exe or dart_precompiled_runtime.exe on Windows.
+// dart.exe or dartaotruntime.exe on Windows.
 // The sample currently fails on Windows in AOT mode.
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
@@ -29,12 +29,12 @@
     abort();                                                                   \
   }
 
-static bool is_dart_precompiled_runtime = true;
+static bool is_dartaotruntime = true;
 
 // Some invalid accesses are allowed in AOT since we don't retain @pragma
 // annotations. Therefore we skip the negative tests in AOT.
 #define FAIL(name, result)                                                     \
-  if (!is_dart_precompiled_runtime) {                                          \
+  if (!is_dartaotruntime) {                                                    \
     Fail(name, result);                                                        \
   }
 
@@ -46,7 +46,7 @@ void Fail(const char* name, Dart_Handle result) {
 }
 
 #define FAIL_INVOKE_FIELD(name, result)                                        \
-  if (!is_dart_precompiled_runtime) {                                          \
+  if (!is_dartaotruntime) {                                                    \
     FailInvokeField(name, result);                                             \
   }
 
@@ -94,7 +94,7 @@ static void TestFields(Dart_Handle target) {
 }
 
 DART_EXPORT void RunTests() {
-  is_dart_precompiled_runtime = Dart_IsPrecompiledRuntime();
+  is_dartaotruntime = Dart_IsPrecompiledRuntime();
 
   Dart_Handle lib = Dart_RootLibrary();
 

diff --git a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
@@ -34,7 +34,7 @@
 #include <limits>
 
 // TODO(dartbug.com/40579): This requires static linking to either link
-// dart.exe or dart_precompiled_runtime.exe on Windows.
+// dart.exe or dartaotruntime.exe on Windows.
 // The sample currently fails on Windows in AOT mode.
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"