[NativeAOT] Inline TLS access for windows/x64

src/coreclr/inc/corinfo.h

@@ -1684,6 +1684,7 @@ enum CORINFO_FIELD_ACCESSOR
     CORINFO_FIELD_STATIC_ADDR_HELPER,       // static field accessed using address-of helper (argument is FieldDesc *)
     CORINFO_FIELD_STATIC_TLS,               // unmanaged TLS access
     CORINFO_FIELD_STATIC_TLS_MANAGED,       // managed TLS access
+    CORINFO_FIELD_STATIC_TLS_MANAGED_LAZY,  // managed TLS access lazy ctor initialization
     CORINFO_FIELD_STATIC_READYTORUN_HELPER, // static field access using a runtime lookup helper
     CORINFO_FIELD_STATIC_RELOCATABLE,       // static field access using relocation (used in AOT)
     CORINFO_FIELD_INTRINSIC_ZERO,           // intrinsic zero (IntPtr.Zero, UIntPtr.Zero)
@@ -2789,6 +2790,11 @@ class ICorStaticInfo
             bool                                isGCType
             ) = 0;
 
+    virtual void getTlsRootInfo(CORINFO_CONST_LOOKUP* addr) = 0;
+    virtual void getTlsIndexInfo(CORINFO_CONST_LOOKUP* addr) = 0;
+    virtual void getThreadStaticBaseSlowInfo(CORINFO_CONST_LOOKUP* addr) = 0;
+    virtual int getEnsureClassCtorRunAndReturnThreadStaticBaseHelper(CORINFO_CLASS_HANDLE cls, CORINFO_CONST_LOOKUP* addr, CORINFO_CONST_LOOKUP* targetSymbol) = 0;
+
     // Returns true iff "fldHnd" represents a static field.
     virtual bool isFieldStatic(CORINFO_FIELD_HANDLE fldHnd) = 0;
 
@@ -3323,6 +3329,7 @@ class ICorDynamicInfo : public ICorStaticInfo
 // It would be nicer to use existing IMAGE_REL_XXX constants instead of defining our own here...
 #define IMAGE_REL_BASED_REL32           0x10
 #define IMAGE_REL_BASED_THUMB_BRANCH24  0x13
+#define IMAGE_REL_SECREL                0x104
 
 // The identifier for ARM32-specific PC-relative address
 // computation corresponds to the following instruction

src/coreclr/inc/icorjitinfoimpl_generated.h

@@ -396,6 +396,20 @@ void getThreadLocalStaticBlocksInfo(
           CORINFO_THREAD_STATIC_BLOCKS_INFO* pInfo,
           bool isGCType) override;
 
+void getTlsRootInfo(
+          CORINFO_CONST_LOOKUP* addr) override;
+
+void getTlsIndexInfo(
+          CORINFO_CONST_LOOKUP* addr) override;
+
+void getThreadStaticBaseSlowInfo(
+          CORINFO_CONST_LOOKUP* addr) override;
+
+int getEnsureClassCtorRunAndReturnThreadStaticBaseHelper(
+          CORINFO_CLASS_HANDLE cls,
+          CORINFO_CONST_LOOKUP* addr,
+          CORINFO_CONST_LOOKUP* targetSymbol) override;
+
 bool isFieldStatic(
           CORINFO_FIELD_HANDLE fldHnd) override;
 

src/coreclr/inc/jiteeversionguid.h

@@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
 #define GUID_DEFINED
 #endif // !GUID_DEFINED
 
