[Web/DDC] - Convert the kernel_worker and dartdevc snapshots to an AOT snapshot

Converts kernel_worker.dart.snapshot and dartdevc.dart.snapshot to
 AOT snapshots. Fixes tests and paths in the code accordingly.

TESTS=ci

Change-Id: Ib99b2a3343e23252c3a6b5295b0d20f0f486aede
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/381388
Reviewed-by: Nicholas Shahan <[email protected]>
Commit-Queue: Siva Annamalai <[email protected]>

Author: a-siva

CHANGELOG.md

@@ -31,14 +31,23 @@ main() {
 }
 ```
 
-###### Dart to Javascript Compiler (dart2js)
+#### Dart to Javascript Compiler (dart2js)
 
 - The dart2js compiler which is invoked when the command
   'dart compile js' is used has been switched to use an AOT snapshot
   instead of a JIT snapshot.
 
 [#53576]: https://github.com/dart-lang/sdk/issues/53576
 
+#### Dart Development Compiler (dartdevc)
+
+- The dartdevc compiler and kernel_worker utility have been switched to use
+  an AOT snapshot instead of a JIT snapshot, the SDK build still includes a
+  JIT snapshot of these tools as package build/build_web_compiler depends
+  on it. The AOT snapshot can be used as follows to run DDC
+  <dart-sdk>/bin/dartaotruntime <dart-sdk>/bin/snapshots/dartdevc_aot.dart.snapshot <options>
+
+[#53576]: https://github.com/dart-lang/sdk/issues/53576
 
 ## 3.6.0
 

pkg/compiler/tool/modular_test_suite_helper.dart

@@ -20,12 +20,14 @@ import 'package:modular_test/src/runner.dart';
 import 'package:modular_test/src/suite.dart';
 import 'package:modular_test/src/steps/macro_precompile_aot.dart';
 import 'package:modular_test/src/steps/util.dart';
+import 'package:path/path.dart' as p;
 
 String packageConfigJsonPath = ".dart_tool/package_config.json";
 Uri sdkRoot = Platform.script.resolve("../../../");
 Uri packageConfigUri = sdkRoot.resolve(packageConfigJsonPath);
 late Options _options;
 late String _dart2jsScript;
+late String _kernelWorkerAotScript;
 late String _kernelWorkerScript;
 
 const dillSummaryId = DataId("summary.dill");
@@ -118,8 +120,22 @@ abstract class CFEStep extends IOModularStep {
       sources = getSources(module);
     }
 
+    var isAot = File(_kernelWorkerAotScript).existsSync();
+    var script = _kernelWorkerAotScript;
+    var sdkPath = p.dirname(p.dirname(Platform.resolvedExecutable));
+    var executable = p.absolute(
+      sdkPath,
+      'bin',
+      Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime',
+    );
+    if (!isAot) {
+      // This can be removed once we stop supporting ia32 architecture.
+      script = _kernelWorkerScript;
+      executable = Platform.resolvedExecutable;
+    }
+
     List<String> args = [
-      _kernelWorkerScript,
+      script,
       '--sound-null-safety',
       ...stepArguments,
       '--exclude-non-sources',
@@ -140,8 +156,8 @@ abstract class CFEStep extends IOModularStep {
       ...(flags.expand((String flag) => ['--enable-experiment', flag])),
     ];
 
-    var result = await runProcess(
-        Platform.resolvedExecutable, args, root.toFilePath(), _options.verbose);
+    var result =
+        await runProcess(executable, args, root.toFilePath(), _options.verbose);
     checkExitCode(result, this, module, _options.verbose);
   }
 
@@ -635,6 +651,8 @@ Future<void> resolveScripts(Options options) async {
   _options = options;
   _dart2jsScript = await resolve(
       'package:compiler/src/dart2js.dart', 'snapshots/dart2js.dart.snapshot');
+  _kernelWorkerAotScript = await resolve('utils/bazel/kernel_worker.dart',
+      'snapshots/kernel_worker_aot.dart.snapshot');
   _kernelWorkerScript = await resolve('utils/bazel/kernel_worker.dart',
       'snapshots/kernel_worker.dart.snapshot');
 }

pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_shared.dart

@@ -1191,15 +1191,28 @@ class DDCKernelGenerator {
   static final dart = Platform.resolvedExecutable;
   static final sdkPath =
       computePlatformBinariesLocation(forceBuildDir: true).toFilePath();
-
-  static final dartdevc =
-      p.join(sdkPath, 'dart-sdk', 'bin', 'snapshots', 'dartdevc.dart.snapshot');
-  static final kernelWorker = p.join(
-      sdkPath, 'dart-sdk', 'bin', 'snapshots', 'kernel_worker.dart.snapshot');
+  static var dartExecutable = p.join(
+    sdkPath,
+    'dart-sdk',
+    'bin',
+    Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime',
+  );
+  static var dartdevc = p.join(
+      sdkPath, 'dart-sdk', 'bin', 'snapshots', 'dartdevc_aot.dart.snapshot');
+  static var kernelWorker = p.join(sdkPath, 'dart-sdk', 'bin', 'snapshots',
+      'kernel_worker_aot.dart.snapshot');
 
   DDCKernelGenerator(this.config, this.verbose);
 
   Future<int> generate() async {
+    if (!File(dartdevc).existsSync()) {
+      // This can be removed once we stop supporting ia32 architecture.
+      dartdevc = p.join(
+          sdkPath, 'dart-sdk', 'bin', 'snapshots', 'dartdevc.dart.snapshot');
+      kernelWorker = p.join(sdkPath, 'dart-sdk', 'bin', 'snapshots',
+          'kernel_worker.dart.snapshot');
+      dartExecutable = Platform.resolvedExecutable;
+    }
     Directory.fromUri(config.outputPath).createSync();
 
     // generate summaries
@@ -1238,7 +1251,7 @@ class DDCKernelGenerator {
       if (!config.soundNullSafety) '--no-sound-null-safety',
     ];
 
-    return runProcess(dart, args, config.rootPath, verbose);
+    return runProcess(dartExecutable, args, config.rootPath, verbose);
   }
 
   Future<int> _generateFullDill(ModuleConfiguration module) async {
@@ -1270,7 +1283,7 @@ class DDCKernelGenerator {
       '--no-summarize',
     ];
 
-    return await runProcess(dart, args, config.rootPath, verbose);
+    return await runProcess(dartExecutable, args, config.rootPath, verbose);
   }
 }
 

pkg/dev_compiler/test/macros/macros_test.dart

@@ -9,6 +9,7 @@ import 'package:dev_compiler/ddc.dart' as ddc;
 import 'package:frontend_server/compute_kernel.dart';
 import 'package:macros/src/bootstrap.dart';
 import 'package:macros/src/executor/serialization.dart';
+import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
 Directory tmp = Directory.systemTemp.createTempSync('ddc_worker_test');
@@ -22,12 +23,14 @@ String _resolvePath(String executableRelativePath) {
 void main() {
   group('DDC: Macros', timeout: Timeout(Duration(minutes: 2)), () {
     late File testMacroDart;
-    late File bootstrapDillFileVm;
+    late String bootstrapDillPathVm;
+    late String bootstrapAotPathVm;
     late File bootstrapDillFileDdc;
     late Uri testMacroUri;
     late File packageConfig;
     late List<String> ddcArgs;
     late List<String> executableArgs;
+    late String dartAot;
 
     final applyTestMacroDart = file('apply_test_macro.dart');
     final testMacroJS = file('test_macro.js');
@@ -99,20 +102,32 @@ macro class TestMacro implements ClassDeclarationsMacro {
           'lib/_internal/vm_platform_strong_product.dill'));
       var ddcPlatformDill = File(_resolvePath('../'
           'lib/_internal/ddc_outline.dill'));
-      bootstrapDillFileVm = file('bootstrap.dart.dill');
+      bootstrapDillPathVm = 'bootstrap.dart.dill';
       var bootstrapResult = await computeKernel([
         '--enable-experiment=macros',
         '--no-summary',
         '--no-summary-only',
         '--target=vm',
         '--dart-sdk-summary=${productPlatformDill.uri}',
-        '--output=${bootstrapDillFileVm.path}',
+        '--output=$bootstrapDillPathVm',
         '--source=${bootstrapFile.uri}',
         '--source=${testMacroDart.uri}',
         '--packages-file=${packageConfig.uri}',
       ]);
       expect(bootstrapResult.succeeded, true);
 
+      // Compile the macro to vm AOT executable to be run by the CFE.
+      bootstrapAotPathVm = 'bootstrap.dart.exe';
+      var bootstrapAotResult = Process.runSync(Platform.resolvedExecutable, [
+        'compile',
+        'exe',
+        '--enable-experiment=macros',
+        '-o',
+        bootstrapAotPathVm,
+        bootstrapFile.path,
+      ]);
+      expect(bootstrapAotResult.exitCode, EXIT_CODE_OK);
+
       // Compile the macro to ddc dill for the ddc build.
       bootstrapDillFileDdc = file('bootstrap_ddc.dart.dill');
       var bootstrapResultDdc = await computeKernel([
@@ -146,11 +161,6 @@ void main() {
         _resolvePath('../../ddc_outline.dill'),
         '--packages=${packageConfig.uri}',
       ];
-
-      executableArgs = [
-        _resolvePath('../../gen/dartdevc.dart.snapshot'),
-        ...ddcArgs
-      ];
     });
 
     tearDown(() {
@@ -175,7 +185,7 @@ void main() {
       await ddc.internalMain([
         ...ddcArgs,
         '--precompiled-macro',
-        '${bootstrapDillFileVm.path};$testMacroUri',
+        '$bootstrapDillPathVm;$testMacroUri',
         '--no-source-map',
         '--no-summarize',
         '-s',
@@ -193,7 +203,15 @@ void main() {
     });
 
     test('compile using dartdevc snapshot', () {
-      var result = Process.runSync(Platform.executable, [
+      executableArgs = [
+        _resolvePath('snapshots/dartdevc_aot.dart.snapshot'),
+        ...ddcArgs
+      ];
+
+      dartAot = p.absolute(p.dirname(Platform.resolvedExecutable),
+          Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime');
+
+      var result = Process.runSync(dartAot, [
         ...executableArgs,
         '--no-source-map',
         '-o',
@@ -207,10 +225,10 @@ void main() {
       expect(testMacroJS.existsSync(), isTrue);
       expect(testMacroSummary.existsSync(), isTrue);
 
-      result = Process.runSync(Platform.executable, [
+      result = Process.runSync(dartAot, [
         ...executableArgs,
         '--precompiled-macro',
-        '${bootstrapDillFileVm.path};$testMacroUri',
+        '$bootstrapAotPathVm;$testMacroUri',
         '--no-source-map',
         '--no-summarize',
         '-s',

pkg/dev_compiler/test/modular_helpers.dart

@@ -12,13 +12,15 @@ import 'package:modular_test/src/runner.dart';
 import 'package:modular_test/src/steps/macro_precompile_aot.dart';
 import 'package:modular_test/src/steps/util.dart';
 import 'package:modular_test/src/suite.dart';
+import 'package:path/path.dart' as p;
 
 String packageConfigJsonPath = '.dart_tool/package_config.json';
 Uri sdkRoot = Platform.script.resolve('../../../');
 Uri packageConfigUri = sdkRoot.resolve(packageConfigJsonPath);
 late Options _options;
 late String _dartdevcScript;
 late String _kernelWorkerScript;
+late String _dartExecutable;
 
 const dillId = DataId('dill');
 const jsId = DataId('js');
@@ -120,7 +122,7 @@ class SourceToSummaryDillStep implements IOModularStep {
     ];
 
     var result = await runProcess(
-        Platform.resolvedExecutable, args, root.toFilePath(), _options.verbose);
+        _dartExecutable, args, root.toFilePath(), _options.verbose);
     checkExitCode(result, this, module, _options.verbose);
   }
 
@@ -219,7 +221,7 @@ class DDCStep implements IOModularStep {
       '$output',
     ];
     var result = await runProcess(
-        Platform.resolvedExecutable, args, root.toFilePath(), _options.verbose);
+        _dartExecutable, args, root.toFilePath(), _options.verbose);
     checkExitCode(result, this, module, _options.verbose);
   }
 
@@ -337,8 +339,23 @@ Future<void> resolveScripts(Options options) async {
     return result;
   }
 
-  _dartdevcScript = await resolve(
-      'pkg/dev_compiler/bin/dartdevc.dart', 'snapshots/dartdevc.dart.snapshot');
-  _kernelWorkerScript = await resolve('utils/bazel/kernel_worker.dart',
-      'snapshots/kernel_worker.dart.snapshot');
+  _dartdevcScript = await resolve('pkg/dev_compiler/bin/dartdevc.dart',
+      'snapshots/dartdevc_aot.dart.snapshot');
+  if (File(_dartdevcScript).existsSync()) {
+    _kernelWorkerScript = await resolve('utils/bazel/kernel_worker.dart',
+        'snapshots/kernel_worker_aot.dart.snapshot');
+    var sdkPath = p.dirname(p.dirname(Platform.resolvedExecutable));
+    _dartExecutable = p.absolute(
+      sdkPath,
+      'bin',
+      Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime',
+    );
+  } else {
+    // This can be removed once we stop supporting ia32 architecture.
+    _dartdevcScript = await resolve('pkg/dev_compiler/bin/dartdevc.dart',
+        'snapshots/dartdevc.dart.snapshot');
+    _kernelWorkerScript = await resolve('utils/bazel/kernel_worker.dart',
+        'snapshots/kernel_worker.dart.snapshot');
+    _dartExecutable = Platform.resolvedExecutable;
+  }
 }