[PATCH] D16439: [PlaceSafepoints] Introduce a -spp-no-statepoints flag

[Sanjoy Das via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL258551: [PlaceSafepoints] Introduce a -spp-no-statepoints flag (authored by sanjoy).

Changed prior to commit:
  http://reviews.llvm.org/D16439?vs=45636&id=45731#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D16439

Files:
  llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp
  llvm/trunk/test/Transforms/PlaceSafepoints/no-statepoints.ll

Index: llvm/trunk/test/Transforms/PlaceSafepoints/no-statepoints.ll
===================================================================
--- llvm/trunk/test/Transforms/PlaceSafepoints/no-statepoints.ll
+++ llvm/trunk/test/Transforms/PlaceSafepoints/no-statepoints.ll
@@ -0,0 +1,21 @@
+; RUN: opt -spp-no-statepoints -S -place-safepoints < %s | FileCheck %s
+
+define void @test() gc "statepoint-example" {
+; CHECK-LABEL: test(
+entry:
+; CHECK: entry:
+; CHECK: call void @do_safepoint()
+  br label %other
+
+other:
+; CHECK: other:
+  call void undef() "gc-leaf-function"
+; CHECK: call void @do_safepoint()
+  br label %other
+}
+
+declare void @do_safepoint()
+define void @gc.safepoint_poll() {
+  call void @do_safepoint()
+  ret void
+}
Index: llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp
+++ llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp
@@ -108,6 +108,11 @@
 static cl::opt<bool> SplitBackedge("spp-split-backedge", cl::Hidden,
                                    cl::init(false));
 
+// If true, don't wrap calls (the ones present in the IR, and the ones
+// introduced due to polls) in gc.statepoint.
+static cl::opt<bool> NoStatepoints("spp-no-statepoints", cl::Hidden,
+                                   cl::init(false));
+
 // Print tracing output
 static cl::opt<bool> TraceLSP("spp-trace", cl::Hidden, cl::init(false));
 
@@ -661,6 +666,15 @@
     ParsePointNeeded.insert(ParsePointNeeded.end(), RuntimeCalls.begin(),
                             RuntimeCalls.end());
   }
+
+  // If we've been asked to not wrap the calls with gc.statepoint, then we're
+  // done.  In the near future, this option will be "constant folded" to true,
+  // and the code below that deals with insert gc.statepoint calls will be
+  // removed.  Wrapping potentially safepointing calls in gc.statepoint will
+  // then become the responsibility of the RewriteStatepointsForGC pass.
+  if (NoStatepoints)
+    return modified;
+
   PollsNeeded.clear(); // make sure we don't accidentally use
   // The dominator tree has been invalidated by the inlining performed in the
   // above loop.  TODO: Teach the inliner how to update the dom tree?


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D16439.45731.patch
Type: text/x-patch
Size: 2278 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160122/faf6d67a/attachment.bin>