-constexpr GUID JITEEVersionIdentifier = { /* cef79bc8-29bf-4f7b-9d05-9fc06832098c */
-    0xcef79bc8,
-    0x29bf,
-    0x4f7b,
-    {0x9d, 0x05, 0x9f, 0xc0, 0x68, 0x32, 0x09, 0x8c}
+constexpr GUID JITEEVersionIdentifier = { /* ae2c23aa-c919-44b9-a1b8-bed99aad9d20 */
+    0xae2c23aa,
+    0xc919,
+    0x44b9,
+    {0xa1, 0xb8, 0xbe, 0xd9, 0x9a, 0xad, 0x9d, 0x20}
   };
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////

src/coreclr/jit/ICorJitInfo_names_generated.h

@@ -98,6 +98,10 @@ DEF_CLR_API(getFieldOffset)
 DEF_CLR_API(getFieldInfo)
 DEF_CLR_API(getThreadLocalFieldInfo)
 DEF_CLR_API(getThreadLocalStaticBlocksInfo)
+DEF_CLR_API(getTlsRootInfo)
+DEF_CLR_API(getTlsIndexInfo)
+DEF_CLR_API(getThreadStaticBaseSlowInfo)
+DEF_CLR_API(getEnsureClassCtorRunAndReturnThreadStaticBaseHelper)
 DEF_CLR_API(isFieldStatic)
 DEF_CLR_API(getArrayOrStringLength)
 DEF_CLR_API(getBoundaries)

src/coreclr/jit/ICorJitInfo_wrapper_generated.hpp

@@ -932,6 +932,41 @@ void WrapICorJitInfo::getThreadLocalStaticBlocksInfo(
     API_LEAVE(getThreadLocalStaticBlocksInfo);
 }
 
+void WrapICorJitInfo::getTlsRootInfo(
+          CORINFO_CONST_LOOKUP* addr)
+{
+    API_ENTER(getTlsRootInfo);
+    wrapHnd->getTlsRootInfo(addr);
+    API_LEAVE(getTlsRootInfo);
+}
+
+void WrapICorJitInfo::getTlsIndexInfo(
+          CORINFO_CONST_LOOKUP* addr)
+{
+    API_ENTER(getTlsIndexInfo);
+    wrapHnd->getTlsIndexInfo(addr);
+    API_LEAVE(getTlsIndexInfo);
+}
+
+void WrapICorJitInfo::getThreadStaticBaseSlowInfo(
+          CORINFO_CONST_LOOKUP* addr)
+{
+    API_ENTER(getThreadStaticBaseSlowInfo);
+    wrapHnd->getThreadStaticBaseSlowInfo(addr);
+    API_LEAVE(getThreadStaticBaseSlowInfo);
+}
+
+int WrapICorJitInfo::getEnsureClassCtorRunAndReturnThreadStaticBaseHelper(
+          CORINFO_CLASS_HANDLE cls,
+          CORINFO_CONST_LOOKUP* addr,
+          CORINFO_CONST_LOOKUP* targetSymbol)
+{
+    API_ENTER(getEnsureClassCtorRunAndReturnThreadStaticBaseHelper);
+    int temp = wrapHnd->getEnsureClassCtorRunAndReturnThreadStaticBaseHelper(cls, addr, targetSymbol);
+    API_LEAVE(getEnsureClassCtorRunAndReturnThreadStaticBaseHelper);
+    return temp;
+}
+
 bool WrapICorJitInfo::isFieldStatic(
           CORINFO_FIELD_HANDLE fldHnd)
 {

src/coreclr/jit/codegenxarch.cpp

@@ -610,6 +610,11 @@ void CodeGen::genSetRegToConst(regNumber targetReg, var_types targetType, GenTre
                 attr = EA_SET_FLG(attr, EA_BYREF_FLG);
             }
 
+            if (con->IsIconHandle(GTF_ICON_SECREL_OFFSET))
+            {
+                attr = EA_SET_FLG(attr, EA_CNS_SEC_RELOC);
+            }
+
             instGen_Set_Reg_To_Imm(attr, targetReg, cnsVal,
                                    INS_FLAGS_DONT_CARE DEBUGARG(con->gtTargetHandle) DEBUGARG(con->gtFlags));
             regSet.verifyRegUsed(targetReg);

src/coreclr/jit/compiler.h

@@ -5355,6 +5355,7 @@ class Compiler
 
     PhaseStatus fgExpandThreadLocalAccess();
     bool fgExpandThreadLocalAccessForCall(BasicBlock** pBlock, Statement* stmt, GenTreeCall* call);
+    bool fgExpandThreadLocalAccessForCallReadyToRun(BasicBlock** pBlock, Statement* stmt, GenTreeCall* call);
 
     PhaseStatus fgExpandStaticInit();
     bool fgExpandStaticInitForCall(BasicBlock** pBlock, Statement* stmt, GenTreeCall* call);

src/coreclr/jit/emit.h

@@ -1017,7 +1017,7 @@ class emitter
                 return iiaJmpOffset;
             }
 #endif // defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
-
+            bool isSecRel;
         } _idAddrUnion;
 
         /* Trivial wrappers to return properly typed enums */

