diff --git a/llvm/lib/Analysis/BranchProbabilityInfo.cpp b/llvm/lib/Analysis/BranchProbabilityInfo.cpp --- a/llvm/lib/Analysis/BranchProbabilityInfo.cpp +++ b/llvm/lib/Analysis/BranchProbabilityInfo.cpp @@ -380,7 +380,7 @@ const Instruction *TI = BB->getTerminator(); assert(TI->getNumSuccessors() > 1 && "expected more than one successor!"); if (!(isa(TI) || isa(TI) || isa(TI) || - isa(TI))) + isa(TI) || isa(TI))) return false; MDNode *WeightsNode = TI->getMetadata(LLVMContext::MD_prof); diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -4502,6 +4502,8 @@ ExpectedNumOperands = IBI->getNumDestinations(); else if (isa(&I)) ExpectedNumOperands = 2; + else if (CallBrInst *CI = dyn_cast(&I)) + ExpectedNumOperands = CI->getNumSuccessors(); else CheckFailed("!prof branch_weights are not allowed for this instruction", MD); diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp --- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp +++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp @@ -1398,7 +1398,8 @@ if (TI->getNumSuccessors() < 2) continue; if (!(isa(TI) || isa(TI) || - isa(TI) || isa(TI))) + isa(TI) || isa(TI) || + isa(TI))) continue; if (getBBInfo(&BB).CountValue == 0) diff --git a/llvm/test/Transforms/PGOProfile/Inputs/callbr.proftext b/llvm/test/Transforms/PGOProfile/Inputs/callbr.proftext new file mode 100644 --- /dev/null +++ b/llvm/test/Transforms/PGOProfile/Inputs/callbr.proftext @@ -0,0 +1,8 @@ +# :ir is the flag to indicate this is IR level profile. +:ir +a +784007059655560962 +2 +100 +80 + diff --git a/llvm/test/Transforms/PGOProfile/callbr.ll b/llvm/test/Transforms/PGOProfile/callbr.ll --- a/llvm/test/Transforms/PGOProfile/callbr.ll +++ b/llvm/test/Transforms/PGOProfile/callbr.ll @@ -1,4 +1,8 @@ ; RUN: opt -passes=pgo-instr-gen -S 2>&1 < %s | FileCheck %s +; +; RUN: llvm-profdata merge %S/Inputs/callbr.proftext -o %t.profdata +; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE + define i32 @a() { entry: @@ -15,3 +19,11 @@ %0 = load i32, ptr %retval, align 4 ret i32 %0 } +; USE-LABEL: @a +; USE-SAME: !prof ![[BW_ENTRY:[0-9]+]] +; USE: callbr void asm sideeffect +; USE: to label +; USE-SAME: !prof ![[BW_CALLBR:[0-9]+]] +; USE ![[BW_ENTRY]] = !{!"function_entry_count", i64 100} +; USE ![[BW_CALLBR]] = !{!"branch_weights", i32 80, i32 20} +