diff options
| -rw-r--r-- | llvm/lib/CodeGen/IfConversion.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Hexagon/ifcvt-simple-bprob.ll | 36 |
2 files changed, 40 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/IfConversion.cpp b/llvm/lib/CodeGen/IfConversion.cpp index 8b87aa16b81..37fe4158233 100644 --- a/llvm/lib/CodeGen/IfConversion.cpp +++ b/llvm/lib/CodeGen/IfConversion.cpp @@ -2148,7 +2148,8 @@ void IfConverter::MergeBlocks(BBInfo &ToBBI, BBInfo &FromBBI, bool AddEdges) { // unknown probabilities into known ones. // FIXME: This usage is too tricky and in the future we would like to // eliminate all unknown probabilities in MBB. - ToBBI.BB->normalizeSuccProbs(); + if (ToBBI.IsBrAnalyzable) + ToBBI.BB->normalizeSuccProbs(); SmallVector<MachineBasicBlock *, 4> FromSuccs(FromMBB.succ_begin(), FromMBB.succ_end()); @@ -2228,7 +2229,8 @@ void IfConverter::MergeBlocks(BBInfo &ToBBI, BBInfo &FromBBI, bool AddEdges) { // Normalize the probabilities of ToBBI.BB's successors with all adjustment // we've done above. - ToBBI.BB->normalizeSuccProbs(); + if (ToBBI.IsBrAnalyzable && FromBBI.IsBrAnalyzable) + ToBBI.BB->normalizeSuccProbs(); ToBBI.Predicate.append(FromBBI.Predicate.begin(), FromBBI.Predicate.end()); FromBBI.Predicate.clear(); diff --git a/llvm/test/CodeGen/Hexagon/ifcvt-simple-bprob.ll b/llvm/test/CodeGen/Hexagon/ifcvt-simple-bprob.ll new file mode 100644 index 00000000000..2d48d30dd7d --- /dev/null +++ b/llvm/test/CodeGen/Hexagon/ifcvt-simple-bprob.ll @@ -0,0 +1,36 @@ +; RUN: llc -march=hexagon < %s + +; Check that branch probabilities are set correctly after performing the +; simple variant of if-conversion. The converted block has a branch that +; is not analyzable. + +target triple = "hexagon" + +declare void @foo() + +; CHECK-LABEL: danny +; CHECK: if (p0.new) jump:nt foo +define void @danny(i32 %x) { + %t0 = icmp sgt i32 %x, 0 + br i1 %t0, label %tail, label %exit, !prof !0 +tail: + tail call void @foo(); + ret void +exit: + ret void +} + +; CHECK-LABEL: sammy +; CHECK: if (!p0.new) jump:t foo +define void @sammy(i32 %x) { + %t0 = icmp sgt i32 %x, 0 + br i1 %t0, label %exit, label %tail, !prof !0 +tail: + tail call void @foo(); + ret void +exit: + ret void +} + +!0 = !{!"branch_weights", i32 1, i32 2000} + |
