move pass to addRegAssignAndRewriteOptimized

Author: mbrkusanin

llvm/include/llvm/CodeGen/TargetPassConfig.h

@@ -423,9 +423,6 @@ class TargetPassConfig : public ImmutablePass {
   /// to physical registers.
   virtual void addPostRewrite() { }
 
-  /// Add passes to be run immediately before Stack Slot Coloring pass.
-  virtual void addPreStackSlotColoring() {}
-
   /// This method may be implemented by targets that want to run passes after
   /// register allocation pass pipeline but before prolog-epilog insertion.
   virtual void addPostRegAlloc() { }

llvm/lib/CodeGen/TargetPassConfig.cpp

@@ -1502,8 +1502,6 @@ void TargetPassConfig::addOptimizedRegAlloc() {
   addPass(&MachineSchedulerID);
 
   if (addRegAssignAndRewriteOptimized()) {
-    addPreStackSlotColoring();
-
     // Perform stack slot coloring and post-ra machine LICM.
     addPass(&StackSlotColoringID);
 

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

@@ -963,7 +963,6 @@ class GCNPassConfig final : public AMDGPUPassConfig {
 
   void addPreRegAlloc() override;
   bool addPreRewrite() override;
-  void addPreStackSlotColoring() override;
   void addPostRegAlloc() override;
   void addPreSched2() override;
   void addPreEmitPass() override;
@@ -1348,10 +1347,6 @@ bool GCNPassConfig::addPreRewrite() {
   return true;
 }
 
-void GCNPassConfig::addPreStackSlotColoring() {
-  addPass(&AMDGPUMarkLastScratchLoadID);
-}
-
 FunctionPass *GCNPassConfig::createSGPRAllocPass(bool Optimized) {
   // Initialize the global default.
   llvm::call_once(InitializeDefaultSGPRRegisterAllocatorFlag,
@@ -1430,6 +1425,8 @@ bool GCNPassConfig::addRegAssignAndRewriteOptimized() {
   addPreRewrite();
   addPass(&VirtRegRewriterID);
 
+  addPass(&AMDGPUMarkLastScratchLoadID);
+
   return true;
 }