Reuse crossgen2 logic to lay out methods using PGO data

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -13,6 +13,9 @@ namespace ILCompiler.DependencyAnalysis
     public abstract partial class SortableDependencyNode : DependencyNodeCore<NodeFactory>, ISortableNode
     {
 #if !SUPPORT_JIT
+        // Custom sort order. Used to override the default sorting mechanics.
+        public int CustomSort = int.MaxValue;
+
         /// <summary>
         /// Allows grouping of <see cref="ObjectNode"/> instances such that all nodes in a lower phase
         /// will be ordered before nodes in a later phase.
@@ -148,8 +151,6 @@ public int Compare(DependencyNodeCore<NodeFactory> x1, DependencyNodeCore<NodeFa
             }
         }
 
-        static partial void ApplyCustomSort(SortableDependencyNode x, SortableDependencyNode y, ref int result);
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int CompareImpl(SortableDependencyNode x, SortableDependencyNode y, CompilerComparer comparer)
         {
@@ -158,8 +159,7 @@ public static int CompareImpl(SortableDependencyNode x, SortableDependencyNode y
 
             if (phaseX == phaseY)
             {
-                int customSort = 0;
-                ApplyCustomSort(x, y, ref customSort);
+                int customSort = x.CustomSort.CompareTo(y.CustomSort);
                 if (customSort != 0)
                     return customSort;
 

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunFileLayoutOptimizer.cs

@@ -8,14 +8,20 @@
 using Internal.TypeSystem;
 
 using ILCompiler.DependencyAnalysis;
+#if READYTORUN
 using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
 using ILCompiler.DependencyAnalysisFramework;
 using System.Linq;
 using System.Collections.Immutable;
 using System.Text;
 using System.Reflection.Metadata.Ecma335;
 using ILCompiler.PettisHansenSort;
 
+#if !READYTORUN
+using MethodWithGCInfo = ILCompiler.DependencyAnalysis.MethodCodeNode;
+#endif
+
 namespace ILCompiler
 {
     public enum ReadyToRunMethodLayoutAlgorithm
@@ -24,7 +30,9 @@ public enum ReadyToRunMethodLayoutAlgorithm
         ExclusiveWeight,
         HotCold,
         HotWarmCold,
+#if READYTORUN
         CallFrequency,
+#endif
         PettisHansen,
         Random,
     }
@@ -79,11 +87,13 @@ public ImmutableArray<DependencyNodeCore<NodeFactory>> ApplyProfilerGuidedMethod
             foreach (var methodNode in sortedMethodsList)
             {
                 methodNode.CustomSort = sortOrder;
+#if READYTORUN
                 MethodColdCodeNode methodColdCodeNode = methodNode.ColdCodeNode;
                 if (methodColdCodeNode != null)
                 {
                     methodColdCodeNode.CustomSort = sortOrder + sortedMethodsList.Count;
                 }
+#endif
                 sortOrder++;
             }
 
@@ -164,9 +174,11 @@ int ComputeHotWarmColdRegion(MethodWithGCInfo method)
                     };
                     break;
 
+#if READYTORUN
                 case ReadyToRunMethodLayoutAlgorithm.CallFrequency:
                     methods = MethodCallFrequencySort(methods);
                     break;
+#endif
 
                 case ReadyToRunMethodLayoutAlgorithm.PettisHansen:
                     methods = PettisHansenSort(methods);
@@ -216,6 +228,7 @@ public CallerCalleeCount(MethodDesc caller, MethodDesc callee, int count)
             }
         }
 
+#if READYTORUN
         /// <summary>
         /// Use callchain profile information to generate method ordering. We place
         /// callers and callees by traversing the caller-callee pairs in the callchain
@@ -268,6 +281,7 @@ private List<MethodWithGCInfo> MethodCallFrequencySort(List<MethodWithGCInfo> me
             Debug.Assert(outputMethods.Count == methodsToPlace.Count);
             return outputMethods;
         }
+#endif
 
         /// <summary>
         /// Sort methods with Pettis-Hansen using call graph data from profile.
