[PATCH] D29074: Canonicalize guards for AND condition

[Max Kazantsev via Phabricator via llvm-commits]

mkazantsev updated this revision to Diff 85687.
mkazantsev marked 3 inline comments as done.
mkazantsev added a comment.

Done fixes


https://reviews.llvm.org/D29074

Files:
  lib/Transforms/InstCombine/InstCombineCalls.cpp
  test/Transforms/InstCombine/call-guard.ll


Index: test/Transforms/InstCombine/call-guard.ll
===================================================================
--- test/Transforms/InstCombine/call-guard.ll
+++ test/Transforms/InstCombine/call-guard.ll
@@ -18,3 +18,13 @@
   call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
   ret void
 }
+
+define void @test_guard_and(i1 %A, i1 %B) {
+; CHECK-LABEL: @test_guard_and(
+; CHECK-NEXT:    call void (i1, ...) @llvm.experimental.guard(i1 %A) [ "deopt"() ]
+; CHECK-NEXT:    call void (i1, ...) @llvm.experimental.guard(i1 %B) [ "deopt"() ]
+; CHECK-NEXT:    ret void
+  %C = and i1 %A, %B
+  call void(i1, ...) @llvm.experimental.guard( i1 %C )[ "deopt"() ]
+  ret void
+}
Index: lib/Transforms/InstCombine/InstCombineCalls.cpp
===================================================================
--- lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -2878,6 +2878,22 @@
     if (match(II->getNextNode(),
               m_Intrinsic<Intrinsic::experimental_guard>(m_Specific(IIOperand))))
       return eraseInstFromFunction(*II);
+
+    // Canonicalize guard(a && b) -> guard(a); guard(b);
+    // Note: New guard intrinsics created here are registered by
+    // the InstCombineIRInserter object.
+    Function *GuardIntrinsic = II->getCalledFunction();
+    Value *A, *B;
+    OperandBundleDef DeoptOB(*II->getOperandBundle(LLVMContext::OB_deopt));
+    if (match(IIOperand, m_And(m_Value(A), m_Value(B)))) {
+      CallInst *GuardA = Builder->CreateCall(GuardIntrinsic, A,
+                                             {DeoptOB}, II->getName());
+      CallInst *GuardB = Builder->CreateCall(GuardIntrinsic, B,
+                                             {DeoptOB}, II->getName());
+      GuardA->setCallingConv(II->getCallingConv());
+      GuardB->setCallingConv(II->getCallingConv());
+      return eraseInstFromFunction(*II);
+    }
     break;
   }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29074.85687.patch
Type: text/x-patch
Size: 1936 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170125/433f0220/attachment.bin>