[llvm] r299013 - [DAGCombiner] unify type checks and add asserts; NFCI

[Sanjay Patel via llvm-commits]

Author: spatel
Date: Wed Mar 29 13:08:01 2017
New Revision: 299013

URL: http://llvm.org/viewvc/llvm-project?rev=299013&view=rev
Log:
[DAGCombiner] unify type checks and add asserts; NFCI

We had a mix of type checks and usage that wasn't very clear.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=299013&r1=299012&r2=299013&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Mar 29 13:08:01 2017
@@ -3178,68 +3178,74 @@ SDValue DAGCombiner::foldAndOfSetCCs(SDV
       !isSetCCEquivalent(N1, RL, RR, N1CC))
     return SDValue();
 
+  assert(N0.getValueType() == N1.getValueType() &&
+         "Unexpected operand types for 'and' op");
+  assert(LL.getValueType() == LR.getValueType() &&
+         RL.getValueType() == RR.getValueType() &&
+         "Unexpected operand types for setcc");
+
+  // If we're here post-legalization or the 'and' is not i1, the 'and' type must
+  // match a setcc result type. Also, all folds require new operations on the
+  // left and right operands, so those types must match.
+  EVT VT = N0.getValueType();
+  EVT OpVT = LL.getValueType();
+  if (LegalOperations || VT != MVT::i1)
+    if (VT != getSetCCResultType(OpVT))
+      return SDValue();
+  if (OpVT != RL.getValueType())
+    return SDValue();
+
   ISD::CondCode CC0 = cast<CondCodeSDNode>(N0CC)->get();
   ISD::CondCode CC1 = cast<CondCodeSDNode>(N1CC)->get();
