Merged: [maglev] Hard limit on inlining depth

Set a hard max inlining depth that also counts for small functions.

(cherry picked from commit 9c6afe3)

Change-Id: I46ff324f84f959c62052d83686832e7ded68a860
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4912944
Auto-Submit: Olivier Flückiger <[email protected]>
Reviewed-by: Toon Verwaest <[email protected]>
Commit-Queue: Toon Verwaest <[email protected]>
Cr-Commit-Position: refs/branch-heads/11.9@{#2}
Cr-Branched-From: 3eb7d73-refs/heads/11.9.169@{#1}
Cr-Branched-From: 1a13bf9-refs/heads/main@{#90218}

src/flags/flag-definitions.h

@@ -546,12 +546,17 @@ DEFINE_UINT(
 DEFINE_BOOL(concurrent_maglev_high_priority_threads, false,
             "use high priority compiler threads for concurrent Maglev")
 
-DEFINE_INT(max_maglev_inline_depth, 1,
-           "max depth of functions that Maglev will inline")
+DEFINE_INT(
+    max_maglev_inline_depth, 1,
+    "max depth of functions that Maglev will inline excl. small functions")
+DEFINE_INT(
+    max_maglev_hard_inline_depth, 10,
+    "max depth of functions that Maglev will inline incl. small functions")
 DEFINE_INT(max_maglev_inlined_bytecode_size, 460,
            "maximum size of bytecode for a single inlining")
 DEFINE_INT(max_maglev_inlined_bytecode_size_cumulative, 920,
-           "maximum cumulative size of bytecode considered for inlining")
+           "maximum cumulative size of bytecode considered for inlining excl. "
+           "small functions")
 DEFINE_INT(max_maglev_inlined_bytecode_size_small, 27,
            "maximum size of bytecode considered for small function inlining")
 DEFINE_FLOAT(min_maglev_inlining_frequency, 0.10,

src/maglev/maglev-graph-builder.cc

@@ -5314,6 +5314,17 @@ bool MaglevGraphBuilder::ShouldInlineCall(
     TRACE_CANNOT_INLINE("it has not been compiled/run with feedback yet");
     return false;
   }
+  // TODO(olivf): This is a temporary stopgap to prevent infinite recursion when
+  // inlining, because we currently excempt small functions from some of the
+  // negative heuristics. We should refactor these heuristics and make sure they
+  // make sense in the presence of (mutually) recursive inlining. Please do
+  // *not* return true before this check.
+  if (inlining_depth() > v8_flags.max_maglev_hard_inline_depth) {
+    TRACE_CANNOT_INLINE("inlining depth ("
+                        << inlining_depth() << ") >= hard-max-depth ("
+                        << v8_flags.max_maglev_hard_inline_depth << ")");
+    return false;
+  }
   if (compilation_unit_->shared_function_info().equals(shared)) {
     TRACE_CANNOT_INLINE("direct recursion");
     return false;
@@ -5355,7 +5366,9 @@ bool MaglevGraphBuilder::ShouldInlineCall(
     return false;
   }
   if (bytecode.length() < v8_flags.max_maglev_inlined_bytecode_size_small) {
-    TRACE_INLINING("  inlining " << shared << ": small function");
+    TRACE_INLINING("  inlining "
+                   << shared
+                   << ": small function, skipping max-size and max-depth");
     return true;
   }
   if (bytecode.length() > v8_flags.max_maglev_inlined_bytecode_size) {

test/mjsunit/regress/regress-crbug-1487583.js

@@ -0,0 +1,22 @@
+// Copyright 2023 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --allow-natives-syntax
+
+// Triggers mutual inlining.
+function bar(x) {
+  foo([]);
+}
+function foo(arr) {
+  arr.forEach(bar);
+}
+
+foo([]);
+%PrepareFunctionForOptimization(foo);
+%PrepareFunctionForOptimization(bar);
+foo([]);
+bar([]);
+foo([]);
+%OptimizeFunctionOnNextCall(foo);
+foo([]);