Universal arm crossgen compiler

src/coreclr/ToolBox/superpmi/mcs/removedup.cpp

@@ -61,7 +61,8 @@ bool RemoveDup::unique(MethodContext* mc)
 
     CORINFO_METHOD_INFO newInfo;
     unsigned            newFlags = 0;
-    mc->repCompileMethod(&newInfo, &newFlags);
+    CORINFO_OS          newOs = CORINFO_WINNT;
+    mc->repCompileMethod(&newInfo, &newFlags, &newOs);
 
     // Assume that there are lots of duplicates, so don't allocate a new buffer for the MD5 hash data
     // until we know we're going to add it to the map.
@@ -95,7 +96,8 @@ bool RemoveDup::uniqueLegacy(MethodContext* mc)
 
     CORINFO_METHOD_INFO newInfo;
     unsigned            newFlags = 0;
-    mc->repCompileMethod(&newInfo, &newFlags);
+    CORINFO_OS          newOs = CORINFO_WINNT;
+    mc->repCompileMethod(&newInfo, &newFlags, &newOs);
 
     if (m_inFileLegacy->GetIndex(newInfo.ILCodeSize) == -1)
         m_inFileLegacy->Add(newInfo.ILCodeSize, new DenseLightWeightMap<MethodContext*>());

src/coreclr/ToolBox/superpmi/mcs/verbdumpmap.cpp

@@ -17,15 +17,17 @@ void DumpMapHeader()
     // printf("process name,");
     printf("method name,");
     printf("full signature,");
-    printf("jit flags\n");
+    printf("jit flags,");
+    printf("os\n");
 }
 
 void DumpMap(int index, MethodContext* mc)
 {
     CORINFO_METHOD_INFO cmi;
     unsigned int        flags = 0;
+    CORINFO_OS          os;
 
-    mc->repCompileMethod(&cmi, &flags);
+    mc->repCompileMethod(&cmi, &flags, &os);
 
     const char* moduleName = nullptr;
     const char* methodName = mc->repGetMethodName(cmi.ftn, &moduleName);
@@ -121,7 +123,7 @@ void DumpMap(int index, MethodContext* mc)
         }
     }
 
-    printf(", %s\n", SpmiDumpHelper::DumpJitFlags(rawFlags).c_str());
+    printf(", %s, %d\n", SpmiDumpHelper::DumpJitFlags(rawFlags).c_str(), (int)os);
 }
 
 int verbDumpMap::DoWork(const char* nameOfInput)

src/coreclr/ToolBox/superpmi/mcs/verbildump.cpp

