[MERGE #1716 @MikeHolman] move building JIT FunctionBody data from WI creation to JIT time

Merge pull request #1716 from MikeHolman:bgbody

Author: MikeHolman

lib/Backend/FunctionJITTimeInfo.cpp

@@ -21,9 +21,15 @@ FunctionJITTimeInfo::BuildJITTimeData(
     bool isInlinee,
     bool isForegroundJIT)
 {
-    jitData->bodyData = codeGenData->GetJITBody();
     jitData->functionInfoAddr = (intptr_t)codeGenData->GetFunctionInfo();
 
+    if (codeGenData->GetFunctionBody() && codeGenData->GetFunctionBody()->GetByteCode())
+    {
+        Js::FunctionBody * body = codeGenData->GetFunctionInfo()->GetParseableFunctionInfo()->GetFunctionBody();
+        jitData->bodyData = AnewStructZ(alloc, FunctionBodyDataIDL);
+        JITTimeFunctionBody::InitializeJITFunctionData(alloc, body, jitData->bodyData);
+    }
+
     jitData->localFuncId = codeGenData->GetFunctionInfo()->GetLocalFunctionId();
     jitData->isAggressiveInliningEnabled = codeGenData->GetIsAggressiveInliningEnabled();
     jitData->isInlined = codeGenData->GetIsInlined();

lib/Backend/IRBuilder.cpp

@@ -93,7 +93,7 @@ IRBuilder::DoBailOnNoProfile()
     }
 
     Func *const topFunc = m_func->GetTopFunc();
-    if(topFunc->GetJITFunctionBody()->GetProfiledIterations() == 0)
+    if(topFunc->GetWorkItem()->GetProfiledIterations() == 0)
     {
         // The top function has not been profiled yet. Some switch must have been used to force jitting. This is not a
         // real-world case, but for the purpose of testing the JIT, it's beneficial to generate code in unprofiled paths.

lib/Backend/JITTimeFunctionBody.cpp

@@ -14,7 +14,7 @@ JITTimeFunctionBody::JITTimeFunctionBody(FunctionBodyDataIDL * bodyData) :
 /* static */
 void
 JITTimeFunctionBody::InitializeJITFunctionData(
-    __in Recycler * recycler,
+    __in ArenaAllocator * arena,
     __in Js::FunctionBody *functionBody,
     __out FunctionBodyDataIDL * jitBody)
 {
@@ -27,9 +27,9 @@ JITTimeFunctionBody::InitializeJITFunctionData(
         jitBody->constTable = (intptr_t *)functionBody->GetConstTable();
         if (!functionBody->GetIsAsmJsFunction())
         {
-            jitBody->constTableContent = RecyclerNewStructZ(recycler, ConstTableContentIDL);
+            jitBody->constTableContent = AnewStructZ(arena, ConstTableContentIDL);
             jitBody->constTableContent->count = functionBody->GetConstantCount();
-            jitBody->constTableContent->content = RecyclerNewArrayZ(recycler, RecyclableObjectIDL*, functionBody->GetConstantCount());
+            jitBody->constTableContent->content = AnewArrayZ(arena, RecyclableObjectIDL*, functionBody->GetConstantCount());
 
             for (Js::RegSlot reg = Js::FunctionBody::FirstRegSlot; reg < functionBody->GetConstantCount(); ++reg)
             {
@@ -68,7 +68,7 @@ JITTimeFunctionBody::InitializeJITFunctionData(
 
         auto fullStatementMaps = functionBody->GetStatementMaps();
         jitBody->fullStatementMapCount = fullStatementMaps->Count();
-        jitBody->fullStatementMaps = RecyclerNewArrayZ(recycler, StatementMapIDL, jitBody->fullStatementMapCount);
+        jitBody->fullStatementMaps = AnewArrayZ(arena, StatementMapIDL, jitBody->fullStatementMapCount);
         fullStatementMaps->Map([jitBody](int index, Js::FunctionBody::StatementMap * map) {
 
             jitBody->fullStatementMaps[index] = *(StatementMapIDL*)map;
@@ -80,10 +80,11 @@ JITTimeFunctionBody::InitializeJITFunctionData(
             Assert((jitBody->fullStatementMaps[index].isSubExpression != FALSE) == map->isSubexpression);
         });
 
-        if (functionBody->GetPropertyIdOnRegSlotsContainer())
+        Js::PropertyIdOnRegSlotsContainer * propOnRegSlots = functionBody->GetPropertyIdOnRegSlotsContainerWithLock();
+        if (propOnRegSlots)
         {
-            jitBody->propertyIdsForRegSlotsCount = functionBody->GetPropertyIdOnRegSlotsContainer()->length;
-            jitBody->propertyIdsForRegSlots = functionBody->GetPropertyIdOnRegSlotsContainer()->propertyIdsForRegSlots;
+            jitBody->propertyIdsForRegSlotsCount = propOnRegSlots->length;
+            jitBody->propertyIdsForRegSlots = propOnRegSlots->propertyIdsForRegSlots;
         }
     }
     else
@@ -93,7 +94,7 @@ JITTimeFunctionBody::InitializeJITFunctionData(
         jitBody->byteCodeLength = functionBody->GetByteCode()->GetLength();
         jitBody->byteCodeBuffer = functionBody->GetByteCode()->GetBuffer();
 
-        jitBody->statementMap = RecyclerNewStructZ(recycler, SmallSpanSequenceIDL);
+        jitBody->statementMap = AnewStructZ(arena, SmallSpanSequenceIDL);
         jitBody->statementMap->baseValue = statementMap->baseValue;
 
         if (statementMap->pActualOffsetList)
@@ -143,18 +144,19 @@ JITTimeFunctionBody::InitializeJITFunctionData(
     jitBody->nonLoadByteCodeCount = functionBody->GetByteCodeWithoutLDACount();
     jitBody->loopCount = functionBody->GetLoopCount();
 
-    if (functionBody->GetHasAllocatedLoopHeaders())
+    Js::LoopHeader * loopHeaders = functionBody->GetLoopHeaderArrayWithLock();
+    if (loopHeaders != nullptr)
     {
-        jitBody->loopHeaderArrayAddr = (intptr_t)functionBody->GetLoopHeaderArrayPtr();
+        jitBody->loopHeaderArrayAddr = (intptr_t)loopHeaders;
         jitBody->loopHeaderArrayLength = functionBody->GetLoopCount();
-        jitBody->loopHeaders = RecyclerNewArray(recycler, JITLoopHeaderIDL, functionBody->GetLoopCount());
+        jitBody->loopHeaders = AnewArray(arena, JITLoopHeaderIDL, functionBody->GetLoopCount());
         for (uint i = 0; i < functionBody->GetLoopCount(); ++i)
         {
-            jitBody->loopHeaders[i].startOffset = functionBody->GetLoopHeader(i)->startOffset;
-            jitBody->loopHeaders[i].endOffset = functionBody->GetLoopHeader(i)->endOffset;
-            jitBody->loopHeaders[i].isNested = functionBody->GetLoopHeader(i)->isNested;
-            jitBody->loopHeaders[i].isInTry = functionBody->GetLoopHeader(i)->isInTry;
-            jitBody->loopHeaders[i].interpretCount = functionBody->GetLoopInterpretCount(functionBody->GetLoopHeader(i));
+            jitBody->loopHeaders[i].startOffset = loopHeaders[i].startOffset;
+            jitBody->loopHeaders[i].endOffset = loopHeaders[i].endOffset;
+            jitBody->loopHeaders[i].isNested = loopHeaders[i].isNested;
+            jitBody->loopHeaders[i].isInTry = loopHeaders[i].isInTry;
+            jitBody->loopHeaders[i].interpretCount = functionBody->GetLoopInterpretCount(&loopHeaders[i]);
         }
     }
 
@@ -169,7 +171,6 @@ JITTimeFunctionBody::InitializeJITFunctionData(
         jitBody->firstInnerScopeReg = functionBody->GetFirstInnerScopeRegister();
     }
     jitBody->envDepth = functionBody->GetEnvDepth();
-    jitBody->profiledIterations = functionBody->GetProfiledIterations();
     jitBody->profiledCallSiteCount = functionBody->GetProfiledCallSiteCount();
     jitBody->inParamCount = functionBody->GetInParamsCount();
     jitBody->thisRegisterForEventHandler = functionBody->GetThisRegisterForEventHandler();
@@ -209,17 +210,18 @@ JITTimeFunctionBody::InitializeJITFunctionData(
         jitBody->hasNonBuiltInCallee = functionBody->HasNonBuiltInCallee();
     }
 
-    if (functionBody->GetAuxiliaryData() != nullptr)
+    Js::ByteBlock * auxData = functionBody->GetAuxiliaryDataWithLock();
+    if (auxData != nullptr)
     {
-        jitBody->auxDataCount = functionBody->GetAuxiliaryData()->GetLength();
-        jitBody->auxData = functionBody->GetAuxiliaryData()->GetBuffer();
-        jitBody->auxDataBufferAddr = (intptr_t)functionBody->GetAuxiliaryData()->GetBuffer();
+        jitBody->auxDataCount = auxData->GetLength();
+        jitBody->auxData = auxData->GetBuffer();
+        jitBody->auxDataBufferAddr = (intptr_t)auxData->GetBuffer();
     }
-
-    if (functionBody->GetAuxiliaryContextData() != nullptr)
+    Js::ByteBlock * auxContextData = functionBody->GetAuxiliaryContextDataWithLock();
+    if (auxContextData != nullptr)
     {
-        jitBody->auxContextDataCount = functionBody->GetAuxiliaryContextData()->GetLength();
-        jitBody->auxContextData = functionBody->GetAuxiliaryContextData()->GetBuffer();
+        jitBody->auxContextDataCount = auxContextData->GetLength();
+        jitBody->auxContextData = auxContextData->GetBuffer();
     }
 
     jitBody->scriptIdAddr = (intptr_t)functionBody->GetAddressOfScriptId();
@@ -230,19 +232,19 @@ JITTimeFunctionBody::InitializeJITFunctionData(
     jitBody->callCountStatsAddr = (intptr_t)&functionBody->callCountStats;
 
     jitBody->referencedPropertyIdCount = functionBody->GetReferencedPropertyIdCount();
-    jitBody->referencedPropertyIdMap = functionBody->GetReferencedPropertyIdMap();
+    jitBody->referencedPropertyIdMap = functionBody->GetReferencedPropertyIdMapWithLock();
     jitBody->hasFinally = functionBody->GetHasFinally();
 
     jitBody->nameLength = functionBody->GetDisplayNameLength() + 1; // +1 for null terminator
     jitBody->displayName = (char16 *)functionBody->GetDisplayName();
-    jitBody->objectLiteralTypesAddr = (intptr_t)functionBody->GetObjectLiteralTypes();
+    jitBody->objectLiteralTypesAddr = (intptr_t)functionBody->GetObjectLiteralTypesWithLock();
     jitBody->literalRegexCount = functionBody->GetLiteralRegexCount();
-    jitBody->literalRegexes = (intptr_t*)functionBody->GetLiteralRegexes();
+    jitBody->literalRegexes = (intptr_t*)functionBody->GetLiteralRegexesWithLock();
 
     if (functionBody->GetIsAsmJsFunction())
     {
-        jitBody->asmJsData = RecyclerNew(recycler, AsmJsDataIDL);
-        Js::AsmJsFunctionInfo * asmFuncInfo = functionBody->GetAsmJsFunctionInfo();
+        jitBody->asmJsData = Anew(arena, AsmJsDataIDL);
+        Js::AsmJsFunctionInfo * asmFuncInfo = functionBody->GetAsmJsFunctionInfoWithLock();
         jitBody->asmJsData->intConstCount = asmFuncInfo->GetIntConstCount();
         jitBody->asmJsData->doubleConstCount = asmFuncInfo->GetDoubleConstCount();
         jitBody->asmJsData->floatConstCount = asmFuncInfo->GetFloatConstCount();
@@ -504,12 +506,6 @@ JITTimeFunctionBody::GetEnvDepth() const
     return m_bodyData.envDepth;
 }
 
-uint16
-JITTimeFunctionBody::GetProfiledIterations() const
-{
-    return m_bodyData.profiledIterations;
-}
-
 Js::ProfileId
 JITTimeFunctionBody::GetProfiledCallSiteCount() const
 {

lib/Backend/JITTimeFunctionBody.h

@@ -17,7 +17,7 @@ class JITTimeFunctionBody
     JITTimeFunctionBody(FunctionBodyDataIDL * bodyData);
 
     static void InitializeJITFunctionData(
-        __in Recycler * recycler,
+        __in ArenaAllocator * arena,
         __in Js::FunctionBody * functionBody,
         __out FunctionBodyDataIDL * jitBody);
 
@@ -58,7 +58,6 @@ class JITTimeFunctionBody
     Js::PropertyId GetReferencedPropertyId(uint index) const;
 
     uint16 GetEnvDepth() const;
-    uint16 GetProfiledIterations() const;
     uint16 GetArgUsedForBranch() const;
     Js::ProfileId GetProfiledCallSiteCount() const;
     Js::ArgSlot GetInParamsCount() const;

lib/Backend/JITTimeWorkItem.cpp

@@ -123,6 +123,12 @@ JITTimeWorkItem::GetJITFunctionBody()
     return &m_jitBody;
 }
 
+uint16
+JITTimeWorkItem::GetProfiledIterations() const
+{
+    return m_workItemData->profiledIterations;
+}
+
 CodeGenWorkItemIDL *
 JITTimeWorkItem::GetWorkItemData()
 {

lib/Backend/JITTimeWorkItem.h

@@ -30,9 +30,9 @@ class JITTimeWorkItem
         Js::StatementReader<Js::FunctionBody::ArenaStatementMapList> * statementReader, ArenaAllocator* alloc);
 
     JITTimeFunctionBody * GetJITFunctionBody();
+    uint16 GetProfiledIterations() const;
 
     CodeGenWorkItemIDL* GetWorkItemData();
-
     JITTimePolymorphicInlineCacheInfo * GetPolymorphicInlineCacheInfo();
     JITTimePolymorphicInlineCacheInfo * GetInlineePolymorphicInlineCacheInfo(intptr_t funcBodyAddr);
 

lib/Backend/NativeCodeGenerator.cpp

@@ -869,7 +869,7 @@ NativeCodeGenerator::CodeGen(PageAllocator * pageAllocator, CodeGenWorkItem* wor
     auto& jitData = workItem->GetJITData()->jitData;
     jitData = AnewStructZ(&alloc, FunctionJITTimeDataIDL);
     FunctionJITTimeInfo::BuildJITTimeData(&alloc, workItem->RecyclableData()->JitTimeData(), nullptr, workItem->GetJITData()->jitData, false, foreground);
-
+    workItem->GetJITData()->profiledIterations = workItem->RecyclableData()->JitTimeData()->GetProfiledIterations();
     Js::EntryPointInfo * epInfo = workItem->GetEntryPoint();
     if (workItem->Type() == JsFunctionType)
     {

lib/JITIDL/JITTypes.h

@@ -482,12 +482,9 @@ typedef struct FunctionBodyDataIDL
 
     unsigned short envDepth;
     unsigned short inParamCount;
-    unsigned short profiledIterations;
     unsigned short argUsedForBranch;
     unsigned short profiledCallSiteCount;
 
-    IDL_PAD2(0)
-
     unsigned int funcNumber;
     unsigned int sourceContextId;
     unsigned int nestedCount;
@@ -524,8 +521,6 @@ typedef struct FunctionBodyDataIDL
     unsigned int fullStatementMapCount;
     unsigned int propertyIdsForRegSlotsCount;
 
-    X64_PAD4(1)
-
     IDL_DEF([size_is(propertyIdsForRegSlotsCount)]) int * propertyIdsForRegSlots;
 
     SmallSpanSequenceIDL * statementMap;
@@ -648,9 +643,12 @@ typedef struct CodeGenWorkItemIDL
     byte type;
     char jitMode;
 
+    unsigned short profiledIterations;
+    IDL_PAD2(0)
     unsigned int loopNumber;
     unsigned int inlineeInfoCount;
     unsigned int symIdToValueTypeMapCount;
+    X64_PAD4(1)
     XProcNumberPageSegment * xProcNumberPageSegment;
 
     PolymorphicInlineCacheInfoIDL * selfInfo;

lib/Runtime/Base/FunctionBody.h

@@ -3099,10 +3099,10 @@ namespace Js
 #endif
         void SetLiteralRegex(const uint index, UnifiedRegex::RegexPattern *const pattern);
         DynamicType** GetObjectLiteralTypes() const { return static_cast<DynamicType**>(this->GetAuxPtr(AuxPointerType::ObjLiteralTypes)); }
+        DynamicType** GetObjectLiteralTypesWithLock() const { return static_cast<DynamicType**>(this->GetAuxPtrWithLock(AuxPointerType::ObjLiteralTypes)); }
     private:
         void ResetLiteralRegexes();
         void ResetObjectLiteralTypes();
-        DynamicType** GetObjectLiteralTypesWithLock() const { return static_cast<DynamicType**>(this->GetAuxPtrWithLock(AuxPointerType::ObjLiteralTypes)); }
         void SetObjectLiteralTypes(DynamicType** objLiteralTypes) { this->SetAuxPtr(AuxPointerType::ObjLiteralTypes, objLiteralTypes); };
     public:
 

lib/Runtime/Language/FunctionCodeGenJitTimeData.cpp

@@ -16,24 +16,18 @@ namespace Js
 #endif
         next(0),
         ldFldInlinees(nullptr),
-        bodyData(nullptr)
+        profiledIterations(GetFunctionBody() && GetFunctionBody()->GetByteCode() ? GetFunctionBody()->GetProfiledIterations() : 0)
     {
-        if (GetFunctionInfo()->HasBody())
-        {
-            Recycler * recycler = functionInfo->GetFunctionProxy()->GetScriptContext()->GetRecycler();
-            this->bodyData = RecyclerNewStructZ(recycler, FunctionBodyDataIDL);
-            JITTimeFunctionBody::InitializeJITFunctionData(recycler, GetFunctionBody(), this->bodyData);
-        }
     }
 
-    FunctionInfo *FunctionCodeGenJitTimeData::GetFunctionInfo() const
+    uint16 FunctionCodeGenJitTimeData::GetProfiledIterations() const
     {
-        return this->functionInfo;
+        return profiledIterations;
     }
 
-    FunctionBodyDataIDL *FunctionCodeGenJitTimeData::GetJITBody() const
+    FunctionInfo *FunctionCodeGenJitTimeData::GetFunctionInfo() const
     {
-        return this->bodyData;
+        return this->functionInfo;
     }
 
     FunctionBody *FunctionCodeGenJitTimeData::GetFunctionBody() const