[CodeMetrics] Ensure that Tapir taskframe intrinsics are considered d…

…uplicatable, enabling optimizations such as loop stripmining.

llvm/lib/Analysis/CodeMetrics.cpp

@@ -18,6 +18,7 @@
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/Intrinsics.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/InstructionCost.h"
 
@@ -175,7 +176,11 @@ void CodeMetrics::analyzeBasicBlock(
 
     if (I.getType()->isTokenTy() && I.isUsedOutsideOfBlock(BB)) {
       if (const IntrinsicInst *II = dyn_cast<IntrinsicInst>(&I)) {
-        if (Intrinsic::syncregion_start != II->getIntrinsicID())
+        if (Intrinsic::syncregion_start != II->getIntrinsicID() &&
+            Intrinsic::taskframe_create != II->getIntrinsicID() &&
+            Intrinsic::taskframe_use != II->getIntrinsicID() &&
+            Intrinsic::taskframe_resume != II->getIntrinsicID() &&
+            Intrinsic::taskframe_end != II->getIntrinsicID())
           notDuplicatable = true;
       } else
         notDuplicatable = true;

llvm/test/Transforms/Tapir/loop-stripmine-intrinsics.ll

@@ -0,0 +1,72 @@
+; Check that loop stripmining handles loops with Tapir intrinsics in the loop body.
+;
+; RUN: opt < %s -passes="loop-stripmine" -S | FileCheck %s
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define internal fastcc void @_ZN10benchmarks15cilk_mandelbrot17h1d757ad11ef25f85E(i1 %exitcond.not.i) personality ptr null {
+"_ZN63_$LT$alloc..alloc..Global$u20$as$u20$core..alloc..Allocator$GT$8allocate17h8cffd88cc6b3a5e9E.exit.i":
+  %0 = tail call token @llvm.syncregion.start()
+  br label %bb11.i
+
+bb13.i:                                           ; preds = %bb4.i2
+  ret void
+
+bb11.i:                                           ; preds = %bb4.i2, %"_ZN63_$LT$alloc..alloc..Global$u20$as$u20$core..alloc..Allocator$GT$8allocate17h8cffd88cc6b3a5e9E.exit.i"
+  detach within %0, label %bb3.tf.i.tf.tf.tf, label %bb4.i2
+
+bb3.tf.i.tf.tf.tf:                                ; preds = %bb11.i
+  %tf.i.i = tail call token @llvm.taskframe.create()
+  %1 = tail call token @llvm.syncregion.start()
+  br label %bb11.i.i.i
+
+bb11.i.i.i:                                       ; preds = %bb4.i.i.i, %bb3.tf.i.tf.tf.tf
+  %iter.sroa.0.08.i.i.i = phi i64 [ %_0.i4.i.i.i, %bb4.i.i.i ], [ 0, %bb3.tf.i.tf.tf.tf ]
+  %_0.i4.i.i.i = add i64 %iter.sroa.0.08.i.i.i, 1
+  detach within %1, label %bb3.i.i.i, label %bb4.i.i.i
+
+bb3.i.i.i:                                        ; preds = %bb11.i.i.i
+  reattach within %1, label %bb4.i.i.i
+
+bb4.i.i.i:                                        ; preds = %bb3.i.i.i, %bb11.i.i.i
+  %exitcond.not.i.i.i = icmp eq i64 %iter.sroa.0.08.i.i.i, 20480
+  br i1 %exitcond.not.i.i.i, label %"_ZN10benchmarks15cilk_mandelbrot28_$u7b$$u7b$closure$u7d$$u7d$17h9b0c8d58900499abE.exit.i.tfend", label %bb11.i.i.i
+
+"_ZN10benchmarks15cilk_mandelbrot28_$u7b$$u7b$closure$u7d$$u7d$17h9b0c8d58900499abE.exit.i.tfend": ; preds = %bb4.i.i.i
+  tail call void @llvm.taskframe.end(token %tf.i.i)
+  reattach within %0, label %bb4.i2
+
+bb4.i2:                                           ; preds = %"_ZN10benchmarks15cilk_mandelbrot28_$u7b$$u7b$closure$u7d$$u7d$17h9b0c8d58900499abE.exit.i.tfend", %bb11.i
+  br i1 %exitcond.not.i, label %bb13.i, label %bb11.i, !llvm.loop !0
+}
+
+; CHECK: define internal fastcc void @_ZN10benchmarks15cilk_mandelbrot17h1d757ad11ef25f85E(
+; CHECK: detach within %[[OUTER_SYNCREG:.+]], label %{{.+}}, label %{{.+}}
+; CHECK: %[[TF_I:.+]] = {{.*}}call token @llvm.taskframe.create()
+; CHECK: detach within %[[INNER_SYNCREG:.+]], label %{{.+}}, label %{{.+}}
+; CHECK: reattach within %[[INNER_SYNCREG]]
+; CHECK: call void @llvm.taskframe.end(token %[[TF_I]]
+; CHECK: reattach within %[[OUTER_SYNCREG]], label %[[LATCH:.+]]
+; CHECK: [[LATCH]]:
+; CHECK: br i1 %{{.+}}, label %{{.+}}, label %{{.+}}, !llvm.loop ![[LOOPMD:.+]]
+
+; CHECK: ![[GRANSIZEMD:[0-9]+]] = !{!"tapir.loop.grainsize", i32 1}
+; CHECK: ![[LOOPMD]] = distinct !{![[LOOPMD]], !{{[0-9]+}}, ![[GRANSIZEMD]]}
+
+; Function Attrs: nounwind willreturn memory(argmem: readwrite)
+declare token @llvm.syncregion.start() #0
+
+; Function Attrs: nounwind willreturn memory(argmem: readwrite)
+declare token @llvm.taskframe.create() #0
+
+; Function Attrs: nounwind willreturn memory(argmem: readwrite)
+declare void @llvm.taskframe.end(token) #0
+
+; uselistorder directives
+uselistorder ptr null, { 1, 2, 0 }
+uselistorder ptr @llvm.syncregion.start, { 1, 0 }
+
+attributes #0 = { nounwind willreturn memory(argmem: readwrite) }
+
+!0 = distinct !{!0, !1}
+!1 = !{!"tapir.loop.spawn.strategy", i32 1}