Merge pull request #21866 from mpirvu/replay-cleanout

Delete unused IProfiler code related to comp replay

Author: dsouzai

runtime/compiler/runtime/IProfiler.cpp

@@ -3512,93 +3512,6 @@ TR_IProfiler::countEntries()
    return count;
    }
 
-
-// helper functions for replay
-//
-void TR_IProfiler::setupEntriesInHashTable(TR_IProfiler *ip)
-   {
-   for (int32_t bucket = 0; bucket < TR::Options::_iProfilerBcHashTableSize; bucket++)
-      {
-      TR_IPBytecodeHashTableEntry *entry = _bcHashTable[bucket], *prevEntry = NULL;
-
-      while (entry)
-         {
-         uintptr_t pc = entry->getPC();
-
-         if (pc == 0 ||
-               pc == 0xffffffff)
-            {
-            printf("invalid pc for entry %p %#" OMR_PRIxPTR "\n", entry, pc);
-            fflush(stdout);
-            prevEntry = entry;
-            entry = entry->getNext();
-            continue;
-            }
-
-
-         TR_IPBytecodeHashTableEntry *newEntry = ip->findOrCreateEntry(bucket, pc, true);
-         // check for entries corresponding to
-         // unloaded methods, findOrCreateEntry will
-         // return NULL above. its ok to ignore these entries
-         // as they are invalid anyway
-         //
-         if (newEntry)
-            ip->copyDataFromEntry(entry, newEntry, NULL);
-         prevEntry = entry;
-         entry = entry->getNext();
-         }
-      }
-   printf("Finished adding entries from core to new iprofiler\n");
-   }
-
-void TR_IProfiler::copyDataFromEntry(TR_IPBytecodeHashTableEntry *oldEntry, TR_IPBytecodeHashTableEntry *newEntry, TR_IProfiler *ip)
-   {
-   U_8 *oldEntryPC = (U_8*)oldEntry->getPC();
-   U_8 byteCodeType = *(oldEntryPC);
-   if (isSwitch(byteCodeType))
-      {
-      ;// FIXME: dont care about switches at the moment
-      }
-   else
-      {
-      // isCompact(byteCodeType) or callGraph entries
-      //
-      printf("populating entry for pc %p newentrypc %p\n", oldEntryPC, (U_8*)newEntry->getPC());
-      // vft entries for whacking
-      //
-      void *oldVft = *(void**)(oldEntry);
-      void *newVft = *(void**)(newEntry);
-      *(void**)(oldEntry) = newVft;
-      if (isCompact(byteCodeType))
-         {
-         uintptr_t data = oldEntry->getData();
-         //printf("got oldvft = %p newvft = %p data %p\n", oldvft, newvft, data);
-         newEntry->setData(data);
-         }
-      else
-         {
-         // callGraph entry
-         //
-         CallSiteProfileInfo *oldCSInfo = ((TR_IPBCDataCallGraph*)(oldEntry))->getCGData();
-         CallSiteProfileInfo *newCSInfo = ((TR_IPBCDataCallGraph*)(newEntry))->getCGData();
-         printf("got oldCSInfo %p\n", oldCSInfo);
-
-         if (oldCSInfo)
-            {
-            for (int32_t i = 0; i < NUM_CS_SLOTS; i++)
-               {
-               printf("got clazz %#" OMR_PRIxPTR " weight %d\n", oldCSInfo->getClazz(i), oldCSInfo->_weight[i]);
-               newCSInfo->setClazz(i, oldCSInfo->getClazz(i));
-               newCSInfo->_weight[i] = oldCSInfo->_weight[i];
-               }
-            }
-
-         if (((TR_IPBCDataCallGraph*)oldEntry)->isWarmCallGraphTooBig())
-            ((TR_IPBCDataCallGraph*)newEntry)->setWarmCallGraphTooBig();
-         }
-      }
-   }
-
 void TR_IProfiler::checkMethodHashTable()
    {
    static char *fname = feGetEnv("TR_PrintMethodHashTableFileName");

runtime/compiler/runtime/IProfiler.hpp

@@ -683,7 +683,6 @@ class TR_IProfiler : public TR_ExternalProfiler
    uint32_t *getAllocationProfilingDataPointer(TR_ByteCodeInfo &bcInfo, TR_OpaqueClassBlock *clazz, TR_OpaqueMethodBlock *method, TR::Compilation *comp);
    uint32_t *getGlobalAllocationDataPointer(bool isAOT);
    TR_ExternalProfiler * canProduceBlockFrequencyInfo(TR::Compilation& comp);
-   void setupEntriesInHashTable(TR_IProfiler *ip);
 
    TR_IPMethodHashTableEntry *findOrCreateMethodEntry(J9Method *, J9Method *, bool addIt, uint32_t pcIndex =  ~0);
    // Returns the number of entries released, and also stores the number of
@@ -762,8 +761,6 @@ class TR_IProfiler : public TR_ExternalProfiler
    virtual int32_t getFlatSwitchProfileCounts (TR::Node *node, TR::Compilation *comp);
    virtual bool isSwitchProfileFlat (TR::Node *node, TR::Compilation *comp);
    int32_t getSamplingCount( TR_IPBytecodeHashTableEntry *entry, TR::Compilation *comp);
-   // for replay
-   void copyDataFromEntry(TR_IPBytecodeHashTableEntry *oldEntry, TR_IPBytecodeHashTableEntry *newEntry, TR_IProfiler *ip);
 
    TR_IPBCDataStorageHeader *getJ9SharedDataDescriptorForMethod(J9SharedDataDescriptor * descriptor, unsigned char * buffer, uint32_t length, TR_OpaqueMethodBlock * method, TR::Compilation *comp);