[PATCH] D85344: [ConstraintElimination] Add support for And.

[Florian Hahn via Phabricator via llvm-commits]

fhahn created this revision.
Herald added subscribers: llvm-commits, hiraditya.
Herald added a project: LLVM.
fhahn requested review of this revision.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D85344

Files:
  llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
  llvm/test/Transforms/ConstraintElimination/and.ll


Index: llvm/test/Transforms/ConstraintElimination/and.ll
===================================================================
--- llvm/test/Transforms/ConstraintElimination/and.ll
+++ llvm/test/Transforms/ConstraintElimination/and.ll
@@ -12,11 +12,11 @@
 ; CHECK-NEXT:    br i1 [[AND]], label [[BB1:%.*]], label [[EXIT:%.*]]
 ; CHECK:       bb1:
 ; CHECK-NEXT:    [[T_1:%.*]] = icmp ule i32 [[X]], [[Z]]
-; CHECK-NEXT:    call void @use(i1 [[T_1]])
+; CHECK-NEXT:    call void @use(i1 true)
 ; CHECK-NEXT:    [[T_2:%.*]] = icmp ule i32 [[X]], [[Y]]
-; CHECK-NEXT:    call void @use(i1 [[T_2]])
+; CHECK-NEXT:    call void @use(i1 true)
 ; CHECK-NEXT:    [[T_3:%.*]] = icmp ule i32 [[Y]], [[Z]]
-; CHECK-NEXT:    call void @use(i1 [[T_3]])
+; CHECK-NEXT:    call void @use(i1 true)
 ; CHECK-NEXT:    [[C_3:%.*]] = icmp ule i32 [[X]], [[A:%.*]]
 ; CHECK-NEXT:    call void @use(i1 [[C_3]])
 ; CHECK-NEXT:    ret i32 10
Index: llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
===================================================================
--- llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
+++ llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
@@ -184,6 +184,17 @@
       continue;
     }
 
+    if (match(Br->getCondition(), m_And(m_Cmp(), m_Cmp()))) {
+      if (Br->getSuccessor(0)->getSinglePredecessor()) {
+        auto *OrI = cast<Instruction>(Br->getCondition());
+        WorkList.emplace_back(DT.getNode(Br->getSuccessor(0)),
+                              cast<CmpInst>(OrI->getOperand(0)), false);
+        WorkList.emplace_back(DT.getNode(Br->getSuccessor(0)),
+                              cast<CmpInst>(OrI->getOperand(1)), false);
+      }
+      continue;
+    }
+
     auto *CmpI = dyn_cast<CmpInst>(Br->getCondition());
     if (!CmpI)
       continue;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D85344.283343.patch
Type: text/x-patch
Size: 1787 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200805/57c0ee08/attachment.bin>