diff options
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/Transforms/InstCombine/convergent.ll | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index 1aa4b87bb92..c2cf21d5221 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -2507,7 +2507,8 @@ Instruction *InstCombiner::visitCallSite(CallSite CS) { if (Function *CalleeF = dyn_cast<Function>(Callee)) { // Remove the convergent attr on calls when the callee is not convergent. - if (CS.isConvergent() && !CalleeF->isConvergent()) { + if (CS.isConvergent() && !CalleeF->isConvergent() && + !CalleeF->isIntrinsic()) { DEBUG(dbgs() << "Removing convergent attr from instr " << CS.getInstruction() << "\n"); CS.setNotConvergent(); diff --git a/llvm/test/Transforms/InstCombine/convergent.ll b/llvm/test/Transforms/InstCombine/convergent.ll index 4ed40d81bad..d4484cf4567 100644 --- a/llvm/test/Transforms/InstCombine/convergent.ll +++ b/llvm/test/Transforms/InstCombine/convergent.ll @@ -3,6 +3,8 @@ declare i32 @k() convergent declare i32 @f() +declare i64 @llvm.read_register.i64(metadata) nounwind + define i32 @extern() { ; Convergent attr shouldn't be removed here; k is convergent. ; CHECK: call i32 @k() [[CONVERGENT_ATTR:#[0-9]+]] @@ -30,4 +32,13 @@ define i32 @indirect_call(i32 ()* %f) { ret i32 %a } +; do not remove from convergent intrinsic call sites +; CHECK-LABEL: @convergent_intrinsic_call( +; CHECK: call i64 @llvm.read_register.i64(metadata !0) [[CONVERGENT_ATTR]] +define i64 @convergent_intrinsic_call() { + %val = call i64 @llvm.read_register.i64(metadata !0) convergent + ret i64 %val +} + ; CHECK: [[CONVERGENT_ATTR]] = { convergent } +!0 = !{!"foo"} |
