Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send AOT header to server whenever JITServer AOT cache is requested #18889

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Send AOT header to server whenever JITServer AOT cache is requested #18889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db88dc1
Move AOT header filling to base relo runtime
cjjdespres Sep 28, 2023
11216da
Send AOT header to server if AOT cache requested
cjjdespres Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions runtime/compiler/control/JITClientCompilationThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,17 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
vmInfo._useAOTCache = comp->getPersistentInfo()->getJITServerUseAOTCache();
if (vmInfo._useAOTCache)
{
auto header = compInfoPT->reloRuntime()->getStoredAOTHeader(vmThread);
TR_ASSERT_FATAL(header, "Must have valid AOT header stored in SCC by now");
vmInfo._aotHeader = *header;
// TODO: when the shared cache is fully ignored, this should be a fresh AOT header every time
if (fe->sharedCache())
{
const TR_AOTHeader *storedHeader = compInfoPT->reloRuntime()->getStoredAOTHeader(vmThread);
TR_ASSERT_FATAL(storedHeader, "Must have valid AOT header stored in SCC by now");
vmInfo._aotHeader = *storedHeader;
}
else
{
TR_RelocationRuntime::fillAOTHeader(javaVM, fe, &vmInfo._aotHeader);
}
}
vmInfo._inSnapshotMode = fe->inSnapshotMode();
vmInfo._isPortableRestoreMode = fe->isPortableRestoreModeEnabled();
Expand Down
251 changes: 128 additions & 123 deletions runtime/compiler/runtime/RelocationRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,132 @@ TR_RelocationRuntime::aotMethodHeaderVersionsMatch()
return true;
}

void
TR_RelocationRuntime::fillAOTHeader(J9JavaVM *vm, TR_FrontEnd *fe, TR_AOTHeader *aotHeader)
{
PORT_ACCESS_FROM_JAVAVM(vm);

TR_J9VMBase *fej9 = (TR_J9VMBase *)fe;

memset(aotHeader, 0, sizeof(TR_AOTHeader));
aotHeader->eyeCatcher = TR_AOTHeaderEyeCatcher;

TR_Version *aotHeaderVersion = &aotHeader->version;
aotHeaderVersion->structSize = sizeof(TR_Version);
aotHeaderVersion->majorVersion = TR_AOTHeaderMajorVersion;
aotHeaderVersion->minorVersion = TR_AOTHeaderMinorVersion;
strncpy(aotHeaderVersion->vmBuildVersion, EsBuildVersionString, sizeof(aotHeaderVersion->vmBuildVersion) - 1);
aotHeaderVersion->vmBuildVersion[sizeof(aotHeaderVersion->vmBuildVersion) - 1] = '\0';
strncpy(aotHeaderVersion->jitBuildVersion, TR_BUILD_NAME, sizeof(aotHeaderVersion->jitBuildVersion) - 1);
aotHeaderVersion->jitBuildVersion[sizeof(aotHeaderVersion->jitBuildVersion) - 1] = '\0';

aotHeader->gcPolicyFlag = vm->memoryManagerFunctions->j9gc_modron_getWriteBarrierType(vm);
aotHeader->lockwordOptionHashValue = getCurrentLockwordOptionHashValue(vm);
aotHeader->compressedPointerShift = vm->memoryManagerFunctions->j9gc_objaccess_compressedPointersShift(vm->internalVMFunctions->currentVMThread(vm));
aotHeader->processorDescription = TR::Compiler->relocatableTarget.cpu.getProcessorDescription();

// Set up other feature flags
aotHeader->featureFlags = generateFeatureFlags(fe);

// Set ArrayLet Size if supported
aotHeader->arrayLetLeafSize = TR::Compiler->om.arrayletLeafSize();
}

// The method CS::Hash_FNV is being used to compute the hash value
// Notice that currently CS2::Hash_FNV is a hash function that never returns 0
uint32_t
TR_RelocationRuntime::getCurrentLockwordOptionHashValue(J9JavaVM *vm)
{
IDATA currentLockwordArgIndex = FIND_ARG_IN_VMARGS(STARTSWITH_MATCH, J9::Options::_externalOptionStrings[J9::ExternalOptions::Xlockword], NULL);
uint32_t currentLockwordOptionHashValue = 0;
if (currentLockwordArgIndex >= 0)
{
char * currentLockwordOption = NULL;
GET_OPTION_VALUE(currentLockwordArgIndex, ':', &currentLockwordOption);
currentLockwordOptionHashValue = CS2::Hash_FNV((unsigned char*)currentLockwordOption, strlen(currentLockwordOption));
}
return currentLockwordOptionHashValue;
}