@@ -303,7 +317,9 @@ private List<MethodWithGCInfo> PettisHansenSort(List<MethodWithGCInfo> methodsTo
 
             if (!any)
             {
+#if READYTORUN
                 _logger.Writer.WriteLine("Warning: no call graph data was found or a .mibc file was not specified. Skipping Pettis Hansen method ordering.");
+#endif
                 return methodsToPlace;
             }
 

src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj

@@ -242,7 +242,6 @@
     <Compile Include="Compiler\DependencyAnalysis\ReadyToRun\VirtualResolutionFixupSignature.cs" />
     <Compile Include="Compiler\DependencyAnalysis\ReadyToRun\Win32ResourcesNode.cs" />
     <Compile Include="Compiler\DependencyAnalysis\ReadyToRunSymbolNodeFactory.cs" />
-    <Compile Include="Compiler\DependencyAnalysis\SortableDependencyNodeCompilerSpecific.cs" />
     <Compile Include="Compiler\DependencyAnalysis\TypeAndMethod.cs" />
     <Compile Include="Compiler\IRootingServiceProvider.cs" />
     <Compile Include="Compiler\ReadyToRunCompilationModuleGroupBase.cs" />

src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/RyuJitCompilation.cs

@@ -25,6 +25,7 @@ public sealed class RyuJitCompilation : Compilation
         private readonly ConditionalWeakTable<Thread, CorInfoImpl> _corinfos = new ConditionalWeakTable<Thread, CorInfoImpl>();
         internal readonly RyuJitCompilationOptions _compilationOptions;
         private readonly ProfileDataManager _profileDataManager;
+        private readonly ReadyToRunFileLayoutOptimizer _fileLayoutOptimizer;
         private readonly MethodImportationErrorProvider _methodImportationErrorProvider;
         private readonly ReadOnlyFieldPolicy _readOnlyFieldPolicy;
         private readonly int _parallelism;
@@ -44,6 +45,8 @@ internal RyuJitCompilation(
             MethodImportationErrorProvider errorProvider,
             ReadOnlyFieldPolicy readOnlyFieldPolicy,
             RyuJitCompilationOptions options,
+            ReadyToRunMethodLayoutAlgorithm methodLayoutAlgorithm,
+            ReadyToRunFileLayoutAlgorithm fileLayoutAlgorithm,
             int parallelism)
             : base(dependencyGraph, nodeFactory, roots, ilProvider, debugInformationProvider, inliningPolicy, logger)
         {
@@ -57,6 +60,8 @@ internal RyuJitCompilation(
             _readOnlyFieldPolicy = readOnlyFieldPolicy;
 
             _parallelism = parallelism;
+
+            _fileLayoutOptimizer = new ReadyToRunFileLayoutOptimizer(logger, methodLayoutAlgorithm, fileLayoutAlgorithm, profileDataManager, nodeFactory);
         }
 
         public ProfileDataManager ProfileData => _profileDataManager;
@@ -89,6 +94,8 @@ protected override void CompileInternal(string outputFile, ObjectDumper dumper)
             _dependencyGraph.ComputeMarkedNodes();
             var nodes = _dependencyGraph.MarkedNodeList;
 
+            nodes = _fileLayoutOptimizer.ApplyProfilerGuidedMethodSort(nodes);
+
             NodeFactory.SetMarkingComplete();
 
             ObjectWritingOptions options = default;

src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/RyuJitCompilationBuilder.cs

@@ -17,6 +17,8 @@ public sealed class RyuJitCompilationBuilder : CompilationBuilder
         // These need to provide reasonable defaults so that the user can optionally skip
         // calling the Use/Configure methods and still get something reasonable back.
         private KeyValuePair<string, string>[] _ryujitOptions = Array.Empty<KeyValuePair<string, string>>();
+        private ReadyToRunMethodLayoutAlgorithm _methodLayoutAlgorithm;
+        private ReadyToRunFileLayoutAlgorithm _fileLayoutAlgorithm;
         private ILProvider _ilProvider = new NativeAotILProvider();
         private ProfileDataManager _profileDataManager;
         private string _jitPath;
@@ -39,6 +41,13 @@ public RyuJitCompilationBuilder UseJitPath(string jitPath)
             return this;
         }
 
+        public RyuJitCompilationBuilder FileLayoutAlgorithms(ReadyToRunMethodLayoutAlgorithm methodLayoutAlgorithm, ReadyToRunFileLayoutAlgorithm fileLayoutAlgorithm)
+        {
+            _methodLayoutAlgorithm = methodLayoutAlgorithm;
+            _fileLayoutAlgorithm = fileLayoutAlgorithm;
+            return this;
+        }
+
         public override CompilationBuilder UseBackendOptions(IEnumerable<string> options)
         {
             var builder = default(ArrayBuilder<KeyValuePair<string, string>>);
@@ -126,7 +135,21 @@ public override ICompilation ToCompilation()
 
             JitConfigProvider.Initialize(_context.Target, jitFlagBuilder.ToArray(), _ryujitOptions, _jitPath);
             DependencyAnalyzerBase<NodeFactory> graph = CreateDependencyGraph(factory, new ObjectNode.ObjectNodeComparer(CompilerComparer.Instance));
-            return new RyuJitCompilation(graph, factory, _compilationRoots, _ilProvider, _debugInformationProvider, _logger, _inliningPolicy ?? _compilationGroup, _instructionSetSupport, _profileDataManager, _methodImportationErrorProvider, _readOnlyFieldPolicy, options, _parallelism);
+            return new RyuJitCompilation(graph,
+                factory,
+                _compilationRoots,
+                _ilProvider,
+                _debugInformationProvider,
+                _logger,
+                _inliningPolicy ?? _compilationGroup,
+                _instructionSetSupport,
+                _profileDataManager,
+                _methodImportationErrorProvider,
+                _readOnlyFieldPolicy,
+                options,
+                _methodLayoutAlgorithm,
+                _fileLayoutAlgorithm,
+                _parallelism);
         }
     }
 }

