Merge pull request #12162 from liqunl/adoptOpenjdkMH/inliner

LambdaForm methods inlining
eclipse-openj9 · Apr 20, 2021 · 21998f1 · 21998f1
2 parents 95d423b + 399bf2d
commit 21998f1
Show file tree

Hide file tree

Showing 5 changed files with 1,093 additions and 249 deletions.
diff --git a/runtime/compiler/optimizer/EstimateCodeSize.hpp b/runtime/compiler/optimizer/EstimateCodeSize.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2020 IBM Corp. and others
+ * Copyright (c) 2000, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -93,6 +93,7 @@ class TR_EstimateCodeSize
 
    TR::Compilation *comp()              { return _inliner->comp(); }
    TR_InlinerTracer *tracer()          { return _tracer; }
+   TR_InlinerBase* getInliner()        { return _inliner; }
 
    protected:
 

diff --git a/runtime/compiler/optimizer/InlinerTempForJ9.cpp b/runtime/compiler/optimizer/InlinerTempForJ9.cpp
@@ -436,7 +436,9 @@ static bool checkForRemainingInlineableJSR292(TR::Compilation *comp, TR::Resolve
                {
                TR_ResolvedMethod * resolvedMethod = node->getSymbolReference()->getSymbol()->getResolvedMethodSymbol()->getResolvedMethod();
                if (!node->isTheVirtualCallNodeForAGuardedInlinedCall() &&
-                  (resolvedMethod->convertToMethod()->isArchetypeSpecimen() ||
+                  (comp->fej9()->isLambdaFormGeneratedMethod(resolvedMethod) ||
+                   resolvedMethod->getRecognizedMethod() == TR::java_lang_invoke_MethodHandle_invokeBasic ||
+                   resolvedMethod->convertToMethod()->isArchetypeSpecimen() ||
                    resolvedMethod->getRecognizedMethod() == TR::java_lang_invoke_MethodHandle_invokeExact))
                   {
                   return true;
@@ -2374,6 +2376,9 @@ TR_J9InlinerPolicy::callMustBeInlined(TR_CallTarget *calltarget)
    if (method->convertToMethod()->isArchetypeSpecimen())
       return true;
 
+   if (comp()->fej9()->isLambdaFormGeneratedMethod(method))
+      return true;
+
    if (insideIntPipelineForEach(method, comp()))
       {
       if (comp()->trace(OMR::inlining))
@@ -3837,7 +3842,8 @@ void TR_MultipleCallTargetInliner::weighCallSite( TR_CallStack * callStack , TR_
 
       int32_t weightBeforeLookingForBenefits = weight;
 
-      if (calltarget->_calleeMethod->convertToMethod()->isArchetypeSpecimen() && calltarget->_calleeMethod->getMethodHandleLocation())
+      bool isLambdaFormGeneratedMethod = comp()->fej9()->isLambdaFormGeneratedMethod(calltarget->_calleeMethod);
+      if ((calltarget->_calleeMethod->convertToMethod()->isArchetypeSpecimen() && calltarget->_calleeMethod->getMethodHandleLocation()) || isLambdaFormGeneratedMethod)
          {
          static char *methodHandleThunkWeightFactorStr = feGetEnv("TR_methodHandleThunkWeightFactor");
          static int32_t methodHandleThunkWeightFactor = methodHandleThunkWeightFactorStr? atoi(methodHandleThunkWeightFactorStr) : 10;
@@ -4222,13 +4228,18 @@ TR_MultipleCallTargetInliner::exceedsSizeThreshold(TR_CallSite *callSite, int by
      // HACK: Get frequency from both sources, and use both.  You're
      // only cold if you're cold according to both.
 
+     bool isLambdaFormGeneratedMethod = comp()->fej9()->isLambdaFormGeneratedMethod(callerResolvedMethod);
+     // TODO: we should ignore frequency for thunk archetype, however, this require performance evaluation
+     bool frequencyIsInaccurate = isLambdaFormGeneratedMethod;
+
      frequency1 = comp()->convertNonDeterministicInput(comp()->fej9()->getIProfilerCallCount(bcInfo, comp()), MAX_BLOCK_COUNT + MAX_COLD_BLOCK_COUNT, randomGenerator(), 0);
      frequency2 = comp()->convertNonDeterministicInput(block->getFrequency(), MAX_BLOCK_COUNT + MAX_COLD_BLOCK_COUNT, randomGenerator(), 0);
      if (frequency1 > frequency2 && callerResolvedMethod->convertToMethod()->isArchetypeSpecimen())
         frequency2 = frequency1;
 
      if ((frequency1 <= 0) && ((0 <= frequency2) &&  (frequency2 <= MAX_COLD_BLOCK_COUNT)) &&
-        !alwaysWorthInlining(calleeResolvedMethod, callNode))
+        !alwaysWorthInlining(calleeResolvedMethod, callNode) &&
+        !frequencyIsInaccurate)
         {
         isCold = true;
         }
@@ -4238,6 +4249,7 @@ TR_MultipleCallTargetInliner::exceedsSizeThreshold(TR_CallSite *callSite, int by
      if (allowBiggerMethods() &&
          !comp()->getMethodSymbol()->doJSR292PerfTweaks() &&
          calleeResolvedMethod &&
+         !frequencyIsInaccurate &&
          !j9InlinerPolicy->isInlineableJNI(calleeResolvedMethod, callNode))
         {
         bytecodeSize = scaleSizeBasedOnBlockFrequency(bytecodeSize,frequency2,borderFrequency, calleeResolvedMethod,callNode,veryColdBorderFrequency);
@@ -5026,6 +5038,9 @@ bool TR_J9InlinerPolicy::isJSR292AlwaysWorthInlining(TR_ResolvedMethod *resolved
    if (resolvedMethod->convertToMethod()->isArchetypeSpecimen())
       return true;
 
+   if (TR::comp()->fej9()->isLambdaFormGeneratedMethod(resolvedMethod))
+      return true;
+
    return false;
    }