uintptr_t
TR_RelocationRuntime::generateFeatureFlags(TR_FrontEnd *fe)
{
uintptr_t featureFlags = 0;
TR_J9VMBase *fej9 = (TR_J9VMBase *)fe;

featureFlags |= TR_FeatureFlag_sanityCheckBegin;

if (TR::Compiler->relocatableTarget.isSMP())
featureFlags |= TR_FeatureFlag_IsSMP;

if (TR::Options::useCompressedPointers())
featureFlags |= TR_FeatureFlag_UsesCompressedPointers;

if (TR::Options::getCmdLineOptions()->getOption(TR_DisableTraps))
featureFlags |= TR_FeatureFlag_DisableTraps;

if (TR::Options::getCmdLineOptions()->getOption(TR_TLHPrefetch))
featureFlags |= TR_FeatureFlag_TLHPrefetch;

if (TR::CodeCacheManager::instance()->codeCacheConfig().needsMethodTrampolines())
featureFlags |= TR_FeatureFlag_MethodTrampolines;

if (TR::Options::getCmdLineOptions()->getOption(TR_FullSpeedDebug))
featureFlags |= TR_FeatureFlag_FSDEnabled;

if (TR::Options::getCmdLineOptions()->getOption(TR_EnableHCR))
featureFlags |= TR_FeatureFlag_HCREnabled;

#ifdef TR_TARGET_S390
if (TR::Compiler->relocatableTarget.cpu.supportsFeature(OMR_FEATURE_S390_VECTOR_FACILITY))
featureFlags |= TR_FeatureFlag_SIMDEnabled;
#endif

if (TR::Compiler->om.readBarrierType() != gc_modron_readbar_none)
{
featureFlags |= TR_FeatureFlag_ConcurrentScavenge;

#ifdef TR_TARGET_S390
if (!TR::Compiler->relocatableTarget.cpu.supportsFeature(OMR_FEATURE_S390_GUARDED_STORAGE))
featureFlags |= TR_FeatureFlag_SoftwareReadBarrier;
#endif
}

if (TR::Compiler->om.isIndexableDataAddrPresent())
featureFlags |= TR_FeatureFlag_ArrayHeaderShape;

if (fej9->isAsyncCompilation())
featureFlags |= TR_FeatureFlag_AsyncCompilation;


if (!TR::Options::getCmdLineOptions()->getOption(TR_DisableTM) &&
!TR::Options::getAOTCmdLineOptions()->getOption(TR_DisableTM))
{
if (TR::Compiler->relocatableTarget.cpu.supportsTransactionalMemoryInstructions())
{
featureFlags |= TR_FeatureFlag_UsesTM;
}
}

if (TR::Options::getCmdLineOptions()->isVariableHeapBaseForBarrierRange0())
featureFlags |= TR_FeatureFlag_IsVariableHeapBaseForBarrierRange0;

if (TR::Options::getCmdLineOptions()->isVariableHeapSizeForBarrierRange0())
featureFlags |= TR_FeatureFlag_IsVariableHeapSizeForBarrierRange0;

if (TR::Options::getCmdLineOptions()->isVariableActiveCardTableBase())
featureFlags |= TR_FeatureFlag_IsVariableActiveCardTableBase;

TR::CompilationInfo *compInfo = TR::CompilationInfo::get();
TR_PersistentCHTable *cht = compInfo->getPersistentInfo()->getPersistentCHTable();
if (!TR::Options::getAOTCmdLineOptions()->getOption(TR_DisableCHOpts)
&& cht && cht->isActive())
{
featureFlags |= TR_FeatureFlag_CHTableEnabled;
}

return featureFlags;
}

bool
TR_RelocationRuntime::storeAOTHeader(TR_FrontEnd *fe, J9VMThread *curThread)
Expand Down Expand Up @@ -1107,22 +1233,6 @@ TR_SharedCacheRelocationRuntime::checkAOTHeaderFlags(const TR_AOTHeader *hdrInCa
generateError(J9NLS_RELOCATABLE_CODE_UNKNOWN_PROBLEM, "AOT header validation failed: Unkown problem with processor features.");
}

// The method CS::Hash_FNV is being used to compute the hash value
// Notice that currently CS2::Hash_FNV is a hash function that never returns 0
uint32_t
TR_SharedCacheRelocationRuntime::getCurrentLockwordOptionHashValue(J9JavaVM *vm) const
{
IDATA currentLockwordArgIndex = FIND_ARG_IN_VMARGS(STARTSWITH_MATCH, J9::Options::_externalOptionStrings[J9::ExternalOptions::Xlockword], NULL);
uint32_t currentLockwordOptionHashValue = 0;
if (currentLockwordArgIndex >= 0)
{
char * currentLockwordOption = NULL;
GET_OPTION_VALUE(currentLockwordArgIndex, ':', &currentLockwordOption);
currentLockwordOptionHashValue = CS2::Hash_FNV((unsigned char*)currentLockwordOption, strlen(currentLockwordOption));
}
return currentLockwordOptionHashValue;
}