@@ -927,8 +927,9 @@ void DumpIL(MethodContext* mc)
 {
     CORINFO_METHOD_INFO cmi;
     unsigned int        flags = 0;
+    CORINFO_OS          os    = CORINFO_WINNT;
 
-    mc->repCompileMethod(&cmi, &flags);
+    mc->repCompileMethod(&cmi, &flags, &os);
 
     const char* moduleName = nullptr;
     const char* methodName = mc->repGetMethodName(cmi.ftn, &moduleName);

src/coreclr/ToolBox/superpmi/superpmi-shared/agnostic.h

@@ -48,6 +48,7 @@ struct Agnostic_CompileMethod
 {
     Agnostic_CORINFO_METHOD_INFO info;
     DWORD                        flags;
+    DWORD                        os;
 };
 
 struct Agnostic_InitClass

src/coreclr/ToolBox/superpmi/superpmi-shared/asmdumper.cpp

@@ -8,7 +8,8 @@ void ASMDumper::DumpToFile(HANDLE hFile, MethodContext* mc, CompileResult* cr)
 {
     CORINFO_METHOD_INFO info;
     unsigned            flags = 0;
-    mc->repCompileMethod(&info, &flags);
+    CORINFO_OS          os    = CORINFO_WINNT;
+    mc->repCompileMethod(&info, &flags, &os);
 
 #define bufflen 4096
     DWORD bytesWritten;

src/coreclr/ToolBox/superpmi/superpmi-shared/icorjitcompilerimpl.h

@@ -47,4 +47,6 @@ void getVersionIdentifier(GUID* versionIdentifier /* OUT */
 // intrinsics, so the EE should use the default size (i.e. the size of the IL implementation).
 unsigned getMaxIntrinsicSIMDVectorLength(CORJIT_FLAGS cpuCompileFlags); /* { return 0; } */
 
+// Used to specify which OS a JIT should be compiled for. Currently expected to only be called once pre process
+void setJitOs(CORINFO_OS os);
 #endif

src/coreclr/ToolBox/superpmi/superpmi-shared/methodcontext.cpp

@@ -384,11 +384,13 @@ bool MethodContext::Equal(MethodContext* other)
     // Compare MethodInfo's first.
     CORINFO_METHOD_INFO otherInfo;
     unsigned            otherFlags = 0;
-    other->repCompileMethod(&otherInfo, &otherFlags);
+    CORINFO_OS          otherOs    = CORINFO_WINNT;
+    other->repCompileMethod(&otherInfo, &otherFlags, &otherOs);
 
     CORINFO_METHOD_INFO ourInfo;
     unsigned            ourFlags = 0;
-    repCompileMethod(&ourInfo, &ourFlags);
+    CORINFO_OS          ourOs    = CORINFO_WINNT;
+    repCompileMethod(&ourInfo, &ourFlags, &ourOs);
 
     if (otherInfo.ILCodeSize != ourInfo.ILCodeSize)
         return false;
@@ -419,6 +421,8 @@ bool MethodContext::Equal(MethodContext* other)
         return false;
     if (otherFlags != ourFlags)
         return false;
+    if (otherOs != ourOs)
+        return false;
 
 // Now compare the other maps to "estimate" equality.
 
@@ -643,7 +647,7 @@ unsigned int toCorInfoSize(CorInfoType cit)
     return -1;
 }
 
-void MethodContext::recCompileMethod(CORINFO_METHOD_INFO* info, unsigned flags)
+void MethodContext::recCompileMethod(CORINFO_METHOD_INFO* info, unsigned flags, CORINFO_OS os)
 {
     if (CompileMethod == nullptr)
         CompileMethod = new LightWeightMap<DWORD, Agnostic_CompileMethod>();
@@ -662,21 +666,23 @@ void MethodContext::recCompileMethod(CORINFO_METHOD_INFO* info, unsigned flags)
     value.info.args   = SpmiRecordsHelper::StoreAgnostic_CORINFO_SIG_INFO(info->args, CompileMethod, SigInstHandleMap);
     value.info.locals = SpmiRecordsHelper::StoreAgnostic_CORINFO_SIG_INFO(info->locals, CompileMethod, SigInstHandleMap);
 
+    value.os = (DWORD)os;
+
     value.flags = (DWORD)flags;
 
     CompileMethod->Add(0, value);
     DEBUG_REC(dmpCompileMethod(0, value));
 }
 void MethodContext::dmpCompileMethod(DWORD key, const Agnostic_CompileMethod& value)
 {
-    printf("CompileMethod key %u, value ftn-%016llX scp-%016llX ilo-%u ils-%u ms-%u ehc-%u opt-%u rk-%u args-%s locals-%s flg-%08X",
+    printf("CompileMethod key %u, value ftn-%016llX scp-%016llX ilo-%u ils-%u ms-%u ehc-%u opt-%u rk-%u args-%s locals-%s flg-%08X os-%u",
            key, value.info.ftn, value.info.scope, value.info.ILCode_offset, value.info.ILCodeSize, value.info.maxStack,
            value.info.EHcount, value.info.options, value.info.regionKind,
            SpmiDumpHelper::DumpAgnostic_CORINFO_SIG_INFO(value.info.args, CompileMethod, SigInstHandleMap).c_str(),
            SpmiDumpHelper::DumpAgnostic_CORINFO_SIG_INFO(value.info.locals, CompileMethod, SigInstHandleMap).c_str(),
-           value.flags);
+           value.flags, value.os);
 }
-void MethodContext::repCompileMethod(CORINFO_METHOD_INFO* info, unsigned* flags)
+void MethodContext::repCompileMethod(CORINFO_METHOD_INFO* info, unsigned* flags, CORINFO_OS* os)
 {
     AssertMapAndKeyExistNoMessage(CompileMethod, 0);
 
@@ -699,6 +705,7 @@ void MethodContext::repCompileMethod(CORINFO_METHOD_INFO* info, unsigned* flags)
     info->locals = SpmiRecordsHelper::Restore_CORINFO_SIG_INFO(value.info.locals, CompileMethod, SigInstHandleMap);
 
     *flags             = (unsigned)value.flags;
+    *os                = (CORINFO_OS)value.os;
 }
 
 void MethodContext::recGetMethodClass(CORINFO_METHOD_HANDLE methodHandle, CORINFO_CLASS_HANDLE classHandle)
@@ -4188,7 +4195,9 @@ void MethodContext::repGetEEInfo(CORINFO_EE_INFO* pEEInfoOut)
         pEEInfoOut->osPageSize                                 = (size_t)0x1000;
         pEEInfoOut->maxUncheckedOffsetForNullObject            = (size_t)((32 * 1024) - 1);
         pEEInfoOut->targetAbi                                  = CORINFO_DESKTOP_ABI;
-#ifdef TARGET_UNIX
+#ifdef TARGET_OSX
+        pEEInfoOut->osType                                     = CORINFO_MACOS;
+#elif defined(TARGET_UNIX)
         pEEInfoOut->osType                                     = CORINFO_UNIX;
 #else
         pEEInfoOut->osType                                     = CORINFO_WINNT;
@@ -6848,7 +6857,8 @@ int MethodContext::dumpMethodIdentityInfoToBuffer(char* buff, int len, bool igno
     }
     else
     {
-        repCompileMethod(&info, &flags);
+        CORINFO_OS os;
+        repCompileMethod(&info, &flags, &os);
         pInfo = &info;
     }
 
@@ -6982,7 +6992,8 @@ bool MethodContext::hasPgoData(bool& hasEdgeProfile, bool& hasClassProfile, bool
     // Obtain the Method Info structure for this method
     CORINFO_METHOD_INFO  info;
     unsigned             flags = 0;
-    repCompileMethod(&info, &flags);
+    CORINFO_OS os;
+    repCompileMethod(&info, &flags, &os);
 
     if ((GetPgoInstrumentationResults != nullptr) &&
         (GetPgoInstrumentationResults->GetIndex(CastHandle(info.ftn)) != -1))

src/coreclr/ToolBox/superpmi/superpmi-shared/methodcontext.h

@@ -109,9 +109,9 @@ class MethodContext
 
     void dmpEnvironment(DWORD key, const Agnostic_Environment& value);
 
-    void recCompileMethod(CORINFO_METHOD_INFO* info, unsigned flags);
+    void recCompileMethod(CORINFO_METHOD_INFO* info, unsigned flags, CORINFO_OS os);
     void dmpCompileMethod(DWORD key, const Agnostic_CompileMethod& value);
-    void repCompileMethod(CORINFO_METHOD_INFO* info, unsigned* flags);
+    void repCompileMethod(CORINFO_METHOD_INFO* info, unsigned* flags, CORINFO_OS* os);
 
     void recGetMethodClass(CORINFO_METHOD_HANDLE methodHandle, CORINFO_CLASS_HANDLE classHandle);
     void dmpGetMethodClass(DWORDLONG key, DWORDLONG value);

src/coreclr/ToolBox/superpmi/superpmi-shim-collector/icorjitcompiler.cpp

@@ -10,6 +10,14 @@
 
 #define fatMC                               // this is nice to have on so ildump works...
 
+CORINFO_OS g_currentOs =     CORINFO_WINNT;
+
+void interceptor_ICJC::setJitOs(CORINFO_OS os)
+{
+    g_currentOs = os;
+    original_ICorJitCompiler->setJitOs(os);
+}
+
 CorJitResult interceptor_ICJC::compileMethod(ICorJitInfo*                comp,     /* IN */
                                              struct CORINFO_METHOD_INFO* info,     /* IN */
                                              unsigned /* code:CorJitFlag */ flags, /* IN */
@@ -24,7 +32,7 @@ CorJitResult interceptor_ICJC::compileMethod(ICorJitInfo*                comp,
     our_ICorJitInfo.mc = mc;
     our_ICorJitInfo.mc->cr->recProcessName(GetCommandLineA());
 
-    our_ICorJitInfo.mc->recCompileMethod(info, flags);
+    our_ICorJitInfo.mc->recCompileMethod(info, flags, g_currentOs);
 
     // force some extra data into our tables..
     // data probably not needed with RyuJIT, but needed in 4.5 and 4.5.1 to help with catching cached values

src/coreclr/ToolBox/superpmi/superpmi-shim-counter/icorjitcompiler.cpp

@@ -5,6 +5,11 @@
 #include "icorjitcompiler.h"
 #include "icorjitinfo.h"
 
+void interceptor_ICJC::setJitOs(CORINFO_OS os)
+{
+    original_ICorJitCompiler->setJitOs(os);
+}
+
 CorJitResult interceptor_ICJC::compileMethod(ICorJitInfo*                comp,            /* IN */
                                              struct CORINFO_METHOD_INFO* info,            /* IN */
                                              unsigned /* code:CorJitFlag */ flags,        /* IN */

src/coreclr/ToolBox/superpmi/superpmi-shim-simple/icorjitcompiler.cpp

@@ -5,6 +5,11 @@
 #include "icorjitcompiler.h"
 #include "icorjitinfo.h"
 
+void interceptor_ICJC::setJitOs(CORINFO_OS os)
+{
+    original_ICorJitCompiler->setJitOs(os);
+}
+
 CorJitResult interceptor_ICJC::compileMethod(ICorJitInfo*                comp,     /* IN */
                                              struct CORINFO_METHOD_INFO* info,     /* IN */
                                              unsigned /* code:CorJitFlag */ flags, /* IN */

src/coreclr/ToolBox/superpmi/superpmi/jitinstance.cpp

@@ -303,14 +303,16 @@ JitInstance::Result JitInstance::CompileMethod(MethodContext* MethodToCompile, i
 
     PAL_TRY(Param*, pParam, &param)
     {
-        uint8_t* NEntryBlock    = nullptr;
-        uint32_t NCodeSizeBlock = 0;
+        uint8_t*   NEntryBlock    = nullptr;
+        uint32_t   NCodeSizeBlock = 0;
+        CORINFO_OS os             = CORINFO_WINNT;
 
-        pParam->pThis->mc->repCompileMethod(&pParam->info, &pParam->flags);
+        pParam->pThis->mc->repCompileMethod(&pParam->info, &pParam->flags, &os);
         if (pParam->collectThroughput)
         {
             pParam->pThis->lt.Start();
         }
+        pParam->pThis->pJitInstance->setJitOs(os);
         CorJitResult jitResult = pParam->pThis->pJitInstance->compileMethod(pParam->pThis->icji, &pParam->info,
                                                                        pParam->flags, &NEntryBlock, &NCodeSizeBlock);
         if (pParam->collectThroughput)

src/coreclr/ToolBox/superpmi/superpmi/methodstatsemitter.cpp

@@ -60,7 +60,8 @@ void MethodStatsEmitter::Emit(int methodNumber, MethodContext* mc, ULONGLONG fir
             // Obtain the IL code size for this method
             CORINFO_METHOD_INFO info;
             unsigned            flags = 0;
-            mc->repCompileMethod(&info, &flags);
+            CORINFO_OS          os    = CORINFO_WINNT;
+            mc->repCompileMethod(&info, &flags, &os);
 
             charCount += sprintf_s(rowData + charCount, _countof(rowData) - charCount, "%d,", info.ILCodeSize);
         }

src/coreclr/ToolBox/superpmi/superpmi/neardiffer.cpp

@@ -930,7 +930,8 @@ bool NearDiffer::compareVars(MethodContext* mc, CompileResult* cr1, CompileResul
 
     CORINFO_METHOD_INFO info;
     unsigned            flags = 0;
-    mc->repCompileMethod(&info, &flags);
+    CORINFO_OS          os    = CORINFO_WINNT;
+    mc->repCompileMethod(&info, &flags, &os);
 
     bool set1 = cr1->repSetVars(&ftn_1, &cVars_1, &vars_1);
     bool set2 = cr2->repSetVars(&ftn_2, &cVars_2, &vars_2);
@@ -1003,7 +1004,8 @@ bool NearDiffer::compareBoundaries(MethodContext* mc, CompileResult* cr1, Compil
 
     CORINFO_METHOD_INFO info;
     unsigned            flags = 0;
-    mc->repCompileMethod(&info, &flags);
+    CORINFO_OS          os    = CORINFO_WINNT;
+    mc->repCompileMethod(&info, &flags, &os);
 
     bool set1 = cr1->repSetBoundaries(&ftn_1, &cMap_1, &map_1);
     bool set2 = cr2->repSetBoundaries(&ftn_2, &cMap_2, &map_2);

src/coreclr/clrdefinitions.cmake

@@ -244,7 +244,10 @@ function(set_target_definitions_to_custom_os_and_arch)
     if ((TARGETDETAILS_ARCH STREQUAL "arm64") AND (TARGETDETAILS_OS STREQUAL "unix_osx"))
       target_compile_definitions(${TARGETDETAILS_TARGET} PRIVATE OSX_ARM64_ABI)
     endif()
-  else()
+    if (TARGETDETAILS_OS STREQUAL "unix_osx")
+      target_compile_definitions(${TARGETDETAILS_TARGET} PRIVATE TARGET_OSX)
+    endif()
+  elseif (TARGETDETAILS_OS STREQUAL "win")
     target_compile_definitions(${TARGETDETAILS_TARGET} PRIVATE TARGET_WINDOWS)
   endif((TARGETDETAILS_OS MATCHES "^unix"))
 

src/coreclr/crosscomponents.cmake

@@ -2,27 +2,33 @@
 
 if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
     install_clr (TARGETS
-        clrjit
-        DESTINATIONS . sharedFramework
-        COMPONENT crosscomponents
-    )
-    install_clr (TARGETS
-        clrjit
         jitinterface_${ARCH_HOST_NAME}
         DESTINATIONS .
         COMPONENT crosscomponents
     )
 
-    if(CLR_CMAKE_TARGET_OSX AND ARCH_TARGET_NAME STREQUAL arm64)
+    if (CLR_CMAKE_TARGET_OSX AND ARCH_TARGET_NAME STREQUAL arm64)
+        install_clr (TARGETS
+            clrjit_universal_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
+            DESTINATIONS .
+            COMPONENT crosscomponents
+        )
+    elseif (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64)
         install_clr (TARGETS
-            clrjit_unix_osx_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
-            DESTINATIONS . sharedFramework
+            clrjit_universal_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
+            DESTINATIONS .
             COMPONENT crosscomponents
         )
     elseif (CLR_CMAKE_TARGET_UNIX)
         install_clr (TARGETS
             clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
-            DESTINATIONS . sharedFramework
+            DESTINATIONS .
+            COMPONENT crosscomponents
+        )
+    else()
+        install_clr (TARGETS
+            clrjit_win_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME}
+            DESTINATIONS .
             COMPONENT crosscomponents
         )
     endif()

src/coreclr/gcinfo/CMakeLists.txt

@@ -64,16 +64,18 @@ else()
 set(TARGET_OS_NAME win)
 endif()
 
+# For clrjit we need to build an exact targetted gcinfo instead of the universal one
+if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_ARM)
+  create_gcinfo_lib(TARGET gcinfo_${TARGET_OS_NAME}_${ARCH_TARGET_NAME} OS ${TARGET_OS_NAME} ARCH ${ARCH_TARGET_NAME})
+endif()
+
 if (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
-  create_gcinfo_lib(TARGET gcinfo_unix_arm64 OS unix ARCH arm64)
+  create_gcinfo_lib(TARGET gcinfo_universal_arm64 OS universal ARCH arm64)
   create_gcinfo_lib(TARGET gcinfo_unix_x64 OS unix ARCH x64)
-  create_gcinfo_lib(TARGET gcinfo_win_arm64 OS win ARCH arm64)
   create_gcinfo_lib(TARGET gcinfo_win_x64 OS win ARCH x64)
 endif (CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
 
-create_gcinfo_lib(TARGET gcinfo_unix_armel OS unix ARCH armel)
-create_gcinfo_lib(TARGET gcinfo_unix_arm OS unix ARCH arm)
-create_gcinfo_lib(TARGET gcinfo_win_arm OS win ARCH arm)
+create_gcinfo_lib(TARGET gcinfo_universal_arm OS universal ARCH arm)
 create_gcinfo_lib(TARGET gcinfo_win_x86 OS win ARCH x86)
 
 if (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)

src/coreclr/gcinfo/gcinfoencoder.cpp

@@ -10,6 +10,7 @@
 #include <stdint.h>
 
 #include "gcinfoencoder.h"
+#include "targetosarch.h"
 
 #ifdef _DEBUG
     #ifndef LOGGING
@@ -577,10 +578,11 @@ GcSlotId GcInfoEncoder::GetStackSlotId( INT32 spOffset, GcSlotFlags flags, GcSta
 
     _ASSERTE( (flags & (GC_SLOT_IS_REGISTER | GC_SLOT_IS_DELETED)) == 0 );
 
-#if !defined(OSX_ARM64_ABI)
-    // the spOffset for the stack slot is required to be pointer size aligned
-    _ASSERTE((spOffset % TARGET_POINTER_SIZE) == 0);
-#endif
+    if (!(TargetOS::IsMacOS && TargetArchitecture::IsArm64))
+    {
+        // the spOffset for the stack slot is required to be pointer size aligned
+        _ASSERTE((spOffset % TARGET_POINTER_SIZE) == 0);
+    }
 
     m_SlotTable[ m_NumSlots ].Slot.Stack.SpOffset = spOffset;
     m_SlotTable[ m_NumSlots ].Slot.Stack.Base = spBase;