Update Type Encoding for MulticoreJit

dotnet · Oct 20, 2020 · e26951b · e26951b
1 parent ddb67b3
commit e26951b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/src/coreclr/src/vm/compile.cpp b/src/coreclr/src/vm/compile.cpp
@@ -1168,6 +1168,8 @@ void CEECompileInfo::EncodeMethod(
     STANDARD_VM_CONTRACT;
 
     COOPERATIVE_TRANSITION_BEGIN();
+
+    _ASSERTE(referencingModule);
     MethodDesc *pMethod = GetMethod(handle);
 
     BOOL fSuccess;

diff --git a/src/coreclr/src/vm/multicorejit.cpp b/src/coreclr/src/vm/multicorejit.cpp
@@ -404,7 +404,7 @@ HRESULT MulticoreJitRecorder::WriteOutput(IStream * pStream)
             BOOL fSuccess = false;
             EX_TRY
             {
-                fSuccess = ZapSig::EncodeMethod(pMethod, NULL, &sigBuilder, (LPVOID)this, (ENCODEMODULE_CALLBACK)MulticoreJitManager::EncodeModuleHelper, (DEFINETOKEN_CALLBACK)MulticoreJitManager::TokenDefinitionHelper);
+                fSuccess = ZapSig::EncodeMethod(pMethod, NULL, &sigBuilder, (LPVOID)this, (ENCODEMODULE_CALLBACK)MulticoreJitManager::EncodeModuleHelper, NULL);
             }
             EX_CATCH
             {
@@ -1547,12 +1547,6 @@ DWORD MulticoreJitManager::EncodeModuleHelper(void * pModuleContext, Module * pR
     return ((MulticoreJitRecorder*)pModuleContext)->EncodeModule(pReferencedModule);
 }
 
-// static
-void MulticoreJitManager::TokenDefinitionHelper(void* pModuleContext, Module *pReferencedModule, DWORD index, mdToken* pToken)
-{
-    LIMITED_METHOD_CONTRACT
-}
-
 //---------------------------------------------------------------------------------------
 //
 // MultiCore JIT

diff --git a/src/coreclr/src/vm/multicorejit.h b/src/coreclr/src/vm/multicorejit.h
@@ -304,11 +304,6 @@ class MulticoreJitManager
     static DWORD EncodeModuleHelper(void * pModuleContext,
                                     Module * pReferencedModule);
 
-    static void TokenDefinitionHelper(void* pModuleContext,
-                                      Module *pReferencedModule,
-                                      DWORD index,
-                                      mdToken* pToken);
-
     static Module * DecodeModuleFromIndex(void * pModuleContext,
                                           DWORD  ix);
 };

diff --git a/src/coreclr/src/vm/zapsig.cpp b/src/coreclr/src/vm/zapsig.cpp
@@ -244,12 +244,10 @@ BOOL ZapSig::GetSignatureForTypeHandle(TypeHandle      handle,
 
         // During IBC profiling this calls
         //     code:Module::TokenDefinitionHelper
-        // During MulticoreJit profiling this calls
-        //     code:MulticoreJitManager::TokenDefinitionHelper
         (*this->pfnTokenDefinition)(this->context.pModuleContext, pTypeHandleModule, index, &token);
 
         // ibcExternalType tokens are actually encoded as mdtTypeDef tokens in the signature
-        _ASSERTE(this->context.externalTokens != ZapSig::MulticoreJitTokens && TypeFromToken(token) == ibcExternalType);
+        _ASSERTE(TypeFromToken(token) == ibcExternalType);
         token = TokenFromRid(RidFromToken(token), mdtTypeDef);
     }
 
@@ -1234,7 +1232,7 @@ BOOL ZapSig::EncodeMethod(
     }
 
     ZapSig::ExternalTokens externalTokens = ZapSig::NormalTokens;
-    if (pInfoModule == NULL && pfnDefineToken != NULL)
+    if (pInfoModule == NULL)
     {
         externalTokens = ZapSig::MulticoreJitTokens;
         pInfoModule = pMethod->GetModule_NoLogging();

diff --git a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.cs b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.cs
@@ -4,10 +4,19 @@
 using System;
 using System.Runtime;
 using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 public static class BasicTest
 {
+    public class MCJTestClass
+    {
+    }
+
+    public struct MCJTestStruct
+    {
+    }
+
     private static int Main()
     {
         const int Pass = 100;
@@ -18,10 +27,22 @@ private static int Main()
         // Let multi-core JIT start jitting
         Thread.Sleep(100);
 
-        PromoteToTier1(Foo, () => FooWithLoop(2), () => FooWithGeneric<int>(2));
+        MCJTestStruct s;
+        PromoteToTier1(Foo, () => FooWithLoop(2), () => FooWithGeneric<int>(3),
+                       () => FooWithGeneric<string>("MCJ"),
+                       () => FooWithGeneric<MCJTestClass>(null),
+                       () => FooWithGeneric<MCJTestStruct>(s),
+                       () => FooWithGeneric<Regex>(null),
+                       () => FooWithGeneric(RegexOptions.IgnoreCase));
+
         Foo();
         FooWithLoop(2);
-        FooWithGeneric<int>(2);
+        FooWithGeneric<int>(3);
+        FooWithGeneric<string>("MCJ");
+        FooWithGeneric<MCJTestClass>(null);
+        FooWithGeneric<MCJTestStruct>(s);
+        FooWithGeneric<Regex>(null);
+        FooWithGeneric(RegexOptions.IgnoreCase);
 
         ProfileOptimization.StartProfile(null);
         return Pass;
@@ -37,7 +58,6 @@ private static void Foo2()
     {
     }
 
-
     [MethodImpl(MethodImplOptions.NoInlining)]
     private static int FooWithLoop(int n)
     {