Consider the case where xor by -1 and xor by 128 have been combined already to
produce an xor by 127.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54906 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 32232a6..defad26 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -5503,8 +5503,8 @@
             return new ICmpInst(I.getPredicate(), Op0I->getOperand(0),
                                 Op1I->getOperand(0));
           } else {
-            // icmp u/s (a ^ signbit), (b ^ signbit) --> icmp s/u a, b
             if (ConstantInt *CI = dyn_cast<ConstantInt>(Op0I->getOperand(1))) {
+              // icmp u/s (a ^ signbit), (b ^ signbit) --> icmp s/u a, b
               if (CI->getValue().isSignBit()) {
                 ICmpInst::Predicate Pred = I.isSignedPredicate()
                                                ? I.getUnsignedPredicate()
@@ -5512,6 +5512,17 @@
                 return new ICmpInst(Pred, Op0I->getOperand(0),
                                     Op1I->getOperand(0));
               }
+
+              // icmp u/s (a ^ ~signbit), (b ^ ~signbit) --> icmp s/u b, a
+              if ((~CI->getValue()).isSignBit()) {
+                ICmpInst::Predicate Pred = I.isSignedPredicate()
+                                               ? I.getUnsignedPredicate()
+                                               : I.getSignedPredicate();
+                Pred = I.getSwappedPredicate(Pred);
+                return new ICmpInst(Pred, Op0I->getOperand(0),
+                                    Op1I->getOperand(0));
+
+              }
             }
           }
           break;
@@ -5818,6 +5829,17 @@
         return new ICmpInst(Pred, LHSI->getOperand(0),
                             ConstantInt::get(RHSV ^ SignBit));
       }
+
+      // (icmp u/s (xor A ~SignBit), C) -> (icmp ~s/u A, (xor C ~SignBit))
+      if (!ICI.isEquality() && (~XorCST->getValue()).isSignBit()) {
+        const APInt &NotSignBit = XorCST->getValue();
+        ICmpInst::Predicate Pred = ICI.isSignedPredicate()
+                                       ? ICI.getUnsignedPredicate()
+                                       : ICI.getSignedPredicate();
+        Pred = ICI.getSwappedPredicate(Pred);
+        return new ICmpInst(Pred, LHSI->getOperand(0),
+                            ConstantInt::get(RHSV ^ NotSignBit));
+      }
     }
     break;
   case Instruction::And:         // (icmp pred (and X, AndCST), RHS)