-  EVT VT = N1.getValueType();
-  assert(VT == N0.getValueType() && "Unexpected operand types for 'and'");
-  EVT LLVT = LL.getValueType();
-  EVT LRVT = LR.getValueType();
-  bool IsInteger = LLVT.isInteger();
-
+  bool IsInteger = OpVT.isInteger();
   if (LR == RR && CC0 == CC1 && IsInteger) {
-    EVT CCVT = getSetCCResultType(LRVT);
-    if (VT == CCVT || (!LegalOperations && VT == MVT::i1)) {
-      // (and (seteq X, 0), (seteq Y, 0)) --> (seteq (or X, Y), 0)
-      if (isNullConstant(LR) && CC1 == ISD::SETEQ) {
-        SDValue Or = DAG.getNode(ISD::OR, SDLoc(N0), LRVT, LL, RL);
-        AddToWorklist(Or.getNode());
-        return DAG.getSetCC(DL, VT, Or, LR, CC1);
-      }
-
-      // (and (seteq X, -1), (seteq Y, -1)) --> (seteq (and X, Y), -1)
-      if (isAllOnesConstant(LR) && CC1 == ISD::SETEQ) {
-        SDValue And = DAG.getNode(ISD::AND, SDLoc(N0), LRVT, LL, RL);
-        AddToWorklist(And.getNode());
-        return DAG.getSetCC(DL, VT, And, LR, CC1);
-      }
-
-      // (and (setgt X, -1), (setgt Y, -1)) --> (setgt (or X, Y), -1)
-      if (isAllOnesConstant(LR) && CC1 == ISD::SETGT) {
-        SDValue Or = DAG.getNode(ISD::OR, SDLoc(N0), LRVT, LL, RL);
-        AddToWorklist(Or.getNode());
-        return DAG.getSetCC(DL, VT, Or, LR, CC1);
-      }
+    // (and (seteq X, 0), (seteq Y, 0)) --> (seteq (or X, Y), 0)
+    if (isNullConstant(LR) && CC1 == ISD::SETEQ) {
+      SDValue Or = DAG.getNode(ISD::OR, SDLoc(N0), OpVT, LL, RL);
+      AddToWorklist(Or.getNode());
+      return DAG.getSetCC(DL, VT, Or, LR, CC1);
     }
-  }
 
-  EVT CCVT = getSetCCResultType(LLVT);
-  if (VT == CCVT || (!LegalOperations && VT == MVT::i1)) {
-    // (and (setne X, 0), (setne X, -1)) --> (setuge (add X, 1), 2)
-    if (LL == RL && CC0 == CC1 && IsInteger && CC0 == ISD::SETNE &&
-        ((isNullConstant(LR) && isAllOnesConstant(RR)) ||
-         (isAllOnesConstant(LR) && isNullConstant(RR)))) {
-      SDValue One = DAG.getConstant(1, DL, LLVT);
-      SDValue Two = DAG.getConstant(2, DL, LLVT);
-      SDValue Add = DAG.getNode(ISD::ADD, SDLoc(N0), LLVT, LL, One);
-      AddToWorklist(Add.getNode());
-      return DAG.getSetCC(DL, VT, Add, Two, ISD::SETUGE);
+    // (and (seteq X, -1), (seteq Y, -1)) --> (seteq (and X, Y), -1)
+    if (isAllOnesConstant(LR) && CC1 == ISD::SETEQ) {
+      SDValue And = DAG.getNode(ISD::AND, SDLoc(N0), OpVT, LL, RL);
+      AddToWorklist(And.getNode());
+      return DAG.getSetCC(DL, VT, And, LR, CC1);
     }
 
-    // Canonicalize equivalent operands to LL == RL.
-    if (LL == RR && LR == RL) {
-      CC1 = ISD::getSetCCSwappedOperands(CC1);
-      std::swap(RL, RR);
+    // (and (setgt X, -1), (setgt Y, -1)) --> (setgt (or X, Y), -1)
+    if (isAllOnesConstant(LR) && CC1 == ISD::SETGT) {
+      SDValue Or = DAG.getNode(ISD::OR, SDLoc(N0), OpVT, LL, RL);
+      AddToWorklist(Or.getNode());
+      return DAG.getSetCC(DL, VT, Or, LR, CC1);
     }
+  }
 
-    // (and (setcc X, Y, CC0), (setcc X, Y, CC1)) --> (setcc X, Y, NewCC)
-    if (LL == RL && LR == RR) {
-      ISD::CondCode NewCC = ISD::getSetCCAndOperation(CC0, CC1, IsInteger);
-      if (NewCC != ISD::SETCC_INVALID &&
-          (!LegalOperations ||
-           (TLI.isCondCodeLegal(NewCC, LL.getSimpleValueType()) &&
-            TLI.isOperationLegal(ISD::SETCC, LLVT))))
-        return DAG.getSetCC(DL, VT, LL, LR, NewCC);
-    }
+  // (and (setne X, 0), (setne X, -1)) --> (setuge (add X, 1), 2)
+  if (LL == RL && CC0 == CC1 && IsInteger && CC0 == ISD::SETNE &&
+      ((isNullConstant(LR) && isAllOnesConstant(RR)) ||
+       (isAllOnesConstant(LR) && isNullConstant(RR)))) {
+    SDValue One = DAG.getConstant(1, DL, OpVT);
+    SDValue Two = DAG.getConstant(2, DL, OpVT);
+    SDValue Add = DAG.getNode(ISD::ADD, SDLoc(N0), OpVT, LL, One);
+    AddToWorklist(Add.getNode());
+    return DAG.getSetCC(DL, VT, Add, Two, ISD::SETUGE);
+  }
+
+  // Canonicalize equivalent operands to LL == RL.
+  if (LL == RR && LR == RL) {
+    CC1 = ISD::getSetCCSwappedOperands(CC1);
+    std::swap(RL, RR);
+  }
+
+  // (and (setcc X, Y, CC0), (setcc X, Y, CC1)) --> (setcc X, Y, NewCC)
+  if (LL == RL && LR == RR) {
+    ISD::CondCode NewCC = ISD::getSetCCAndOperation(CC0, CC1, IsInteger);
+    if (NewCC != ISD::SETCC_INVALID &&
+        (!LegalOperations ||
+         (TLI.isCondCodeLegal(NewCC, LL.getSimpleValueType()) &&
+          TLI.isOperationLegal(ISD::SETCC, OpVT))))
+      return DAG.getSetCC(DL, VT, LL, LR, NewCC);
   }
 
   return SDValue();