Merge pull request #21851 from mpirvu/setcallcount-cleanup

Delete isWarmCallGraphCall() and other unused related methods

Author: dsouzai

runtime/compiler/env/VMJ9.cpp

@@ -5932,16 +5932,6 @@ TR_J9VMBase::setIProfilerCallCount(TR_OpaqueMethodBlock *caller, int32_t bcIndex
       profiler->setCallCount(caller, bcIndex, count, comp);
    }
 
-int32_t
-TR_J9VMBase::getCGEdgeWeight(TR::Node *callerNode, TR_OpaqueMethodBlock *callee, TR::Compilation *comp)
-   {
-   TR_IProfiler *profiler = getIProfiler();
-   if (profiler)
-      return profiler->getCGEdgeWeight(callerNode, callee, comp);
-
-   return 0;
-   }
-
 bool
 TR_J9VMBase::isCallGraphProfilingEnabled()
    {

runtime/compiler/env/VMJ9.h

@@ -1217,7 +1217,6 @@ class TR_J9VMBase : public TR_FrontEnd
    uint32_t *getAllocationProfilingDataPointer(TR_ByteCodeInfo &bcInfo, TR_OpaqueClassBlock *clazz, TR_OpaqueMethodBlock *method,  TR::Compilation *comp);
    uint32_t *getGlobalAllocationDataPointer();
    virtual TR_ExternalProfiler   *hasIProfilerBlockFrequencyInfo(TR::Compilation& comp);
-   virtual int32_t getCGEdgeWeight(TR::Node *callerNode, TR_OpaqueMethodBlock *callee,  TR::Compilation *comp);
    virtual int32_t getIProfilerCallCount(TR_OpaqueMethodBlock *caller, int32_t bcIndex,  TR::Compilation *);
    virtual int32_t getIProfilerCallCount(TR_OpaqueMethodBlock *callee, TR_OpaqueMethodBlock *caller, int32_t bcIndex,  TR::Compilation *);
    virtual void setIProfilerCallCount(TR_OpaqueMethodBlock *caller, int32_t bcIndex, int32_t count,  TR::Compilation *);

runtime/compiler/runtime/IProfiler.cpp

@@ -3429,24 +3429,6 @@ TR_IProfiler::getCallCount(TR_ByteCodeInfo &bcInfo, TR::Compilation *comp)
    return getCallCount(getMethodFromBCInfo(bcInfo, comp), (int32_t)bcInfo.getByteCodeIndex(), comp);
    }
 
-int32_t
-TR_IProfiler::getCGEdgeWeight (TR::Node *callerNode, TR_OpaqueMethodBlock *callee, TR::Compilation *comp)
-   {
-   TR_ByteCodeInfo& bcInfo = callerNode->getByteCodeInfo();
-   uintptr_t thisPC = getSearchPC (getMethodFromNode(callerNode, comp), bcInfo.getByteCodeIndex(), comp);
-
-   if (isSpecialOrStatic(*(U_8 *)thisPC))
-      return getCallCount(bcInfo, comp);
-
-   TR_IPBCDataCallGraph *cgData = getCGProfilingData(callerNode->getByteCodeInfo(), comp);
-   if (cgData)
-      {
-      return cgData->getEdgeWeight((TR_OpaqueClassBlock *)J9_CLASS_FROM_METHOD(((J9Method *)callee)), comp);
-      }
-   return 0;
-   }
-
-
 int32_t
 TR_IProfiler::getMaxCallCount()
    {

runtime/compiler/runtime/IProfiler.hpp

@@ -676,7 +676,6 @@ class TR_IProfiler : public TR_ExternalProfiler
    int32_t getCallCount(TR_ByteCodeInfo &bcInfo, TR::Compilation *comp);
    virtual void setCallCount(TR_OpaqueMethodBlock *method, int32_t bcIndex, int32_t count, TR::Compilation *);
 
-   int32_t getCGEdgeWeight (TR::Node *callerNode, TR_OpaqueMethodBlock *callee, TR::Compilation *comp);
    bool    isCallGraphProfilingEnabled();
 
    virtual TR_AbstractInfo *createIProfilingValueInfo( TR_ByteCodeInfo &bcInfo, TR::Compilation *comp);

runtime/compiler/runtime/J9Profiler.cpp

@@ -959,12 +959,6 @@ TR_ValueProfileInfoManager::getCallGraphProfilingCount(TR_OpaqueMethodBlock *cal
    return comp->fej9()->getIProfilerCallCount(calleeMethod, method, byteCodeIndex, comp);
    }
 
-int32_t
-TR_ValueProfileInfoManager::getCallGraphProfilingCount(TR::Node *node, TR_OpaqueMethodBlock *method, TR::Compilation *comp)
-   {
-   return comp->fej9()->getCGEdgeWeight(node, method, comp);
-   }
-
 int32_t
 TR_ValueProfileInfoManager::getCallGraphProfilingCount(TR::Node *node, TR::Compilation *comp)
    {
@@ -1034,17 +1028,6 @@ TR_ValueProfileInfoManager::getAdjustedInliningWeight(TR::Node *callNode, int32_
    return callGraphAdjustedWeight;
    }
 
-bool
-TR_ValueProfileInfoManager::isWarmCallGraphCall(TR::Node *node, TR_OpaqueMethodBlock *method, TR::Compilation *comp)
-   {
-   if (node->getSymbolReference() && node->getSymbolReference()->getSymbol() &&
-       ((node->getSymbolReference()->getSymbol()->castToMethodSymbol()->getMethodKind()==TR::MethodSymbol::Special) ||
-        (node->getSymbolReference()->getSymbol()->castToMethodSymbol()->getMethodKind()==TR::MethodSymbol::Static)))
-      return false;
-
-   return (getCallGraphProfilingCount(node, method, comp) < comp->getFlowGraph()->getLowFrequency());
-   }
-
 bool
 TR_ValueProfileInfoManager::isCallGraphProfilingEnabled(TR::Compilation *comp)
    {

runtime/compiler/runtime/J9Profiler.hpp

@@ -575,10 +575,8 @@ class TR_ValueProfileInfoManager
    bool             isColdCall(TR_OpaqueMethodBlock *method, int32_t byteCodeIndex, TR::Compilation *comp);
    bool             isColdCall(TR_OpaqueMethodBlock *calleeMethod, TR_OpaqueMethodBlock *method, int32_t byteCodeIndex, TR::Compilation *comp);
    bool             isColdCall(TR::Node *node, TR::Compilation *comp);
-   bool             isWarmCallGraphCall(TR::Node *node, TR_OpaqueMethodBlock *method, TR::Compilation *comp);
    bool             isWarmCall(TR::Node *node, TR::Compilation *comp);
    bool             isCallGraphProfilingEnabled(TR::Compilation *comp);
-   int32_t          getCallGraphProfilingCount(TR::Node *node, TR_OpaqueMethodBlock *method, TR::Compilation *comp);
    int32_t          getCallGraphProfilingCount(TR::Node *node, TR::Compilation *comp);
    int32_t          getCallGraphProfilingCount(TR_OpaqueMethodBlock *method, int32_t byteCodeIndex, TR::Compilation *comp);
    int32_t          getCallGraphProfilingCount(TR_OpaqueMethodBlock *calleeMethod, TR_OpaqueMethodBlock *method, int32_t byteCodeIndex, TR::Compilation *comp);