[llvm-commits] [llvm] r109953 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineAndOrXor.cpp test/Transforms/InstCombine/bit-checks.ll

[Daniel Dunbar]

Author: ddunbar
Date: Sat Jul 31 14:51:11 2010
New Revision: 109953

URL: http://llvm.org/viewvc/llvm-project?rev=109953&view=rev
Log:
Speculatively revert r108614, "Another attempt at getting the clang self-host to
like my instcombine patch.", in an attempt to fix Clang i386 bootstrap.
 - Also PR7719.

Removed:
    llvm/trunk/test/Transforms/InstCombine/bit-checks.ll
Modified:
    llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp

Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp?rev=109953&r1=109952&r2=109953&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp Sat Jul 31 14:51:11 2010
@@ -472,22 +472,6 @@
       Value *NewOr = Builder->CreateOr(Val, Val2);
       return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
     }
-    
-    // (icmp ne (A & C1), 0) & (icmp ne (A & C2), 0) -->
-    // (icmp eq (A & (C1|C2)), (C1|C2)) where C1 and C2 are non-zero POT
-    if (LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
-      Value *Op1 = 0, *Op2 = 0;
-      ConstantInt *CI1 = 0, *CI2 = 0;
-      if (match(LHS->getOperand(0), m_And(m_Value(Op1), m_ConstantInt(CI1))) &&
-          match(RHS->getOperand(0), m_And(m_Value(Op2), m_ConstantInt(CI2)))) {
-        if (Op1 == Op2 && !CI1->isZero() && !CI2->isZero() &&
-            CI1->getValue().isPowerOf2() && CI2->getValue().isPowerOf2()) {
-          Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
-          Value *NewAnd = Builder->CreateAnd(Op1, ConstOr);
-          return Builder->CreateICmp(ICmpInst::ICMP_EQ, NewAnd, ConstOr);
-        }
-      }
-    }
   }
   
   // From here on, we only handle:
@@ -1174,22 +1158,6 @@
     return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
   }
   
-  // (icmp eq (A & C1), 0) | (icmp eq (A & C2), 0) -->
-  // (icmp ne (A & (C1|C2)), (C1|C2)) where C1 and C2 are non-zero POT
-  if (LHSCC == ICmpInst::ICMP_EQ && LHSCst->isZero()) {
-    Value *Op1 = 0, *Op2 = 0;
-    ConstantInt *CI1 = 0, *CI2 = 0;
-    if (match(LHS->getOperand(0), m_And(m_Value(Op1), m_ConstantInt(CI1))) &&
-        match(RHS->getOperand(0), m_And(m_Value(Op2), m_ConstantInt(CI2)))) {
-      if (Op1 == Op2 && !CI1->isZero() && !CI2->isZero() &&
-          CI1->getValue().isPowerOf2() && CI2->getValue().isPowerOf2()) {
-        Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
-        Value *NewAnd = Builder->CreateAnd(Op1, ConstOr);
-        return Builder->CreateICmp(ICmpInst::ICMP_NE, NewAnd, ConstOr);
-      }
-    }
-  }
-  
   // From here on, we only handle:
   //    (icmp1 A, C1) | (icmp2 A, C2) --> something simpler.
   if (Val != Val2) return 0;

Removed: llvm/trunk/test/Transforms/InstCombine/bit-checks.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/bit-checks.ll?rev=109952&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/bit-checks.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/bit-checks.ll (removed)
@@ -1,26 +0,0 @@
-; This test makes sure that these instructions are properly eliminated.
-;
-; RUN: opt < %s -instcombine -S | \
-; RUN:    not grep {tobool}
-; END.
-define i32 @main(i32 %argc, i8** %argv) nounwind ssp {
-entry:
-  %and = and i32 %argc, 1                         ; <i32> [#uses=1]
-  %tobool = icmp ne i32 %and, 0                   ; <i1> [#uses=1]
-  %and2 = and i32 %argc, 2                        ; <i32> [#uses=1]
-  %tobool3 = icmp ne i32 %and2, 0                 ; <i1> [#uses=1]
-  %or.cond = and i1 %tobool, %tobool3             ; <i1> [#uses=1]
-  %retval.0 = select i1 %or.cond, i32 2, i32 1    ; <i32> [#uses=1]
-  ret i32 %retval.0
-}
-
-define i32 @main2(i32 %argc, i8** nocapture %argv) nounwind readnone ssp {
-entry:
-  %and = and i32 %argc, 1                         ; <i32> [#uses=1]
-  %tobool = icmp eq i32 %and, 0                   ; <i1> [#uses=1]
-  %and2 = and i32 %argc, 2                        ; <i32> [#uses=1]
-  %tobool3 = icmp eq i32 %and2, 0                 ; <i1> [#uses=1]
-  %or.cond = or i1 %tobool, %tobool3              ; <i1> [#uses=1]
-  %storemerge = select i1 %or.cond, i32 0, i32 1  ; <i32> [#uses=1]
-  ret i32 %storemerge
-}
\ No newline at end of file