[vm,test_runner] Run vm/* tests against interpreter

Introduce Dart_LoadLibraryFromBytecode to support loading unit test
libraries from bytecode.

TEST=ci

Change-Id: I7706fdb2acaf906f01f27f671e7193b9755efe0f
Cq-Include-Trybots: luci.dart.try:vm-aot-dyn-linux-debug-x64-try,vm-aot-dyn-linux-product-x64-try,vm-dyn-linux-debug-x64-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439080
Reviewed-by: Slava Egorov <[email protected]>
Commit-Queue: Alexander Markov <[email protected]>

Author: alexmarkov

pkg/test_runner/lib/src/compiler_configuration.dart

@@ -1575,9 +1575,14 @@ class FastaCompilerConfiguration extends CompilerConfiguration {
 class BytecodeCompilerConfiguration extends CompilerConfiguration {
   BytecodeCompilerConfiguration(super.configuration) : super._subclass();
 
+  bool get _isAot => _configuration.runtime == Runtime.dartPrecompiled;
+
   @override
   String computeCompilerPath() => dartAotRuntime();
 
+  @override
+  bool get hasCompiler => _isAot;
+
   @override
   bool get runRuntimeDespiteMissingCompileTimeError => true;
 
@@ -1658,18 +1663,16 @@ class BytecodeCompilerConfiguration extends CompilerConfiguration {
       List<String> vmOptions,
       List<String> originalArguments,
       CommandArtifact? artifact) {
-    var filename = artifact!.filename;
-
     return [
       if (_enableAsserts) '--enable_asserts',
       ...vmOptions,
       ...testFile.sharedOptions,
       ..._configuration.sharedOptions,
       ..._experimentsArgument(_configuration, testFile),
-      if (_configuration.runtime == Runtime.dartPrecompiled) ...[
+      if (_isAot) ...[
         ..._replaceDartFiles(originalArguments,
             '${_configuration.buildDirectory}/dynamic_module_runner.snapshot'),
-        filename,
+        artifact!.filename,
       ] else ...[
         '--interpreter',
         ...originalArguments,

pkg/test_runner/lib/src/test_configurations.dart

@@ -138,7 +138,8 @@ Future testConfigurations(List<TestConfiguration> configurations) async {
       for (var key in configuration.selectors.keys) {
         if (key == 'co19') {
           testSuites.add(Co19TestSuite(configuration, key));
-        } else if (configuration.compiler == Compiler.dartk &&
+        } else if ((configuration.compiler == Compiler.dartk ||
+                configuration.compiler == Compiler.dart2bytecode) &&
             configuration.runtime == Runtime.vm &&
             key == 'vm') {
           // vm tests contain both cc tests (added here) and dart tests (added

pkg/test_runner/lib/src/test_suite.dart

@@ -72,9 +72,8 @@ abstract class TestSuite {
             'FIREFOX_PATH':
                 Uri.base.resolve(configuration.firefoxPath!).toFilePath(),
           if (configuration.useQemu)
-            'QEMU_LD_PREFIX':
-                QemuConfig.all[configuration.architecture]!
-                .elfInterpreterPrefix,
+            'QEMU_LD_PREFIX': QemuConfig
+                .all[configuration.architecture]!.elfInterpreterPrefix,
         };
 
   Map<String, String> get environmentOverrides => _environmentOverrides;
@@ -353,6 +352,7 @@ class VMTestSuite extends TestSuite {
       if (expectations.contains(Expectation.crash)) '--suppress-core-dump',
       if (experiments.isNotEmpty)
         '--enable-experiment=${experiments.join(",")}',
+      if (configuration.compiler == Compiler.dart2bytecode) '--interpreter',
       ...configuration.standardOptions,
       ...configuration.vmOptions,
       test.name

runtime/bin/dart_api_win.c

@@ -376,6 +376,7 @@ typedef Dart_Handle (*Dart_LookupLibraryType)(Dart_Handle);
 typedef Dart_Handle (*Dart_LibraryHandleErrorType)(Dart_Handle, Dart_Handle);
 typedef Dart_Handle (*Dart_LoadLibraryFromKernelType)(const uint8_t*, intptr_t);
 typedef Dart_Handle (*Dart_LoadLibraryType)(Dart_Handle);
+typedef Dart_Handle (*Dart_LoadLibraryFromBytecodeType)(Dart_Handle);
 typedef Dart_Handle (*Dart_FinalizeLoadingType)(bool);
 typedef Dart_Handle (*Dart_GetPeerType)(Dart_Handle, void**);
 typedef Dart_Handle (*Dart_SetPeerType)(Dart_Handle, void*);
@@ -714,6 +715,7 @@ static Dart_LookupLibraryType Dart_LookupLibraryFn = NULL;
 static Dart_LibraryHandleErrorType Dart_LibraryHandleErrorFn = NULL;
 static Dart_LoadLibraryFromKernelType Dart_LoadLibraryFromKernelFn = NULL;
 static Dart_LoadLibraryType Dart_LoadLibraryFn = NULL;
+static Dart_LoadLibraryFromBytecodeType Dart_LoadLibraryFromBytecodeFn = NULL;
 static Dart_FinalizeLoadingType Dart_FinalizeLoadingFn = NULL;
 static Dart_GetPeerType Dart_GetPeerFn = NULL;
 static Dart_SetPeerType Dart_SetPeerFn = NULL;
@@ -1270,6 +1272,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
             process, "Dart_LoadLibraryFromKernel");
     Dart_LoadLibraryFn =
         (Dart_LoadLibraryType)GetProcAddress(process, "Dart_LoadLibrary");
+    Dart_LoadLibraryFromBytecodeFn =
+        (Dart_LoadLibraryFromBytecodeType)GetProcAddress(
+            process, "Dart_LoadLibraryFromBytecode");
     Dart_FinalizeLoadingFn = (Dart_FinalizeLoadingType)GetProcAddress(
         process, "Dart_FinalizeLoading");
     Dart_GetPeerFn = (Dart_GetPeerType)GetProcAddress(process, "Dart_GetPeer");
@@ -2469,6 +2474,10 @@ Dart_Handle Dart_LoadLibrary(Dart_Handle kernel_buffer) {
   return Dart_LoadLibraryFn(kernel_buffer);
 }
 
+Dart_Handle Dart_LoadLibraryFromBytecode(Dart_Handle bytecode_buffer) {
+  return Dart_LoadLibraryFromBytecodeFn(bytecode_buffer);
+}
+
 Dart_Handle Dart_FinalizeLoading(bool complete_futures) {
   return Dart_FinalizeLoadingFn(complete_futures);
 }

runtime/include/dart_api.h

@@ -3746,6 +3746,17 @@ Dart_LoadLibraryFromKernel(const uint8_t* kernel_buffer,
 DART_EXPORT DART_API_WARN_UNUSED_RESULT Dart_Handle
 Dart_LoadLibrary(Dart_Handle kernel_buffer);
 
+/**
+ * Called by the embedder to load a partial program. Does not set the root
+ * library.
+ *
+ * \param bytecode_buffer An external typed data containing bytecode binary.
+ *
+ * \return A handle to the main library of the compilation unit, or an error.
+ */
+DART_EXPORT DART_API_WARN_UNUSED_RESULT Dart_Handle
+Dart_LoadLibraryFromBytecode(Dart_Handle bytecode_buffer);
+
 /**
  * Indicates that all outstanding load requests have been satisfied.
  * This finalizes all the new classes loaded and optionally completes

runtime/tests/vm/dart/exported_symbols_test.dart

@@ -231,6 +231,7 @@ main() {
     "Dart_ListSetAt",
     "Dart_LoadingUnitLibraryUris",
     "Dart_LoadLibrary",
+    "Dart_LoadLibraryFromBytecode",
     "Dart_LoadLibraryFromKernel",
     "Dart_LoadScriptFromBytecode",
     "Dart_LoadScriptFromKernel",

runtime/vm/dart_api_impl.cc

@@ -5845,6 +5845,29 @@ DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle kernel_buffer) {
 #endif  // defined(DART_PRECOMPILED_RUNTIME)
 }
 
+DART_EXPORT Dart_Handle
+Dart_LoadLibraryFromBytecode(Dart_Handle bytecode_buffer) {
+#if defined(DART_DYNAMIC_MODULES)
+  DARTSCOPE(Thread::Current());
+  const ExternalTypedData& td =
+      Api::UnwrapExternalTypedDataHandle(Z, bytecode_buffer);
+  if (td.IsNull()) {
+    RETURN_TYPE_ERROR(Z, bytecode_buffer, ExternalTypedData);
+  }
+  SafepointWriteRwLocker ml(T, T->isolate_group()->program_lock());
+  bytecode::BytecodeLoader loader(T, td);
+  const Function& function = Function::Handle(loader.LoadBytecode());
+  if (function.IsNull()) {
+    return Api::Null();
+  }
+  return Api::NewHandle(T, Class::Handle(function.Owner()).library());
+#else
+  return Api::NewError(
+      "%s: Cannot load bytecode as dynamic modules are disabled.",
+      CURRENT_FUNC);
+#endif  // defined(DART_DYNAMIC_MODULES)
+}
+
 // Finalizes classes and invokes Dart core library function that completes
 // futures of loadLibrary calls (deferred library loading).
 DART_EXPORT Dart_Handle Dart_FinalizeLoading(bool complete_futures) {

runtime/vm/unit_test.cc

@@ -456,7 +456,9 @@ Dart_Handle TestCase::LoadTestLibrary(const char* lib_uri,
       kernel_buffer_size, const_cast<uint8_t*>(kernel_buffer),
       kernel_buffer_size, MallocFinalizer);
   EXPECT_VALID(td);
-  Dart_Handle lib = Dart_LoadLibrary(td);
+  Dart_Handle lib = Dart_IsBytecode(kernel_buffer, kernel_buffer_size)
+                        ? Dart_LoadLibraryFromBytecode(td)
+                        : Dart_LoadLibrary(td);
   EXPECT_VALID(lib);
 
   // TODO(32618): Kernel doesn't correctly represent the root library.
@@ -495,7 +497,9 @@ Dart_Handle TestCase::LoadTestScriptWithDFE(int sourcefiles_count,
       kernel_buffer_size, const_cast<uint8_t*>(kernel_buffer),
       kernel_buffer_size, MallocFinalizer);
   EXPECT_VALID(td);
-  Dart_Handle lib = Dart_LoadLibrary(td);
+  Dart_Handle lib = Dart_IsBytecode(kernel_buffer, kernel_buffer_size)
+                        ? Dart_LoadLibraryFromBytecode(td)
+                        : Dart_LoadLibrary(td);
   EXPECT_VALID(lib);
 
   // BOGUS: Kernel doesn't correctly represent the root library.

tools/bots/test_matrix.json

@@ -1324,6 +1324,7 @@
             "-nvm-dyn-${system}-${mode}-${arch}",
             "corelib",
             "language",
+            "vm",
             "pkg/vm_service/"
           ],
           "fileset": "vm",