[llvm-branch-commits] [llvm-branch] r164499 - in /llvm/branches/R600/lib/CodeGen: LiveStackAnalysis.cpp RegAllocGreedy.cpp StackSlotColoring.cpp VirtRegMap.cpp

[Tom Stellard]

Author: tstellar
Date: Mon Sep 24 10:51:35 2012
New Revision: 164499

URL: http://llvm.org/viewvc/llvm-project?rev=164499&view=rev
Log:
Fix a significant recent(?) regression. StackSlotColoring no longer did anything
because LiveStackAnalysis was not preserved by VirtRegWriter. This caused
big stack usage regression in some cases.

rdar://12340383

Modified:
    llvm/branches/R600/lib/CodeGen/LiveStackAnalysis.cpp
    llvm/branches/R600/lib/CodeGen/RegAllocGreedy.cpp
    llvm/branches/R600/lib/CodeGen/StackSlotColoring.cpp
    llvm/branches/R600/lib/CodeGen/VirtRegMap.cpp

Modified: llvm/branches/R600/lib/CodeGen/LiveStackAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/CodeGen/LiveStackAnalysis.cpp?rev=164499&r1=164498&r2=164499&view=diff
==============================================================================
--- llvm/branches/R600/lib/CodeGen/LiveStackAnalysis.cpp (original)
+++ llvm/branches/R600/lib/CodeGen/LiveStackAnalysis.cpp Mon Sep 24 10:51:35 2012
@@ -25,7 +25,10 @@
 using namespace llvm;
 
 char LiveStacks::ID = 0;
-INITIALIZE_PASS(LiveStacks, "livestacks",
+INITIALIZE_PASS_BEGIN(LiveStacks, "livestacks",
+                "Live Stack Slot Analysis", false, false)
+INITIALIZE_PASS_DEPENDENCY(SlotIndexes)
+INITIALIZE_PASS_END(LiveStacks, "livestacks",
                 "Live Stack Slot Analysis", false, false)
 
 char &llvm::LiveStacksID = LiveStacks::ID;

Modified: llvm/branches/R600/lib/CodeGen/RegAllocGreedy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/CodeGen/RegAllocGreedy.cpp?rev=164499&r1=164498&r2=164499&view=diff
==============================================================================
--- llvm/branches/R600/lib/CodeGen/RegAllocGreedy.cpp (original)
+++ llvm/branches/R600/lib/CodeGen/RegAllocGreedy.cpp Mon Sep 24 10:51:35 2012
@@ -330,9 +330,9 @@
   AU.addPreserved<SlotIndexes>();
   AU.addRequired<LiveDebugVariables>();
   AU.addPreserved<LiveDebugVariables>();
-  AU.addRequired<CalculateSpillWeights>();
   AU.addRequired<LiveStacks>();
   AU.addPreserved<LiveStacks>();
+  AU.addRequired<CalculateSpillWeights>();
   AU.addRequired<MachineDominatorTree>();
   AU.addPreserved<MachineDominatorTree>();
   AU.addRequired<MachineLoopInfo>();

Modified: llvm/branches/R600/lib/CodeGen/StackSlotColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/CodeGen/StackSlotColoring.cpp?rev=164499&r1=164498&r2=164499&view=diff
==============================================================================
--- llvm/branches/R600/lib/CodeGen/StackSlotColoring.cpp (original)
+++ llvm/branches/R600/lib/CodeGen/StackSlotColoring.cpp Mon Sep 24 10:51:35 2012
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define DEBUG_TYPE "stackcoloring"
+#define DEBUG_TYPE "stackslotcoloring"
 #include "llvm/Module.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/LiveIntervalAnalysis.h"

Modified: llvm/branches/R600/lib/CodeGen/VirtRegMap.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/CodeGen/VirtRegMap.cpp?rev=164499&r1=164498&r2=164499&view=diff
==============================================================================
--- llvm/branches/R600/lib/CodeGen/VirtRegMap.cpp (original)
+++ llvm/branches/R600/lib/CodeGen/VirtRegMap.cpp Mon Sep 24 10:51:35 2012
@@ -20,6 +20,7 @@
 #include "VirtRegMap.h"
 #include "LiveDebugVariables.h"
 #include "llvm/CodeGen/LiveIntervalAnalysis.h"
+#include "llvm/CodeGen/LiveStackAnalysis.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
@@ -171,6 +172,7 @@
 INITIALIZE_PASS_DEPENDENCY(SlotIndexes)
 INITIALIZE_PASS_DEPENDENCY(LiveIntervals)
 INITIALIZE_PASS_DEPENDENCY(LiveDebugVariables)
+INITIALIZE_PASS_DEPENDENCY(LiveStacks)
 INITIALIZE_PASS_DEPENDENCY(VirtRegMap)
 INITIALIZE_PASS_END(VirtRegRewriter, "virtregrewriter",
                     "Virtual Register Rewriter", false, false)
@@ -183,6 +185,8 @@
   AU.addRequired<SlotIndexes>();
   AU.addPreserved<SlotIndexes>();
   AU.addRequired<LiveDebugVariables>();
+  AU.addRequired<LiveStacks>();
+  AU.addPreserved<LiveStacks>();
   AU.addRequired<VirtRegMap>();
   MachineFunctionPass::getAnalysisUsage(AU);
 }