Merge pull request #21001 from mpirvu/inline-fanin-fix

Adjust inliner use of profiled fanin data
eclipse-openj9 · Jan 27, 2025 · 24f5138 · 24f5138
2 parents 7cf1352 + c58b321
commit 24f5138
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/runtime/compiler/optimizer/InlinerTempForJ9.cpp b/runtime/compiler/optimizer/InlinerTempForJ9.cpp
@@ -4722,13 +4722,22 @@ bool TR_MultipleCallTargetInliner::isLargeCompiledMethod(TR_ResolvedMethod *call
                   veryLargeCompiledMethodFaninThreshold = 0;
                   }
                }
-
-            uint32_t numCallers = 0, totalWeight = 0;
-            ((TR_ResolvedJ9Method *) calleeResolvedMethod)->getFaninInfo(&numCallers, &totalWeight);
-            if ((numCallers > veryLargeCompiledMethodFaninThreshold) &&
-                (bytecodeSize > veryLargeCompiledMethodThreshold))
+            // Prevent inlining of "large" methods with "many" callers
+            if (bytecodeSize > veryLargeCompiledMethodThreshold)
                {
-               return true;
+               uint32_t numCallers = 0, totalWeight = 0;
+               if (!comp()->getOption(TR_DisableInlinerFanIn))
+                  ((TR_ResolvedJ9Method *) calleeResolvedMethod)->getFaninInfo(&numCallers, &totalWeight);
+               if (numCallers == 0) // no fanin info
+                  {
+                  // If there is no fanin info, prevent inlining just based on method size
+                  return true;
+                  }
+               else
+                  {
+                  if (numCallers > veryLargeCompiledMethodFaninThreshold)
+                     return true;
+                  }
                }
             }
          }