From cdc27238af3becf09789e88bec72948edaafeecb Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Sat, 26 Mar 2016 23:30:50 +0000 Subject: [PATCH] [SimplifyCFG] propagate branch metadata when creating select (PR26636) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@264527 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/SimplifyCFG.cpp | 4 ++-- test/Transforms/SimplifyCFG/speculate-store.ll | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 7d210e6cb78..75d42617a6a 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1642,8 +1642,8 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *ThenBB, Value *FalseV = SpeculatedStoreValue; if (Invert) std::swap(TrueV, FalseV); - Value *S = Builder.CreateSelect(BrCond, TrueV, FalseV, TrueV->getName() + - "." + FalseV->getName()); + Value *S = Builder.CreateSelect( + BrCond, TrueV, FalseV, TrueV->getName() + "." + FalseV->getName(), BI); SpeculatedStore->setOperand(0, S); } diff --git a/test/Transforms/SimplifyCFG/speculate-store.ll b/test/Transforms/SimplifyCFG/speculate-store.ll index 15f403ce5f5..497e024e248 100644 --- a/test/Transforms/SimplifyCFG/speculate-store.ll +++ b/test/Transforms/SimplifyCFG/speculate-store.ll @@ -4,7 +4,7 @@ define void @ifconvertstore(i32* %A, i32 %B, i32 %C, i32 %D) { ; CHECK-LABEL: @ifconvertstore( ; CHECK: store i32 %B, i32* %A ; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 %D, 42 -; CHECK-NEXT: [[C_B:%.*]] = select i1 [[CMP]], i32 %C, i32 %B +; CHECK-NEXT: [[C_B:%.*]] = select i1 [[CMP]], i32 %C, i32 %B, !prof !0 ; CHECK-NEXT: store i32 [[C_B]], i32* %A ; CHECK-NEXT: ret void ; @@ -12,7 +12,7 @@ entry: ; First store to the location. store i32 %B, i32* %A %cmp = icmp sgt i32 %D, 42 - br i1 %cmp, label %if.then, label %ret.end + br i1 %cmp, label %if.then, label %ret.end, !prof !0 ; Make sure we speculate stores like the following one. It is cheap compared to ; a mispredicated branch. @@ -85,3 +85,6 @@ ret.end: ret void } +; CHECK: !0 = !{!"branch_weights", i32 3, i32 5} +!0 = !{!"branch_weights", i32 3, i32 5} +