JIT: Consolidate layout passes into one phase

src/coreclr/jit/compiler.cpp

@@ -5023,30 +5023,7 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
         //
         if (JitConfig.JitDoReversePostOrderLayout())
         {
-            auto lateLayoutPhase = [this] {
-                // Skip preliminary reordering passes to create more work for 3-opt layout
-                if (compStressCompile(STRESS_THREE_OPT_LAYOUT, 10))
-                {
-                    m_dfsTree = fgComputeDfs</* useProfile */ true>();
-                }
-                else
-                {
-                    fgDoReversePostOrderLayout();
-                    fgMoveColdBlocks();
-                }
-
-                fgSearchImprovedLayout();
-                fgInvalidateDfsTree();
-
-                if (compHndBBtabCount != 0)
-                {
-                    fgRebuildEHRegions();
-                }
-
-                return PhaseStatus::MODIFIED_EVERYTHING;
-            };
-
-            DoPhase(this, PHASE_OPTIMIZE_LAYOUT, lateLayoutPhase);
+            DoPhase(this, PHASE_OPTIMIZE_LAYOUT, &Compiler::fgSearchImprovedLayout);
         }
         else
         {

src/coreclr/jit/compiler.h

@@ -2904,7 +2904,7 @@ class Compiler
 
     void fgSetHndEnd(EHblkDsc* handlerTab, BasicBlock* newHndLast);
 
-    void fgRebuildEHRegions();
+    void fgFindTryRegionEnds();
 
     void fgSkipRmvdBlocks(EHblkDsc* handlerTab);
 
@@ -6179,9 +6179,7 @@ class Compiler
     bool fgComputeMissingBlockWeights();
 
     bool fgReorderBlocks(bool useProfile);
-    void fgDoReversePostOrderLayout();
-    void fgMoveColdBlocks();
-    void fgSearchImprovedLayout();
+    PhaseStatus fgSearchImprovedLayout();
 
     class ThreeOptLayout
     {
@@ -6208,12 +6206,13 @@ class Compiler
         void AddNonFallthroughPreds(unsigned blockPos);
         bool RunGreedyThreeOptPass(unsigned startPos, unsigned endPos);
 
-        bool CompactHotJumps();
-        bool RunThreeOpt();
+        void RunThreeOpt();
+        void CompactHotJumps();
+        bool ReorderBlockList();
 
     public:
-        ThreeOptLayout(Compiler* comp);
-        void Run();
+        ThreeOptLayout(Compiler* comp, BasicBlock** initialLayout, unsigned numHotBlocks);
+        bool Run();
     };
 
     bool fgFuncletsAreCold();