[PATCH] D20453: Remove optnone/opt-bisect check from StackColoring

[Andy Kaylor via llvm-commits]

andrew.w.kaylor updated this revision to Diff 58721.
andrew.w.kaylor added a comment.

Implemented suggested revisions.


Repository:
  rL LLVM

http://reviews.llvm.org/D20453

Files:
  lib/CodeGen/StackColoring.cpp
  test/Feature/optnone-llc.ll
  test/Other/opt-bisect-legacy-pass-manager.ll

Index: lib/CodeGen/StackColoring.cpp
===================================================================
--- lib/CodeGen/StackColoring.cpp
+++ lib/CodeGen/StackColoring.cpp
@@ -660,9 +660,6 @@
 }
 
 bool StackColoring::runOnMachineFunction(MachineFunction &Func) {
-  if (skipFunction(*Func.getFunction()))
-    return false;
-
   DEBUG(dbgs() << "********** Stack Coloring **********\n"
                << "********** Function: "
                << ((const Value*)Func.getFunction())->getName() << '\n');
@@ -703,7 +700,8 @@
 
   // Don't continue because there are not enough lifetime markers, or the
   // stack is too small, or we are told not to optimize the slots.
-  if (NumMarkers < 2 || TotalSize < 16 || DisableColoring) {
+  if (NumMarkers < 2 || TotalSize < 16 || DisableColoring ||
+      skipFunction(*Func.getFunction())) {
     DEBUG(dbgs()<<"Will not try to merge slots.\n");
     return removeAllMarkers();
   }
Index: test/Feature/optnone-llc.ll
===================================================================
--- test/Feature/optnone-llc.ll
+++ test/Feature/optnone-llc.ll
@@ -46,7 +46,6 @@
 ; LLC-Ox-DAG: Skipping pass 'Machine Copy Propagation Pass'
 ; LLC-Ox-DAG: Skipping pass 'Machine Instruction Scheduler'
 ; LLC-Ox-DAG: Skipping pass 'Machine Loop Invariant Code Motion'
-; LLC-Ox-DAG: Skipping pass 'Merge disjoint stack slots'
 ; LLC-Ox-DAG: Skipping pass 'Optimize machine instruction PHIs'
 ; LLC-Ox-DAG: Skipping pass 'Peephole Optimizations'
 ; LLC-Ox-DAG: Skipping pass 'Post{{.*}}RA{{.*}}{{[Ss]}}cheduler'
Index: test/Other/opt-bisect-legacy-pass-manager.ll
===================================================================
--- test/Other/opt-bisect-legacy-pass-manager.ll
+++ test/Other/opt-bisect-legacy-pass-manager.ll
@@ -154,3 +154,25 @@
 bb.false:
   ret i32 0
 }
+
+; This function is here to verify that opt-bisect can skip all passes for
+; functions that contain lifetime intrinsics.
+define void @f4() {
+entry:
+  %i = alloca i32, align 4
+  %tmp = bitcast i32* %i to i8*
+  call void @llvm.lifetime.start(i64 4, i8* %tmp)
+  br label %for.cond
+
+for.cond:
+  br i1 undef, label %for.body, label %for.end
+
+for.body:
+  br label %for.cond
+
+for.end:
+  ret void
+}
+
+declare void @llvm.lifetime.start(i64, i8* nocapture)
+


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20453.58721.patch
Type: text/x-patch
Size: 2281 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160526/a34fd067/attachment.bin>