Revert "[vm] AOT blobs snapshots are obsolete. Remove dead code."

This reverts commit bcc0900.

Reason for revert: This CL is breaking the Fuchsia Flutter build see https://github.com/flutter/engine/pull/16604/checks?check_run_id=445155807 

Original change's description:
> [vm] AOT blobs snapshots are obsolete. Remove dead code.
> 
> Change-Id: I35cf4befbe66b92197dcd659172f90be3de30f8e
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134840
> Commit-Queue: Samir Jindel <[email protected]>
> Reviewed-by: Ryan Macnak <[email protected]>

[email protected],[email protected]

Change-Id: I9dd32a71bf43907f59ed766b98bf453bab99ea3c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135881
Reviewed-by: Siva Annamalai <[email protected]>
Commit-Queue: Siva Annamalai <[email protected]>

Author: a-siva

pkg/smith/lib/configuration.dart

@@ -259,6 +259,7 @@ class Configuration {
         isMinified: boolOption("minified"),
         useAnalyzerCfe: boolOption("use-cfe"),
         useAnalyzerFastaParser: boolOption("analyzer-use-fasta-parser"),
+        useBlobs: boolOption("use-blobs"),
         useElf: boolOption("use-elf"),
         useHotReload: boolOption("hot-reload"),
         useHotReloadRollback: boolOption("hot-reload-rollback"),
@@ -329,6 +330,8 @@ class Configuration {
   final bool useAnalyzerCfe;
   final bool useAnalyzerFastaParser;
 
+  // TODO(rnystrom): What is this?
+  final bool useBlobs;
   final bool useElf;
 
   final bool useHotReload;
@@ -356,6 +359,7 @@ class Configuration {
       bool isMinified,
       bool useAnalyzerCfe,
       bool useAnalyzerFastaParser,
+      bool useBlobs,
       bool useElf,
       bool useHotReload,
       bool useHotReloadRollback,
@@ -377,6 +381,7 @@ class Configuration {
         isMinified = isMinified ?? false,
         useAnalyzerCfe = useAnalyzerCfe ?? false,
         useAnalyzerFastaParser = useAnalyzerFastaParser ?? false,
+        useBlobs = useBlobs ?? false,
         useElf = useElf ?? false,
         useHotReload = useHotReload ?? false,
         useHotReloadRollback = useHotReloadRollback ?? false,
@@ -407,6 +412,7 @@ class Configuration {
       isMinified == other.isMinified &&
       useAnalyzerCfe == other.useAnalyzerCfe &&
       useAnalyzerFastaParser == other.useAnalyzerFastaParser &&
+      useBlobs == other.useBlobs &&
       useElf == other.useElf &&
       useHotReload == other.useHotReload &&
       useHotReloadRollback == other.useHotReloadRollback &&
@@ -456,6 +462,7 @@ class Configuration {
         isMinified,
         useAnalyzerCfe,
         useAnalyzerFastaParser,
+        useBlobs,
         useElf,
         useHotReload,
         useHotReloadRollback,
@@ -496,6 +503,7 @@ class Configuration {
     if (isMinified) fields.add("minified");
     if (useAnalyzerCfe) fields.add("use-cfe");
     if (useAnalyzerFastaParser) fields.add("analyzer-use-fasta-parser");
+    if (useBlobs) fields.add("use-blobs");
     if (useHotReload) fields.add("hot-reload");
     if (useHotReloadRollback) fields.add("hot-reload-rollback");
     if (useSdk) fields.add("use-sdk");
@@ -553,6 +561,7 @@ class Configuration {
     boolField("use-cfe", useAnalyzerCfe, other.useAnalyzerCfe);
     boolField("analyzer-use-fasta-parser", useAnalyzerFastaParser,
         other.useAnalyzerFastaParser);
+    boolField("use-blobs", useBlobs, other.useBlobs);
     boolField("host-checked", isHostChecked, other.isHostChecked);
     boolField("hot-reload", useHotReload, other.useHotReload);
     boolField("hot-reload-rollback", useHotReloadRollback,

pkg/smith/test/configuration_test.dart

@@ -382,6 +382,7 @@ void main() {
         isMinified: true,
         useAnalyzerCfe: true,
         useAnalyzerFastaParser: true,
+        useBlobs: true,
         useElf: true,
         useHotReload: true,
         useHotReloadRollback: true,
@@ -411,6 +412,7 @@ architecture: ia32 x64
    minified: false true
    use-cfe: false true
    analyzer-use-fasta-parser: false true
+   use-blobs: false true
    host-checked: false true
    hot-reload: false true
    hot-reload-rollback: false true

pkg/test_runner/lib/src/command.dart

@@ -547,6 +547,7 @@ class AdbPrecompilationCommand extends Command implements AdbCommand {
   final String processTestFilename;
   final String precompiledTestDirectory;
   final List<String> arguments;
+  final bool useBlobs;
   final bool useElf;
   final List<String> extraLibraries;
 
@@ -555,6 +556,7 @@ class AdbPrecompilationCommand extends Command implements AdbCommand {
       this.processTestFilename,
       this.precompiledTestDirectory,
       this.arguments,
+      this.useBlobs,
       this.useElf,
       this.extraLibraries,
       {int index = 0})
@@ -565,6 +567,7 @@ class AdbPrecompilationCommand extends Command implements AdbCommand {
       processTestFilename,
       precompiledTestDirectory,
       arguments,
+      useBlobs,
       useElf,
       extraLibraries,
       index: index);
@@ -579,13 +582,15 @@ class AdbPrecompilationCommand extends Command implements AdbCommand {
     builder.add(buildPath);
     builder.add(precompiledTestDirectory);
     builder.add(arguments);
+    builder.add(useBlobs);
     builder.add(useElf);
     extraLibraries.forEach(builder.add);
   }
 
   bool _equal(AdbPrecompilationCommand other) =>
       super._equal(other) &&
       buildPath == other.buildPath &&
+      useBlobs == other.useBlobs &&
       useElf == other.useElf &&
       arguments == other.arguments &&
       precompiledTestDirectory == other.precompiledTestDirectory &&

pkg/test_runner/lib/src/compiler_configuration.dart

@@ -626,7 +626,7 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
           tempDir, arguments, environmentOverrides));
     }
 
-    if (!_configuration.useElf) {
+    if (!_configuration.useBlobs && !_configuration.useElf) {
       commands.add(
           computeAssembleCommand(tempDir, arguments, environmentOverrides));
       if (!_configuration.keepGeneratedFiles) {
@@ -698,7 +698,10 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
     }
 
     var args = [
-      if (_configuration.useElf) ...[
+      if (_configuration.useBlobs) ...[
+        "--snapshot-kind=app-aot-blobs",
+        "--blobs_container_filename=$tempDir/out.aotsnapshot"
+      ] else if (_configuration.useElf) ...[
         "--snapshot-kind=app-aot-elf",
         "--elf=$tempDir/out.aotsnapshot"
       ] else ...[

pkg/test_runner/lib/src/configuration.dart

@@ -115,6 +115,7 @@ class TestConfiguration {
   bool get isMinified => configuration.isMinified;
   bool get useAnalyzerCfe => configuration.useAnalyzerCfe;
   bool get useAnalyzerFastaParser => configuration.useAnalyzerFastaParser;
+  bool get useBlobs => configuration.useBlobs;
   bool get useElf => configuration.useElf;
   bool get useSdk => configuration.useSdk;
   bool get enableAsserts => configuration.enableAsserts;

pkg/test_runner/lib/src/options.dart

@@ -816,6 +816,7 @@ compiler.''',
                   useAnalyzerCfe: data["use_cfe"] as bool,
                   useAnalyzerFastaParser:
                       data["analyzer_use_fasta_parser"] as bool,
+                  useBlobs: data["use_blobs"] as bool,
                   useElf: data["use_elf"] as bool,
                   useSdk: data["use_sdk"] as bool,
                   useHotReload: data["hot_reload"] as bool,

pkg/test_runner/lib/src/runtime_configuration.dart

@@ -48,10 +48,12 @@ abstract class RuntimeConfiguration {
       case Runtime.dartPrecompiled:
         if (configuration.system == System.android) {
           return DartPrecompiledAdbRuntimeConfiguration(
+            useBlobs: configuration.useBlobs,
             useElf: configuration.useElf,
           );
         } else {
           return DartPrecompiledRuntimeConfiguration(
+            useBlobs: configuration.useBlobs,
             useElf: configuration.useElf,
           );
         }
@@ -280,8 +282,11 @@ class StandaloneDartRuntimeConfiguration extends DartVmRuntimeConfiguration {
 }
 
 class DartPrecompiledRuntimeConfiguration extends DartVmRuntimeConfiguration {
+  final bool useBlobs;
   final bool useElf;
-  DartPrecompiledRuntimeConfiguration({bool useElf}) : useElf = useElf;
+  DartPrecompiledRuntimeConfiguration({bool useBlobs, bool useElf})
+      : useBlobs = useBlobs,
+        useElf = useElf;
 
   List<Command> computeRuntimeCommands(
       CommandArtifact artifact,
@@ -335,8 +340,11 @@ class DartPrecompiledAdbRuntimeConfiguration
   static const deviceDir = '/data/local/tmp/precompilation-testing';
   static const deviceTestDir = '/data/local/tmp/precompilation-testing/test';
 
+  final bool useBlobs;
   final bool useElf;
-  DartPrecompiledAdbRuntimeConfiguration({bool useElf}) : useElf = useElf;
+  DartPrecompiledAdbRuntimeConfiguration({bool useBlobs, bool useElf})
+      : useBlobs = useBlobs,
+        useElf = useElf;
 
   List<Command> computeRuntimeCommands(
       CommandArtifact artifact,
@@ -353,7 +361,7 @@ class DartPrecompiledAdbRuntimeConfiguration
     var processTest = processTestBinaryFileName;
     return [
       AdbPrecompilationCommand(
-          buildDir, processTest, script, arguments, useElf, extraLibs)
+          buildDir, processTest, script, arguments, useBlobs, useElf, extraLibs)
     ];
   }
 }

runtime/bin/gen_snapshot.cc

@@ -81,6 +81,7 @@ enum SnapshotKind {
   kCoreJIT,
   kApp,
   kAppJIT,
+  kAppAOTBlobs,
   kAppAOTAssembly,
   kAppAOTElf,
   kVMAOTAssembly,
@@ -94,6 +95,7 @@ static const char* kSnapshotKindNames[] = {
     "core-jit",
     "app",
     "app-jit",
+    "app-aot-blobs",
     "app-aot-assembly",
     "app-aot-elf",
     "vm-aot-assembly",
@@ -144,7 +146,8 @@ DEFINE_ENUM_OPTION(snapshot_kind, SnapshotKind, snapshot_kind);
 DEFINE_CB_OPTION(ProcessEnvironmentOption);
 
 static bool IsSnapshottingForPrecompilation() {
-  return (snapshot_kind == kAppAOTAssembly) || (snapshot_kind == kAppAOTElf) ||
+  return (snapshot_kind == kAppAOTBlobs) ||
+         (snapshot_kind == kAppAOTAssembly) || (snapshot_kind == kAppAOTElf) ||
          (snapshot_kind == kVMAOTAssembly);
 }
 
@@ -283,6 +286,34 @@ static int ParseArguments(int argc,
       }
       break;
     }
+    case kAppAOTBlobs: {
+      if ((blobs_container_filename == NULL) &&
+          ((vm_snapshot_data_filename == NULL) ||
+           (vm_snapshot_instructions_filename == NULL) ||
+           (isolate_snapshot_data_filename == NULL) ||
+           (isolate_snapshot_instructions_filename == NULL))) {
+        Syslog::PrintErr(
+            "Building an AOT snapshot as blobs requires specifying output "
+            "file for --blobs_container_filename or "
+            "files for --vm_snapshot_data, --vm_snapshot_instructions, "
+            "--isolate_snapshot_data and --isolate_snapshot_instructions.\n\n");
+        return -1;
+      }
+      if ((blobs_container_filename != NULL) &&
+          ((vm_snapshot_data_filename != NULL) ||
+           (vm_snapshot_instructions_filename != NULL) ||
+           (isolate_snapshot_data_filename != NULL) ||
+           (isolate_snapshot_instructions_filename != NULL))) {
+        Syslog::PrintErr(
+            "Building an AOT snapshot as blobs requires specifying output "
+            "file for --blobs_container_filename or "
+            "files for --vm_snapshot_data, --vm_snapshot_instructions, "
+            "--isolate_snapshot_data and --isolate_snapshot_instructions"
+            " not both.\n\n");
+        return -1;
+      }
+      break;
+    }
     case kAppAOTElf: {
       if (elf_filename == NULL) {
         Syslog::PrintErr(
@@ -638,6 +669,54 @@ static void CreateAndWritePrecompiledSnapshot() {
           "         To avoid this, use --strip to remove it and "
           "--save-debugging-info=<...> to save it to a separate file.\n");
     }
+  } else if (snapshot_kind == kAppAOTBlobs) {
+    Syslog::PrintErr(
+        "WARNING: app-aot-blobs snapshots have been deprecated and support for "
+        "generating them will be removed soon. Please use the app-aot-elf or "
+        "app-aot-assembly snapshot kinds in conjunction with the portable ELF "
+        "loader from //runtime/bin:elf_loader if necessary. See "
+        "http://dartbug.com/38764 for more details.\n");
+
+    uint8_t* vm_snapshot_data_buffer = NULL;
+    intptr_t vm_snapshot_data_size = 0;
+    uint8_t* vm_snapshot_instructions_buffer = NULL;
+    intptr_t vm_snapshot_instructions_size = 0;
+    uint8_t* isolate_snapshot_data_buffer = NULL;
+    intptr_t isolate_snapshot_data_size = 0;
+    uint8_t* isolate_snapshot_instructions_buffer = NULL;
+    intptr_t isolate_snapshot_instructions_size = 0;
+    File* debug_file = nullptr;
+    if (debugging_info_filename != nullptr) {
+      debug_file = OpenFile(debugging_info_filename);
+    }
+    result = Dart_CreateAppAOTSnapshotAsBlobs(
+        &vm_snapshot_data_buffer, &vm_snapshot_data_size,
+        &vm_snapshot_instructions_buffer, &vm_snapshot_instructions_size,
+        &isolate_snapshot_data_buffer, &isolate_snapshot_data_size,
+        &isolate_snapshot_instructions_buffer,
+        &isolate_snapshot_instructions_size, StreamingWriteCallback,
+        debug_file);
+    if (debug_file != nullptr) debug_file->Release();
+    CHECK_RESULT(result);
+
+    if (blobs_container_filename != NULL) {
+      Snapshot::WriteAppSnapshot(
+          blobs_container_filename, vm_snapshot_data_buffer,
+          vm_snapshot_data_size, vm_snapshot_instructions_buffer,
+          vm_snapshot_instructions_size, isolate_snapshot_data_buffer,
+          isolate_snapshot_data_size, isolate_snapshot_instructions_buffer,
+          isolate_snapshot_instructions_size);
+    } else {
+      WriteFile(vm_snapshot_data_filename, vm_snapshot_data_buffer,
+                vm_snapshot_data_size);
+      WriteFile(vm_snapshot_instructions_filename,
+                vm_snapshot_instructions_buffer, vm_snapshot_instructions_size);
+      WriteFile(isolate_snapshot_data_filename, isolate_snapshot_data_buffer,
+                isolate_snapshot_data_size);
+      WriteFile(isolate_snapshot_instructions_filename,
+                isolate_snapshot_instructions_buffer,
+                isolate_snapshot_instructions_size);
+    }
   } else {
     UNREACHABLE();
   }
@@ -747,6 +826,7 @@ static int CreateIsolateAndSnapshot(const CommandLineOptions& inputs) {
       CreateAndWriteAppJITSnapshot();
       break;
     case kAppAOTAssembly:
+    case kAppAOTBlobs:
     case kAppAOTElf:
       CreateAndWritePrecompiledSnapshot();
       break;

runtime/bin/snapshot_utils.cc

@@ -509,6 +509,29 @@ void Snapshot::GenerateAppJIT(const char* snapshot_filename) {
 #endif
 }
 
+void Snapshot::GenerateAppAOTAsBlobs(const char* snapshot_filename) {
+  uint8_t* vm_data_buffer = NULL;
+  intptr_t vm_data_size = 0;
+  uint8_t* vm_instructions_buffer = NULL;
+  intptr_t vm_instructions_size = 0;
+  uint8_t* isolate_data_buffer = NULL;
+  intptr_t isolate_data_size = 0;
+  uint8_t* isolate_instructions_buffer = NULL;
+  intptr_t isolate_instructions_size = 0;
+  Dart_Handle result = Dart_CreateAppAOTSnapshotAsBlobs(
+      &vm_data_buffer, &vm_data_size, &vm_instructions_buffer,
+      &vm_instructions_size, &isolate_data_buffer, &isolate_data_size,
+      &isolate_instructions_buffer, &isolate_instructions_size,
+      /*callback=*/nullptr, /*debug_callback_info=*/nullptr);
+  if (Dart_IsError(result)) {
+    ErrorExit(kErrorExitCode, "%s\n", Dart_GetError(result));
+  }
+  WriteAppSnapshot(snapshot_filename, vm_data_buffer, vm_data_size,
+                   vm_instructions_buffer, vm_instructions_size,
+                   isolate_data_buffer, isolate_data_size,
+                   isolate_instructions_buffer, isolate_instructions_size);
+}
+
 static void StreamingWriteCallback(void* callback_data,
                                    const uint8_t* buffer,
                                    intptr_t size) {

runtime/bin/snapshot_utils.h

@@ -32,6 +32,7 @@ class Snapshot {
                              const char* script_name,
                              const char* package_config);
   static void GenerateAppJIT(const char* snapshot_filename);
+  static void GenerateAppAOTAsBlobs(const char* snapshot_filename);
   static void GenerateAppAOTAsAssembly(const char* snapshot_filename);
 
   static AppSnapshot* TryReadAppendedAppSnapshotElf(const char* container_path);

runtime/include/dart_api.h

@@ -3480,6 +3480,31 @@ DART_EXPORT DART_WARN_UNUSED_RESULT Dart_Handle
 Dart_CreateVMAOTSnapshotAsAssembly(Dart_StreamingWriteCallback callback,
                                    void* callback_data);
 
+/**
+ *  Same as Dart_CreateAppAOTSnapshotAsAssembly, except all the pieces are
+ *  provided directly as bytes that the embedder can load with mmap. The
+ *  instructions pieces must be loaded with read and execute permissions; the
+ *  other pieces may be loaded as read-only.
+ *
+ *  This function has been DEPRECATED. Please use Dart_CreateAppAOTSnapshotAsELF
+ *  or Dart_CreateAppAOTSnapshotAsAssembly instead. A portable ELF loader is
+ *  available in the target //runtime/bin:elf_loader.
+ *
+ *  If callback and debug_callback_data are provided, debug_callback_data will
+ *  be used with the callback to provide separate debugging information.
+ */
+DART_EXPORT DART_WARN_UNUSED_RESULT Dart_Handle
+Dart_CreateAppAOTSnapshotAsBlobs(uint8_t** vm_snapshot_data_buffer,
+                                 intptr_t* vm_snapshot_data_size,
+                                 uint8_t** vm_snapshot_instructions_buffer,
+                                 intptr_t* vm_snapshot_instructions_size,
+                                 uint8_t** isolate_snapshot_data_buffer,
+                                 intptr_t* isolate_snapshot_data_size,
+                                 uint8_t** isolate_snapshot_instructions_buffer,
+                                 intptr_t* isolate_snapshot_instructions_size,
+                                 Dart_StreamingWriteCallback callback,
+                                 void* debug_callback_data);
+
 /**
  * Sorts the class-ids in depth first traversal order of the inheritance
  * tree. This is a costly operation, but it can make method dispatch