Add ability for crossgen2 to synthesize PGO histograms

Add an option --synthesize-random-mibc. When passed, crossgen2 will use metadata from the compilation group to synthesize PGO histograms for methods that did not have any input profile data. Mainly for testing purposes. Currently only works in R2R mode, but hopefully will also work to embed random static PGO data in the future.
dotnet · Oct 31, 2022 · 255a128 · 255a128
1 parent 30d8593
commit 255a128
Show file tree

Hide file tree

Showing 9 changed files with 302 additions and 73 deletions.
diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
@@ -3919,11 +3919,6 @@ private uint getJitFlags(ref CORJIT_FLAGS flags, uint sizeInBytes)
             return (uint)sizeof(CORJIT_FLAGS);
         }
 
-        private PgoSchemaElem[] getPgoInstrumentationResults(MethodDesc method)
-        {
-            return _compilation.ProfileData[method]?.SchemaData;
-        }
-
         private MemoryStream _cachedMemoryStream = new MemoryStream();
 
         public static void ComputeJitPgoInstrumentationSchema(Func<object, IntPtr> objectToHandle, PgoSchemaElem[] pgoResultsSchemas, out PgoInstrumentationSchema[] nativeSchemas, MemoryStream instrumentationData, Func<TypeDesc, bool> typeFilter = null)
@@ -4001,7 +3996,11 @@ private HRESULT getPgoInstrumentationResults(CORINFO_METHOD_STRUCT_* ftnHnd, ref
 
             if (!_pgoResults.TryGetValue(methodDesc, out PgoInstrumentationResults pgoResults))
             {
-                var pgoResultsSchemas = getPgoInstrumentationResults(methodDesc);
+#if READYTORUN
+                PgoSchemaElem[] pgoResultsSchemas = _compilation.ProfileData.GetAllowSynthesis(_compilation, methodDesc)?.SchemaData;
+#else
+                PgoSchemaElem[] pgoResultsSchemas = _compilation.ProfileData[methodDesc]?.SchemaData;
+#endif
                 if (pgoResultsSchemas == null)
                 {
                     pgoResults.hr = HRESULT.E_NOTIMPL;

diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ProfileData.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ProfileData.cs
@@ -62,11 +62,8 @@ public abstract class ProfileData
         public abstract IEnumerable<MethodProfileData> GetAllMethodProfileData();
         public abstract byte[] GetMethodBlockCount(MethodDesc m);
 
-        public static void MergeProfileData(ref bool partialNgen, Dictionary<MethodDesc, MethodProfileData> mergedProfileData, ProfileData profileData)
+        public static void MergeProfileData(Dictionary<MethodDesc, MethodProfileData> mergedProfileData, ProfileData profileData)
         {
-            if (profileData.PartialNGen)
-                partialNgen = true;
-
             PgoSchemaElem[][] schemaElemMergerArray = new PgoSchemaElem[2][];
 
             foreach (MethodProfileData data in profileData.GetAllMethodProfileData())

diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ProfileDataManager.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ProfileDataManager.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCompilationModuleGroupBase.cs
@@ -509,7 +509,7 @@ private bool CrossModuleInlineableInternal(MethodDesc method)
             return _crossModuleInlineableCache.GetOrAdd(method, _crossModuleInlineableCacheUncached);
         }
 
-        private bool CrossModuleInlineableUncached(MethodDesc method)
+        private bool CrossModuleInlineableUncached(MethodDesc method) 
         {
             // Defined in corelib
             MetadataType owningMetadataType = method.OwningType.GetTypeDefinition() as MetadataType;

diff --git a/...ools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunSingleAssemblyCompilationModuleGroup.cs b/...ools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunSingleAssemblyCompilationModuleGroup.cs
@@ -29,7 +29,7 @@ public sealed override bool ContainsMethodBody(MethodDesc method, bool unboxingS
 
             if (_profileGuidedCompileRestriction != null)
             {
-                if (!_profileGuidedCompileRestriction.IsMethodInProfileData(method))
+                if (!_profileGuidedCompileRestriction.IsMethodInInputProfileData(method))
                     return false;
             }
 

diff --git a/src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/ProfileDataManager.cs b/src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/ProfileDataManager.cs
@@ -26,12 +26,10 @@ public ProfileDataManager(IEnumerable<string> mibcFiles,
                 }
             }
 
-            bool dummy = false;
-
             // Merge all data together
             foreach (ProfileData profileData in _inputData)
             {
-                ProfileData.MergeProfileData(ref dummy, _mergedProfileData, profileData);
+                ProfileData.MergeProfileData(_mergedProfileData, profileData);
             }
         }
 

diff --git a/src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs b/src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs
@@ -178,6 +178,8 @@ internal class Crossgen2RootCommand : RootCommand
             new(new[] { "--make-repro-path" }, "Path where to place a repro package");
         public Option<bool> HotColdSplitting { get; } =
             new(new[] { "--hot-cold-splitting" }, SR.HotColdSplittingOption);
+        public Option<bool> SynthesizeRandomMibc { get; } =
+            new(new[] { "--synthesize-random-mibc" });
 
         public bool CompositeOrInputBubble { get; private set; }
         public OptimizationMode OptimizationMode { get; private set; }
@@ -243,6 +245,7 @@ public Crossgen2RootCommand(string[] args) : base(SR.Crossgen2BannerText)
             AddOption(CallChainProfileFile);
             AddOption(MakeReproPath);
             AddOption(HotColdSplitting);
+            AddOption(SynthesizeRandomMibc);
 
             this.SetHandler(context =>
             {

diff --git a/src/coreclr/tools/aot/crossgen2/Program.cs b/src/coreclr/tools/aot/crossgen2/Program.cs
@@ -503,7 +503,8 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru
                         compilationGroup,
                         Get(_command.EmbedPgoData),
                         Get(_command.SupportIbc),
-                        crossModuleInlineableCode.Count == 0 ? compilationGroup.VersionsWithMethodBody : compilationGroup.CrossModuleInlineable);
+                        crossModuleInlineableCode.Count == 0 ? compilationGroup.VersionsWithMethodBody : compilationGroup.CrossModuleInlineable,
+                        Get(_command.SynthesizeRandomMibc));
 
                     bool partial = Get(_command.Partial);
                     compilationGroup.ApplyProfileGuidedOptimizationData(profileDataManager, partial);

diff --git a/src/coreclr/tools/dotnet-pgo/Program.cs b/src/coreclr/tools/dotnet-pgo/Program.cs
@@ -428,13 +428,12 @@ private int InnerMergeMain()
             {
                 var tsc = new TypeRefTypeSystem.TypeRefTypeSystemContext(mibcReaders);
 
-                bool partialNgen = false;
                 Dictionary<MethodDesc, MethodProfileData> mergedProfileData = new Dictionary<MethodDesc, MethodProfileData>();
                 for (int i = 0; i < mibcReaders.Length; i++)
                 {
                     var peReader = mibcReaders[i];
                     PrintDetailedMessage($"Merging {paths[i]}");
-                    ProfileData.MergeProfileData(ref partialNgen, mergedProfileData, MIbcProfileParser.ParseMIbcFile(tsc, peReader, assemblyNamesInBubble, onlyDefinedInAssembly: null));
+                    ProfileData.MergeProfileData(mergedProfileData, MIbcProfileParser.ParseMIbcFile(tsc, peReader, assemblyNamesInBubble, onlyDefinedInAssembly: null));
                 }
 
                 MibcConfig mergedConfig = ParseMibcConfigsAndMerge(tsc, mibcReaders);