[dyn_modules] Enable pkg/dynamic_modules tests in VM/JIT configuration

Change-Id: Ic7d9ed514969eb72066812f442b51129e4d27204
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426680
Reviewed-by: Sigmund Cherem <[email protected]>
Commit-Queue: Alexander Markov <[email protected]>

Author: alexmarkov

pkg/dynamic_modules/test/data/core_api/modules/entry1.dart

@@ -6,7 +6,7 @@ import 'package:expect/expect.dart';
 
 @pragma('dyn-module:entry-point')
 Future<bool> dynamicModuleEntrypoint() async {
-  final list = ['1','2','3'];
+  final list = ['1', '2', '3'];
   list.add('4');
   final list2 = list.map((e) => 'item $e').toList().reversed.toList();
   final list3 = <Future>[];

pkg/dynamic_modules/test/data/indirect_expose/shared/private.dart

@@ -12,4 +12,3 @@ class Implementation2 implements Interface {
   @override
   int method1() => 4;
 }
-

pkg/dynamic_modules/test/runner/main.dart

@@ -9,7 +9,7 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 
-import 'aot.dart';
+import 'vm.dart';
 import 'dart2wasm.dart';
 import 'ddc.dart';
 import 'load.dart';
@@ -55,7 +55,8 @@ void main(List<String> args) async {
   try {
     executor = switch (target) {
       Target.ddc => DdcExecutor(logger),
-      Target.aot => AotExecutor(logger),
+      Target.aot => VmExecutor(logger, mode: VmMode.aot),
+      Target.jit => VmExecutor(logger, mode: VmMode.jit),
       Target.dart2wasm => Dart2wasmExecutor(logger),
     };
 

pkg/dynamic_modules/test/runner/target.dart

@@ -11,6 +11,7 @@ import 'model.dart';
 /// Possible backends where the tests can be executed.
 enum Target {
   aot,
+  jit,
   dart2wasm,
   ddc,
 }

pkg/dynamic_modules/test/runner/util.dart

@@ -29,7 +29,7 @@ String _outFolder = Platform.isMacOS ? 'xcodebuild' : 'out';
 String configuration = () {
   var env = Platform.environment['DART_CONFIGURATION'];
   if (env != null) return env;
-  var folderSegments = _dartBin.resolve('.').pathSegments;
+  var folderSegments = dartBin.resolve('.').pathSegments;
   for (int i = folderSegments.length - 1; i > 0; i--) {
     if (folderSegments[i] == _outFolder) {
       var candidate = folderSegments[i + 1];
@@ -64,12 +64,12 @@ String _d8Path = (() {
 })();
 
 Uri d8Uri = repoRoot.resolve(_d8Path);
-Uri _dartBin = Uri.file(Platform.resolvedExecutable);
-Uri dartAotBin = _dartBin
+Uri dartBin = Uri.file(Platform.resolvedExecutable);
+Uri dartAotBin = dartBin
     .resolve(Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime');
-Uri ddcAotSnapshot = _dartBin.resolve('snapshots/dartdevc_aot.dart.snapshot');
+Uri ddcAotSnapshot = dartBin.resolve('snapshots/dartdevc_aot.dart.snapshot');
 Uri kernelWorkerAotSnapshot =
-    _dartBin.resolve('snapshots/kernel_worker_aot.dart.snapshot');
+    dartBin.resolve('snapshots/kernel_worker_aot.dart.snapshot');
 Uri buildRootUri = repoRoot.resolve(buildFolder);
 Uri ddcSdkOutline = buildRootUri.resolve('ddc_outline.dill');
 Uri ddcSdkJs = buildRootUri.resolve('gen/utils/ddc/stable/sdk/ddc/dart_sdk.js');
@@ -90,8 +90,7 @@ Uri aotRuntimeBin = buildRootUri
     .resolve(useProduct ? 'dartaotruntime_product' : 'dartaotruntime');
 Uri vmPlatformDill = buildRootUri.resolve('vm_platform_strong.dill');
 
-Uri dart2wasmSnapshot =
-    _dartBin.resolve('snapshots/dart2wasm_product.snapshot');
+Uri dart2wasmSnapshot = dartBin.resolve('snapshots/dart2wasm_product.snapshot');
 Uri dart2wasmPlatformDill = buildRootUri.resolve('dart2wasm_platform.dill');
 Uri dart2wasmLibrariesSpec = repoRoot.resolve('sdk/lib/libraries.json');
 Uri compileBenchmark = repoRoot.resolve('pkg/dart2wasm/tool/compile_benchmark');

pkg/dynamic_modules/test/runner/aot.dart renamed to pkg/dynamic_modules/test/runner/vm.dart

@@ -15,7 +15,12 @@ import 'model.dart';
 import 'util.dart';
 import 'target.dart';
 
-/// Logic to build and execute dynamic modules in Dart AOT.
+enum VmMode {
+  aot,
+  jit,
+}
+
+/// Logic to build and execute dynamic modules using Dart VM (AOT or JIT).
 ///
 /// In particular:
 ///   * The initial app is built as a regular AOT target, except that
@@ -28,13 +33,14 @@ import 'target.dart';
 ///
 /// Note: this assumes that [Platform.resolvedExecutable] is a VM built with the
 /// `--dart_dynamic_modules` build flag.
-class AotExecutor implements TargetExecutor {
+class VmExecutor implements TargetExecutor {
   static const rootScheme = 'dev-dart-app';
+  final VmMode mode;
   late final bool _shouldCleanup;
   late final Directory _tmp;
   final Logger _logger;
 
-  AotExecutor(this._logger) {
+  VmExecutor(this._logger, {required this.mode}) {
     /// Allow using an environment variable to run tests on a fixed directory.
     /// This prevents the directory from getting deleted too.
     var path = Platform.environment['TMP_DIR'] ?? '';
@@ -98,17 +104,23 @@ class AotExecutor implements TargetExecutor {
   Future compileApplication(DynamicModuleTest test) async {
     _ensureDirectory(test.name);
     _logger.info('Compile ${test.name} app');
-    await _buildKernel(test.name, test.main, test.folder, true);
+
+    if (mode == VmMode.aot) {
+      await _buildKernel(test.name, test.main, test.folder, true);
+    }
     await _buildKernel(test.name, test.main, test.folder, false);
 
-    var testDir = _tmp.uri.resolve(test.name).toFilePath();
-    var args = [
-      '--snapshot-kind=app-aot-elf',
-      '--elf=${test.main}.snapshot',
-      '${test.main}_aot.dill',
-    ];
-    await runProcess(genSnapshotBin.toFilePath(), args, testDir, _logger,
-        'aot snapshot ${test.name}/${test.main}');
+    final testDir = _tmp.uri.resolve(test.name).toFilePath();
+
+    if (mode == VmMode.aot) {
+      var args = [
+        '--snapshot-kind=app-aot-elf',
+        '--elf=${test.main}.snapshot',
+        '${test.main}_aot.dill',
+      ];
+      await runProcess(genSnapshotBin.toFilePath(), args, testDir, _logger,
+          'aot snapshot ${test.name}/${test.main}');
+    }
 
     // The next steps are optional, but done to test trimming of assets used
     // by the bytecode compiler.
@@ -184,9 +196,15 @@ class AotExecutor implements TargetExecutor {
     // and finally launches the app.
     var testDir = _tmp.uri.resolve('${test.name}/');
     var result = await runProcess(
-        aotRuntimeBin.toFilePath(),
+        switch (mode) {
+          VmMode.aot => aotRuntimeBin.toFilePath(),
+          VmMode.jit => dartBin.toFilePath(),
+        },
         [
-          '${test.main}.snapshot',
+          switch (mode) {
+            VmMode.aot => '${test.main}.snapshot',
+            VmMode.jit => '${test.main}_no_aot.dill',
+          },
         ],
         testDir.toFilePath(),
         _logger,

tools/bots/test_matrix.json

@@ -1355,6 +1355,17 @@
           ],
           "fileset": "vm",
           "shards": 5
+        },
+        {
+          "name": "dynamic module tests",
+          "script": "out/DebugX64/dart",
+          "testRunner": true,
+          "arguments": [
+            "pkg/dynamic_modules/test/runner/main.dart",
+            "-nvm-dyn-${system}-${mode}-${arch}",
+            "-rjit",
+            "--verbose"
+          ]
         }
       ]
     },