Merge pull request eclipse-omr#6080 from 0xdaryl/nolongparms

Remove obsolete long parm value profiling code
CAS-Atlantic · Jul 16, 2021 · 5ce826e · 5ce826e
2 parents f4a5b59 + 4d14598
commit 5ce826e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 39 deletions.
diff --git a/compiler/optimizer/LoopVersioner.cpp b/compiler/optimizer/LoopVersioner.cpp
@@ -3181,35 +3181,14 @@ void TR_LoopVersioner::updateDefinitionsAndCollectProfiledExprs(TR::Node *parent
          _containsCall = true;
       }
 
-   static char *profileLongParms = feGetEnv("TR_ProfileLongParms");
    if (TR_LocalAnalysis::isSupportedOpCode(node->getOpCode(), comp()))
       {
       if (node->getType().isInt32() ||
           (node->getType().isInt64() &&
            node->getOpCode().isLoadVar() &&
            node->getSymbolReference()->getSymbol()->isAutoOrParm()))
           {
-          if (profileLongParms &&
-              comp()->getMethodHotness() == hot &&
-              comp()->getRecompilationInfo())
-             {
-             if (node->getType().isInt64())
-                {
-                if (node->getSymbolReference()->getSymbol()->isParm())
-                   {
-                   // Switch this compile to profiling compilation in case a
-                   // potential opportunity is seen for specializing long parms (which are
-                   // usually invariant) is seen
-                   //
-                   optimizer()->switchToProfiling();
-                   //printf("Profiling longs in %s from LVE\n", comp()->signature());
-                   }
-                }
-             }
-
-          if (/* comp()->getRecompilationInfo() && */ collectProfiledExprs &&
-              ((!node->getType().isInt64()) ||
-               (profileLongParms /* && (valueInfo->getTopValue() == 0) */)))
+          if (collectProfiledExprs && !node->getType().isInt64())
              {
 #ifdef J9_PROJECT_SPECIFIC
              TR_ValueInfo *valueInfo = static_cast<TR_ValueInfo*>(TR_ValueProfileInfoManager::getProfiledValueInfo(node, comp(), ValueInfo));
@@ -3222,8 +3201,7 @@ void TR_LoopVersioner::updateDefinitionsAndCollectProfiledExprs(TR::Node *parent
                     // Only collect nodes from unspecialized blocks to avoid specializing the same nodes twice
                     !block->isSpecialized())
                    {
-                   if ((!node->getType().isInt64()) ||
-                       (profileLongParms && (valueInfo->getTopValue() == 0)))
+                   if (!node->getType().isInt64())
                       {
 
                      // Zero length contiguous array lengths mean further profiling is necessary

diff --git a/compiler/optimizer/PartialRedundancy.cpp b/compiler/optimizer/PartialRedundancy.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 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
@@ -1985,20 +1985,7 @@ bool TR_PartialRedundancy::eliminateRedundantSupportedNodes(TR::Node *parent, TR
                 (currentNode->getOpCodeValue() == TR::treetop))
                currentNode = currentNode->getFirstChild();
 
-            static char *profileLongParms = feGetEnv("TR_ProfileLongParms");
-            if ((node->getType().isInt64()) &&
-                profileLongParms)
-               {
-               // Switch this compile to profiling comp() in case a
-               // potential opportunity is seen for specializing long autos is seen;
-               // in this case aggressively try to profile and recompile (reduced
-               // the profiling count)
-               //
-               if (comp()->getMethodHotness() == hot &&
-                   comp()->getRecompilationInfo())
-                  optimizer()->switchToProfiling();
-               }
-            else if (!node->getType().isInt64())
+            if (!node->getType().isInt64())
                {
                TR::ILOpCode &currentOpCode = currentNode->getOpCode();
                if (currentOpCode.isBranch() ||