src/coreclr/jit/emitxarch.cpp

@@ -5818,6 +5818,11 @@ void emitter::emitIns_R_I(instruction ins,
     id->idDebugOnlyInfo()->idMemCookie = targetHandle;
 #endif
 
+    if (emitComp->opts.IsReadyToRun() && EA_IS_CNS_SEC_RELOC(attr))
+    {
+        id->idAddr()->isSecRel = true;
+    }
+
     if (isSimdInsAndValInByte)
     {
         bool includeRexPrefixSize = true;
@@ -15147,7 +15152,12 @@ BYTE* emitter::emitOutputRI(BYTE* dst, instrDesc* id)
 
         if (id->idIsCnsReloc())
         {
-            emitRecordRelocation((void*)(dst - (unsigned)EA_SIZE(size)), (void*)(size_t)val, IMAGE_REL_BASED_MOFFSET);
+            uint16_t relocationType = IMAGE_REL_BASED_MOFFSET;
+            if (emitComp->opts.IsReadyToRun() && id->idAddr()->isSecRel)
+            {
+                relocationType = IMAGE_REL_SECREL;
+            }
+            emitRecordRelocation((void*)(dst - (unsigned)EA_SIZE(size)), (void*)(size_t)val, relocationType);
         }
 
         goto DONE;

src/coreclr/jit/gentree.h

@@ -534,6 +534,7 @@ enum GenTreeFlags : unsigned int
     GTF_ICON_STATIC_BOX_PTR     = 0x10000000, // GT_CNS_INT -- constant is an address of the box for a STATIC_IN_HEAP field
     GTF_ICON_FIELD_SEQ          = 0x11000000, // <--------> -- constant is a FieldSeq* (used only as VNHandle)
     GTF_ICON_STATIC_ADDR_PTR    = 0x13000000, // GT_CNS_INT -- constant is a pointer to a static base address
+    GTF_ICON_SECREL_OFFSET      = 0x14000000, // GT_CNS_INT -- constant is an offset in a certain section.
 
  // GTF_ICON_REUSE_REG_VAL      = 0x00800000  // GT_CNS_INT -- GTF_REUSE_REG_VAL, defined above
     GTF_ICON_SIMD_COUNT         = 0x00200000, // GT_CNS_INT -- constant is Vector<T>.Count
@@ -4059,6 +4060,7 @@ enum GenTreeCallFlags : unsigned int
     GTF_CALL_M_HAS_LATE_DEVIRT_INFO    = 0x10000000, // this call has late devirtualzation info
     GTF_CALL_M_LDVIRTFTN_INTERFACE     = 0x20000000, // ldvirtftn on an interface type
     GTF_CALL_M_EXP_TLS_ACCESS          = 0x40000000, // this call is a helper for access TLS marked field
+    GTF_CALL_M_EXP_TLS_ACCESS_LAZY     = 0x80000000, // this call is a helper for access TLS marked field and has lazy ctor
 };
 
 inline constexpr GenTreeCallFlags operator ~(GenTreeCallFlags a)
@@ -5409,6 +5411,21 @@ struct GenTreeCall final : public GenTree
         return (gtCallMoreFlags & GTF_CALL_M_EXP_TLS_ACCESS) != 0;
     }
 
+    void SetExpTLSFieldAccessLazyCtor()
+    {
+        gtCallMoreFlags |= GTF_CALL_M_EXP_TLS_ACCESS_LAZY;
+    }
+
+    void ClearExpTLSFieldAccessLazyCtor()
+    {
+        gtCallMoreFlags &= ~GTF_CALL_M_EXP_TLS_ACCESS_LAZY;
+    }
+
+    bool IsExpTLSFieldAccessLazyCtor() const
+    {
+        return (gtCallMoreFlags & GTF_CALL_M_EXP_TLS_ACCESS_LAZY) != 0;
+    }
+
     void SetExpandedEarly()
     {
         gtCallMoreFlags |= GTF_CALL_M_EXPANDED_EARLY;