src/coreclr/tools/aot/ILCompiler.RyuJit/ILCompiler.RyuJit.csproj

@@ -15,6 +15,7 @@
          binaries are up to date and which are stale. -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <Configurations>Debug;Release;Checked</Configurations>
+    <RunAnalyzers>false</RunAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>
@@ -98,5 +99,9 @@
 
     <Compile Include="..\ILCompiler.ReadyToRun\Compiler\ProfileData.cs" Link="Pgo\ProfileData.cs" />
 
+    <Compile Include="..\ILCompiler.ReadyToRun\Compiler\PettisHansenSort\CallGraphNode.cs" Link="Compiler\PettisHansenSort\CallGraphNode.cs" />
+    <Compile Include="..\ILCompiler.ReadyToRun\Compiler\PettisHansenSort\DisjointSetForest.cs" Link="Compiler\PettisHansenSort\DisjointSetForest.cs" />
+    <Compile Include="..\ILCompiler.ReadyToRun\Compiler\PettisHansenSort\PettisHansen.cs" Link="Compiler\PettisHansenSort\PettisHansen.cs" />
+    <Compile Include="..\ILCompiler.ReadyToRun\Compiler\ReadyToRunFileLayoutOptimizer.cs" Link="Compiler\ReadyToRunFileLayoutOptimizer.cs" />
   </ItemGroup>
 </Project>

src/coreclr/tools/aot/ILCompiler/ILCompilerRootCommand.cs

@@ -27,6 +27,10 @@ internal sealed class ILCompilerRootCommand : RootCommand
             new("--optimize-time", "--Ot") { Description = "Enable optimizations, favor code speed" };
         public Option<string[]> MibcFilePaths { get; } =
             new("--mibc", "-m") { DefaultValueFactory = _ => Array.Empty<string>(), Description = "Mibc file(s) for profile guided optimization" };
