replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

InstCombine: Don't strip convergent from intrinsic callsites 

Specific instances of intrinsic calls may want to be convergent, such
as certain register reads but the intrinsic declaration is not.

llvm-svn: 273188
This commit is contained in:
Matt Arsenault 2016-06-20 19:04:44 +00:00
parent 524bcbf1f3
commit 802ebcb4bb
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -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();

11
llvm/test/Transforms/InstCombine/convergent.ll
View File

@ -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"}