Merge pull request #21913 from nbhuiyan/nph-param-load

Enable peeking ILGen for param loads using NeedsPeekingHeuristic

Author: vijaysun-omr

runtime/compiler/optimizer/InlinerTempForJ9.cpp

@@ -6846,9 +6846,17 @@ static bool treeMatchesCallSite(TR::TreeTop* tt, TR::ResolvedMethodSymbol* calle
 
 
 
-      //make sure classes are compatible
+      // Make sure classes are compatible, but only for non-LambdaForm generated methods, as the class lookup
+      // for LF generated methods would result in failure to obtain the classes, and therefore, can't be checked
+      // for compatibility. It is safe to skip this check for LF methods, as the name and signature matching performed
+      // below would return false if call node and call site LF method classes do not match.
+      //
+      bool isLFMethod = false;
+      if (callsite->_initialCalleeMethod
+          && TR::comp()->fej9()->isLambdaFormGeneratedMethod(callsite->_initialCalleeMethod))
+         isLFMethod = true;
 
-      if (!callNodeClass || !callSiteClass || callerSymbol->getResolvedMethod()->fe()->isInstanceOf (callNodeClass, callSiteClass, true, true, true) != TR_yes)
+      if (!isLFMethod && (!callNodeClass || !callSiteClass || callerSymbol->getResolvedMethod()->fe()->isInstanceOf (callNodeClass, callSiteClass, true, true, true) != TR_yes))
          {
          if (tracer->heuristicLevel())
             {

runtime/compiler/optimizer/J9EstimateCodeSize.cpp

@@ -172,7 +172,9 @@ class NeedsPeekingHeuristic
          {
             if (_bci.bcIndex() - _loadIndices[i] <= _distance)
             {
-               heuristicTraceIfTracerIsNotNull(_tracer, "there is a parm load at %d which is within %d of a call at %d", _loadIndices[i], _distance, _bci.bcIndex());
+               heuristicTraceIfTracerIsNotNull(_tracer, "There is a parm load at %d which is within %d of a call at %d. Setting needs peeking to true and skipping any further param load check.", _loadIndices[i], _distance, _bci.bcIndex());
+               setNeedsPeekingToTrue();
+               break;
             }
          }
       };
@@ -184,7 +186,8 @@ class NeedsPeekingHeuristic
 
       void processByteCode()
          {
-            if (!_hasArgumentsInfo)
+            static const bool disableNPH = feGetEnv("TR_disableNPH") != NULL;
+            if (disableNPH || !_hasArgumentsInfo || doPeeking())
                return;
             TR_J9ByteCode bc = _bci.current();
             int slotIndex = -1;
@@ -1380,8 +1383,8 @@ TR_J9EstimateCodeSize::realEstimateCodeSize(TR_CallTarget *calltarget, TR_CallSt
    const static bool debugMHInlineWithOutPeeking = feGetEnv("TR_DebugMHInlineWithOutPeeking") ? true: false;
    bool mhInlineWithPeeking =  comp()->getOption(TR_DisableMHInlineWithoutPeeking);
    const static bool disableMethodHandleInliningAfterFirstPass = feGetEnv("TR_DisableMethodHandleInliningAfterFirstPass") ? true: false;
-   bool inlineArchetypeSpecimen = calltarget->_calleeMethod->convertToMethod()->isArchetypeSpecimen() &&
-                                   (!disableMethodHandleInliningAfterFirstPass || _inliner->firstPass());
+   bool isArchetypeSpecimen = calltarget->_calleeMethod->convertToMethod()->isArchetypeSpecimen();
+   bool inlineArchetypeSpecimen = isArchetypeSpecimen && (!disableMethodHandleInliningAfterFirstPass || _inliner->firstPass());
    bool inlineLambdaFormGeneratedMethod = comp()->fej9()->isLambdaFormGeneratedMethod(calltarget->_calleeMethod) &&
                                    (!disableMethodHandleInliningAfterFirstPass || _inliner->firstPass());
 
@@ -1392,11 +1395,11 @@ TR_J9EstimateCodeSize::realEstimateCodeSize(TR_CallTarget *calltarget, TR_CallSt
 
    TR::CFG &cfg = processBytecodeAndGenerateCFG(calltarget, cfgRegion, bci, nph, blocks, flags);
 
-   // No need to peek LF methods, as we'll always interprete the method with state in order to propagate object info
-   // through bytecodes to find call targets
+   // No need to peek LF methods, as we'll always interpret the method with state in order to propagate object info
+   // through bytecodes to find call targets.
    if (!inlineLambdaFormGeneratedMethod &&
-       ((nph.doPeeking() && recurseDown) ||
-       (inlineArchetypeSpecimen && mhInlineWithPeeking)))
+       ((nph.doPeeking() && !isArchetypeSpecimen && recurseDown) ||
+        (inlineArchetypeSpecimen && mhInlineWithPeeking)))
       {
 
       heuristicTrace(tracer(), "*** Depth %d: ECS CSI -- needsPeeking is true for calltarget %p",