+        public Option<ReadyToRunMethodLayoutAlgorithm> MethodLayout { get; } =
+            new("--method-layout") { CustomParser = MakeReadyToRunMethodLayoutAlgorithm, DefaultValueFactory = MakeReadyToRunMethodLayoutAlgorithm, Description = "Layout algorithm used by profile-driven optimization for arranging methods in a file.", HelpName = "arg" };
+        public Option<ReadyToRunFileLayoutAlgorithm> FileLayout { get; } =
+            new("--file-layout") { CustomParser = MakeReadyToRunFileLayoutAlgorithm, DefaultValueFactory = MakeReadyToRunFileLayoutAlgorithm, Description = "Layout algorithm used by profile-driven optimization for arranging non-method contents in a file.", HelpName = "arg" };
         public Option<string[]> SatelliteFilePaths { get; } =
             new("--satellite") { DefaultValueFactory = _ => Array.Empty<string>(), Description = "Satellite assemblies associated with inputs/references" };
         public Option<bool> EnableDebugInfo { get; } =
@@ -187,6 +191,8 @@ public ILCompilerRootCommand(string[] args) : base(".NET Native IL Compiler")
             Options.Add(OptimizeSpace);
             Options.Add(OptimizeTime);
             Options.Add(MibcFilePaths);
+            Options.Add(MethodLayout);
+            Options.Add(FileLayout);
             Options.Add(SatelliteFilePaths);
             Options.Add(EnableDebugInfo);
             Options.Add(UseDwarf5);
@@ -411,6 +417,36 @@ private static int MakeParallelism(ArgumentResult result)
             return parallelism;
         }
 
+        private static ReadyToRunMethodLayoutAlgorithm MakeReadyToRunMethodLayoutAlgorithm(ArgumentResult result)
+        {
+            if (result.Tokens.Count == 0)
+                return ReadyToRunMethodLayoutAlgorithm.DefaultSort;
+
+            return result.Tokens[0].Value.ToLowerInvariant() switch
+            {
+                "defaultsort" => ReadyToRunMethodLayoutAlgorithm.DefaultSort,
+                "exclusiveweight" => ReadyToRunMethodLayoutAlgorithm.ExclusiveWeight,
+                "hotcold" => ReadyToRunMethodLayoutAlgorithm.HotCold,
+                "hotwarmcold" => ReadyToRunMethodLayoutAlgorithm.HotWarmCold,
+                "pettishansen" => ReadyToRunMethodLayoutAlgorithm.PettisHansen,
+                "random" => ReadyToRunMethodLayoutAlgorithm.Random,
+                _ => throw new CommandLineException(result.Tokens[0].Value)
+            };
+        }
+
+        private static ReadyToRunFileLayoutAlgorithm MakeReadyToRunFileLayoutAlgorithm(ArgumentResult result)
+        {
+            if (result.Tokens.Count == 0)
+                return ReadyToRunFileLayoutAlgorithm.DefaultSort;
+
+            return result.Tokens[0].Value.ToLowerInvariant() switch
+            {
+                "defaultsort" => ReadyToRunFileLayoutAlgorithm.DefaultSort,
+                "methodorder" => ReadyToRunFileLayoutAlgorithm.MethodOrder,
+                _ => throw new CommandLineException(result.Tokens[0].Value)
+            };
+        }
+
 #if DEBUG
             private static bool DumpReproArguments(CodeGenerationFailedException ex)
             {

src/coreclr/tools/aot/ILCompiler/Program.cs

@@ -348,10 +348,10 @@ public int Run()
             // Compile
             //
 
-            var builder = new RyuJitCompilationBuilder(typeSystemContext, compilationGroup);
-
             string compilationUnitPrefix = multiFile ? Path.GetFileNameWithoutExtension(outputFilePath) : "";
-            builder.UseCompilationUnitPrefix(compilationUnitPrefix);
+            var builder = new RyuJitCompilationBuilder(typeSystemContext, compilationGroup)
+                .FileLayoutAlgorithms(Get(_command.MethodLayout), Get(_command.FileLayout))
+                .UseCompilationUnitPrefix(compilationUnitPrefix);
 
             string[] mibcFilePaths = Get(_command.MibcFilePaths);
             if (mibcFilePaths.Length > 0)