OMRProcessorDesc
TR_SharedCacheRelocationRuntime::getProcessorDescriptionFromSCC(J9VMThread *curThread)
{
Expand Down Expand Up @@ -1264,35 +1374,10 @@ TR_AOTHeader *
TR_SharedCacheRelocationRuntime::createAOTHeader(TR_FrontEnd *fe)
{
PORT_ACCESS_FROM_JAVAVM(javaVM());

TR_J9VMBase *fej9 = (TR_J9VMBase *)fe;
TR_AOTHeader * aotHeader = (TR_AOTHeader *)j9mem_allocate_memory(sizeof(TR_AOTHeader), J9MEM_CATEGORY_JIT);
TR_AOTHeader *aotHeader = (TR_AOTHeader *)j9mem_allocate_memory(sizeof(TR_AOTHeader), J9MEM_CATEGORY_JIT);

if (aotHeader)
{
memset(aotHeader, 0, sizeof(TR_AOTHeader));
aotHeader->eyeCatcher = TR_AOTHeaderEyeCatcher;

TR_Version *aotHeaderVersion = &aotHeader->version;
aotHeaderVersion->structSize = sizeof(TR_Version);
aotHeaderVersion->majorVersion = TR_AOTHeaderMajorVersion;
aotHeaderVersion->minorVersion = TR_AOTHeaderMinorVersion;
strncpy(aotHeaderVersion->vmBuildVersion, EsBuildVersionString, sizeof(aotHeaderVersion->vmBuildVersion) - 1);
aotHeaderVersion->vmBuildVersion[sizeof(aotHeaderVersion->vmBuildVersion) - 1] = '\0';
strncpy(aotHeaderVersion->jitBuildVersion, TR_BUILD_NAME, sizeof(aotHeaderVersion->jitBuildVersion) - 1);
aotHeaderVersion->jitBuildVersion[sizeof(aotHeaderVersion->jitBuildVersion) - 1] = '\0';

aotHeader->gcPolicyFlag = javaVM()->memoryManagerFunctions->j9gc_modron_getWriteBarrierType(javaVM());
aotHeader->lockwordOptionHashValue = getCurrentLockwordOptionHashValue(javaVM());
aotHeader->compressedPointerShift = javaVM()->memoryManagerFunctions->j9gc_objaccess_compressedPointersShift(javaVM()->internalVMFunctions->currentVMThread(javaVM()));
aotHeader->processorDescription = TR::Compiler->relocatableTarget.cpu.getProcessorDescription();

// Set up other feature flags
aotHeader->featureFlags = generateFeatureFlags(fe);

// Set ArrayLet Size if supported
aotHeader->arrayLetLeafSize = TR::Compiler->om.arrayletLeafSize();
}
fillAOTHeader(javaVM(), fe, aotHeader);

return aotHeader;
}
Expand Down Expand Up @@ -1366,86 +1451,6 @@ TR_SharedCacheRelocationRuntime::storeAOTHeader(TR_FrontEnd *fe, J9VMThread *cur
}
}

