[PATCH] D18220: propagate 'unpredictable' metadata on select instructions

[Sanjay Patel via llvm-commits]

spatel created this revision.
spatel added reviewers: davidxl, congh, hfinkel.
spatel added a subscriber: llvm-commits.
Herald added a subscriber: mcrosier.

This is similar to D18133 where we allowed profile weights on select instructions. This extends that change to also allow the 'unpredictable' attribute of branches to apply to selects.

A test to check that 'unpredictable' metadata is preserved when cloning instructions was checked in at:
http://reviews.llvm.org/rL263648

http://reviews.llvm.org/D18220

Files:
  include/llvm/IR/IRBuilder.h
  lib/Transforms/Utils/SimplifyCFG.cpp
  test/Transforms/SimplifyCFG/PhiEliminate2.ll

Index: test/Transforms/SimplifyCFG/PhiEliminate2.ll
===================================================================
--- test/Transforms/SimplifyCFG/PhiEliminate2.ll
+++ test/Transforms/SimplifyCFG/PhiEliminate2.ll
@@ -5,7 +5,7 @@
 
 define i32 @FoldTwoEntryPHINode(i1 %C, i32 %V1, i32 %V2, i16 %V3) {
 entry:
-        br i1 %C, label %then, label %else, !prof !0
+        br i1 %C, label %then, label %else, !prof !0, !unpredictable !1
 then:
         %V4 = or i32 %V2, %V1
         br label %Cont
@@ -21,12 +21,14 @@
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:  %V5 = sext i16 %V3 to i32
 ; CHECK-NEXT:  %V4 = or i32 %V2, %V1
-; CHECK-NEXT:  %V6 = select i1 %C, i32 %V4, i32 %V5, !prof !0
+; CHECK-NEXT:  %V6 = select i1 %C, i32 %V4, i32 %V5, !prof !0, !unpredictable !1
 ; CHECK-NEXT:  %0 = call i32 @FoldTwoEntryPHINode(i1 false, i32 0, i32 0, i16 0)
 ; CHECK-NEXT:  ret i32 %V1
 }
 
 !0 = !{!"branch_weights", i32 3, i32 5}
+!1 = !{}
 
 ; CHECK: !0 = !{!"branch_weights", i32 3, i32 5}
+; CHECK: !1 = !{}
 
Index: lib/Transforms/Utils/SimplifyCFG.cpp
===================================================================
--- lib/Transforms/Utils/SimplifyCFG.cpp
+++ lib/Transforms/Utils/SimplifyCFG.cpp
@@ -1935,10 +1935,9 @@
     Value *TrueVal  = PN->getIncomingValue(PN->getIncomingBlock(0) == IfFalse);
     Value *FalseVal = PN->getIncomingValue(PN->getIncomingBlock(0) == IfTrue);
 
-    MDNode *MDN = InsertPt->getMetadata(LLVMContext::MD_prof);
-    Value *Select = Builder.CreateSelect(IfCond, TrueVal, FalseVal, "", MDN);
-    PN->replaceAllUsesWith(Select);
-    Select->takeName(PN);
+    Value *Sel = Builder.CreateSelect(IfCond, TrueVal, FalseVal, "", InsertPt);
+    PN->replaceAllUsesWith(Sel);
+    Sel->takeName(PN);
     PN->eraseFromParent();
   }
 
Index: include/llvm/IR/IRBuilder.h
===================================================================
--- include/llvm/IR/IRBuilder.h
+++ include/llvm/IR/IRBuilder.h
@@ -1569,15 +1569,18 @@
   }
 
   Value *CreateSelect(Value *C, Value *True, Value *False,
-                      const Twine &Name = "", MDNode *ProfWeights = nullptr) {
+                      const Twine &Name = "", Instruction *MDFrom = nullptr) {
     if (Constant *CC = dyn_cast<Constant>(C))
       if (Constant *TC = dyn_cast<Constant>(True))
         if (Constant *FC = dyn_cast<Constant>(False))
           return Insert(Folder.CreateSelect(CC, TC, FC), Name);
 
     SelectInst *Sel = SelectInst::Create(C, True, False);
-    // TODO: "unpredictable" metadata can apply to a select too.
-    Sel->setMetadata(LLVMContext::MD_prof, ProfWeights);
+    if (MDFrom) {
+      MDNode *Prof = MDFrom->getMetadata(LLVMContext::MD_prof);
+      MDNode *Unpred = MDFrom->getMetadata(LLVMContext::MD_unpredictable);
+      Sel = addBranchMetadata(Sel, Prof, Unpred);
+    }
     return Insert(Sel, Name);
   }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18220.50848.patch
Type: text/x-patch
Size: 2848 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160316/d38d3882/attachment.bin>