[vm/ffi] Refactor and fix pipeline for force-optimized code.

Change-Id: I18429fcfe44065c73674c9a00977e222e5abb5de
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114513
Reviewed-by: Martin Kustermann <[email protected]>
Commit-Queue: Samir Jindel <[email protected]>

Author: sjindel-google

runtime/vm/compiler/aot/precompiler.cc

@@ -2285,7 +2285,12 @@ bool PrecompileParsedFunctionHelper::Compile(CompilationPipeline* pipeline) {
       pass_state.reorder_blocks =
           FlowGraph::ShouldReorderBlocks(function, optimized());
 
-      if (optimized()) {
+      if (function.ForceOptimize()) {
+        ASSERT(optimized());
+        TIMELINE_DURATION(thread(), CompilerVerbose, "OptimizationPasses");
+        flow_graph = CompilerPass::RunForceOptimizedPipeline(CompilerPass::kAOT,
+                                                             &pass_state);
+      } else if (optimized()) {
         TIMELINE_DURATION(thread(), CompilerVerbose, "OptimizationPasses");
 
         pass_state.inline_id_to_function.Add(&function);

runtime/vm/compiler/compiler_pass.cc

@@ -236,42 +236,43 @@ void CompilerPass::RunInliningPipeline(PipelineMode mode,
   INVOKE_PASS(TryOptimizePatterns);
 }
 
-FlowGraph* CompilerPass::RunPipeline(PipelineMode mode,
-                                     CompilerPassState* pass_state) {
-  if (mode == kForced) {
-    INVOKE_PASS(ComputeSSA);
-    if (FLAG_early_round_trip_serialization) {
-      INVOKE_PASS(RoundTripSerialization);
-    }
-    INVOKE_PASS(TypePropagation);
-    INVOKE_PASS(ApplyClassIds);
-    INVOKE_PASS(Canonicalize);
-    INVOKE_PASS(BranchSimplify);
-    INVOKE_PASS(IfConvert);
-    INVOKE_PASS(ConstantPropagation);
-    INVOKE_PASS(TypePropagation);
-    INVOKE_PASS(WidenSmiToInt32);
-    INVOKE_PASS(SelectRepresentations);
-    INVOKE_PASS(TypePropagation);
-    INVOKE_PASS(TryCatchOptimization);
-    INVOKE_PASS(EliminateEnvironments);
-    INVOKE_PASS(EliminateDeadPhis);
-    INVOKE_PASS(Canonicalize);
-    INVOKE_PASS(WriteBarrierElimination);
-    INVOKE_PASS(FinalizeGraph);
+FlowGraph* CompilerPass::RunForceOptimizedPipeline(
+    PipelineMode mode,
+    CompilerPassState* pass_state) {
+  INVOKE_PASS(ComputeSSA);
+  if (FLAG_early_round_trip_serialization) {
+    INVOKE_PASS(RoundTripSerialization);
+  }
+  INVOKE_PASS(TypePropagation);
+  INVOKE_PASS(Canonicalize);
+  INVOKE_PASS(BranchSimplify);
+  INVOKE_PASS(IfConvert);
+  INVOKE_PASS(ConstantPropagation);
+  INVOKE_PASS(TypePropagation);
+  INVOKE_PASS(WidenSmiToInt32);
+  INVOKE_PASS(SelectRepresentations);
+  INVOKE_PASS(TypePropagation);
+  INVOKE_PASS(TryCatchOptimization);
+  INVOKE_PASS(EliminateEnvironments);
+  INVOKE_PASS(EliminateDeadPhis);
+  INVOKE_PASS(Canonicalize);
+  INVOKE_PASS(WriteBarrierElimination);
+  INVOKE_PASS(FinalizeGraph);
 #if defined(DART_PRECOMPILER)
-    if (mode == kAOT) {
-      INVOKE_PASS(SerializeGraph);
-    }
+  if (mode == kAOT) {
+    INVOKE_PASS(SerializeGraph);
+  }
 #endif
-    if (FLAG_late_round_trip_serialization) {
-      INVOKE_PASS(RoundTripSerialization);
-    }
-    INVOKE_PASS(AllocateRegisters);
-    INVOKE_PASS(ReorderBlocks);
-    return pass_state->flow_graph;
+  if (FLAG_late_round_trip_serialization) {
+    INVOKE_PASS(RoundTripSerialization);
   }
+  INVOKE_PASS(AllocateRegisters);
+  INVOKE_PASS(ReorderBlocks);
+  return pass_state->flow_graph;
+}
 
+FlowGraph* CompilerPass::RunPipeline(PipelineMode mode,
+                                     CompilerPassState* pass_state) {
   INVOKE_PASS(ComputeSSA);
   if (FLAG_early_round_trip_serialization) {
     INVOKE_PASS(RoundTripSerialization);

runtime/vm/compiler/compiler_pass.h

@@ -141,11 +141,7 @@ class CompilerPass {
 
   static void ParseFilters(const char* filter);
 
-  enum PipelineMode {
-    kJIT,    // Includes speculative and inter-procedural optimizations.
-    kAOT,    // Includes inter-procedural optimizations.
-    kForced  // Does not include speculative or inter-procedural optimizations.
-  };
+  enum PipelineMode { kJIT, kAOT };
 
   static void RunGraphIntrinsicPipeline(CompilerPassState* state);
 
@@ -165,6 +161,13 @@ class CompilerPass {
       CompilerPassState* state,
       std::initializer_list<CompilerPass::Id> passes);
 
+  // Pipeline which is used for "force-optimized" functions.
+  //
+  // Must not include speculative or inter-procedural optimizations.
+  DART_WARN_UNUSED_RESULT
+  static FlowGraph* RunForceOptimizedPipeline(PipelineMode mode,
+                                              CompilerPassState* state);
+
  protected:
   // This function executes the pass. If it returns true then
   // we will run Canonicalize on the graph and execute the pass

runtime/vm/compiler/jit/compiler.cc

@@ -616,7 +616,12 @@ RawCode* CompileParsedFunctionHelper::Compile(CompilationPipeline* pipeline) {
       CompilerPassState pass_state(thread(), flow_graph, &speculative_policy);
       pass_state.reorder_blocks = reorder_blocks;
 
-      if (optimized()) {
+      if (function.ForceOptimize()) {
+        ASSERT(optimized());
+        TIMELINE_DURATION(thread(), CompilerVerbose, "OptimizationPasses");
+        flow_graph = CompilerPass::RunForceOptimizedPipeline(CompilerPass::kJIT,
+                                                             &pass_state);
+      } else if (optimized()) {
         TIMELINE_DURATION(thread(), CompilerVerbose, "OptimizationPasses");
 
         pass_state.inline_id_to_function.Add(&function);