uintptr_t
TR_SharedCacheRelocationRuntime::generateFeatureFlags(TR_FrontEnd *fe)
{
uintptr_t featureFlags = 0;
TR_J9VMBase *fej9 = (TR_J9VMBase *)fe;

featureFlags |= TR_FeatureFlag_sanityCheckBegin;

if (TR::Compiler->relocatableTarget.isSMP())
featureFlags |= TR_FeatureFlag_IsSMP;

if (TR::Options::useCompressedPointers())
featureFlags |= TR_FeatureFlag_UsesCompressedPointers;

if (TR::Options::getCmdLineOptions()->getOption(TR_DisableTraps))
featureFlags |= TR_FeatureFlag_DisableTraps;

if (TR::Options::getCmdLineOptions()->getOption(TR_TLHPrefetch))
featureFlags |= TR_FeatureFlag_TLHPrefetch;

if (TR::CodeCacheManager::instance()->codeCacheConfig().needsMethodTrampolines())
featureFlags |= TR_FeatureFlag_MethodTrampolines;

if (TR::Options::getCmdLineOptions()->getOption(TR_FullSpeedDebug))
featureFlags |= TR_FeatureFlag_FSDEnabled;

if (TR::Options::getCmdLineOptions()->getOption(TR_EnableHCR))
featureFlags |= TR_FeatureFlag_HCREnabled;

#ifdef TR_TARGET_S390
if (TR::Compiler->relocatableTarget.cpu.supportsFeature(OMR_FEATURE_S390_VECTOR_FACILITY))
featureFlags |= TR_FeatureFlag_SIMDEnabled;
#endif

if (TR::Compiler->om.readBarrierType() != gc_modron_readbar_none)
{
featureFlags |= TR_FeatureFlag_ConcurrentScavenge;

#ifdef TR_TARGET_S390
if (!TR::Compiler->relocatableTarget.cpu.supportsFeature(OMR_FEATURE_S390_GUARDED_STORAGE))
featureFlags |= TR_FeatureFlag_SoftwareReadBarrier;
#endif
}

if (TR::Compiler->om.isIndexableDataAddrPresent())
featureFlags |= TR_FeatureFlag_ArrayHeaderShape;

if (fej9->isAsyncCompilation())
featureFlags |= TR_FeatureFlag_AsyncCompilation;


if (!TR::Options::getCmdLineOptions()->getOption(TR_DisableTM) &&
!TR::Options::getAOTCmdLineOptions()->getOption(TR_DisableTM))
{
if (TR::Compiler->relocatableTarget.cpu.supportsTransactionalMemoryInstructions())
{
featureFlags |= TR_FeatureFlag_UsesTM;
}
}

if (TR::Options::getCmdLineOptions()->isVariableHeapBaseForBarrierRange0())
featureFlags |= TR_FeatureFlag_IsVariableHeapBaseForBarrierRange0;

if (TR::Options::getCmdLineOptions()->isVariableHeapSizeForBarrierRange0())
featureFlags |= TR_FeatureFlag_IsVariableHeapSizeForBarrierRange0;

if (TR::Options::getCmdLineOptions()->isVariableActiveCardTableBase())
featureFlags |= TR_FeatureFlag_IsVariableActiveCardTableBase;

TR::CompilationInfo *compInfo = TR::CompilationInfo::get();
TR_PersistentCHTable *cht = compInfo->getPersistentInfo()->getPersistentCHTable();
if (!TR::Options::getAOTCmdLineOptions()->getOption(TR_DisableCHOpts)
&& cht && cht->isActive())
{
featureFlags |= TR_FeatureFlag_CHTableEnabled;
}

return featureFlags;
}

void TR_RelocationRuntime::initializeHWProfilerRecords(TR::Compilation *comp)
{
assert(comp != NULL);
Expand Down
7 changes: 4 additions & 3 deletions runtime/compiler/runtime/RelocationRuntime.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ class TR_RelocationRuntime {
virtual bool validateAOTHeader(TR_FrontEnd *fe, J9VMThread *curThread);
virtual OMRProcessorDesc getProcessorDescriptionFromSCC(J9VMThread *curThread);

static void fillAOTHeader(J9JavaVM *vm, TR_FrontEnd *fe, TR_AOTHeader *header);

static uintptr_t getGlobalValue(uint32_t g)
{
TR_ASSERT(g >= 0 && g < TR_NumGlobalValueItems, "invalid index for global item");
Expand Down Expand Up @@ -394,6 +396,8 @@ class TR_RelocationRuntime {
static const char *_reloErrorCodeNames[];

protected:
static uintptr_t generateFeatureFlags(TR_FrontEnd *fe);
static uint32_t getCurrentLockwordOptionHashValue(J9JavaVM *vm);

J9JITConfig *_jitConfig;
J9JavaVM *_javaVM;
Expand Down Expand Up @@ -470,7 +474,6 @@ class TR_SharedCacheRelocationRuntime : public TR_RelocationRuntime {
virtual OMRProcessorDesc getProcessorDescriptionFromSCC(J9VMThread *curThread);

private:
uint32_t getCurrentLockwordOptionHashValue(J9JavaVM *vm) const;
virtual uint8_t * allocateSpaceInCodeCache(UDATA codeSize);
virtual uint8_t * allocateSpaceInDataCache(UDATA metaDataSize, UDATA type);
virtual void initializeAotRuntimeInfo();
Expand All @@ -483,8 +486,6 @@ class TR_SharedCacheRelocationRuntime : public TR_RelocationRuntime {

bool _sharedCacheIsFull;

static uintptr_t generateFeatureFlags(TR_FrontEnd *fe);

static const char aotHeaderKey[];
static const UDATA aotHeaderKeyLength;
};
Expand Down