[llvm-commits] [llvm] r108148 - in /llvm/trunk: lib/Transforms/InstCombine/InstCombineAndOrXor.cpp test/Transforms/InstCombine/or.ll test/Transforms/InstCombine/xor2.ll

[Benjamin Kramer]

Author: d0k
Date: Mon Jul 12 09:42:04 2010
New Revision: 108148

URL: http://llvm.org/viewvc/llvm-project?rev=108148&view=rev
Log:
Revert r108141 again, sigh.

Modified:
    llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
    llvm/trunk/test/Transforms/InstCombine/or.ll
    llvm/trunk/test/Transforms/InstCombine/xor2.ll

Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp?rev=108148&r1=108147&r2=108148&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp Mon Jul 12 09:42:04 2010
@@ -1597,14 +1597,6 @@
       Instruction *Ret = FoldOrWithConstants(I, Op0, A, V1, D);
       if (Ret) return Ret;
     }
-
-    // (A & ~C) | (B & C) -> ((B ^ A) & C) ^ A
-    if (Op0->hasOneUse() && Op1->hasOneUse() &&
-        match(C, m_Not(m_Specific(D)))) {
-      Value *Xor = Builder->CreateXor(B, A, "xor");
-      Value *And = Builder->CreateAnd(Xor, D, "and");
-      return BinaryOperator::CreateXor(And, A);
-    }
   }
   
   // (X >> Z) | (Y >> Z)  -> (X|Y) >> Z  for all shifts.
@@ -1928,15 +1920,6 @@
         return BinaryOperator::CreateAnd(NewOp, X);
       }
     }
-
-    // (A & ~C) ^ (B & C) -> ((B ^ A) & C) ^ A
-    if (Op0->hasOneUse() && Op1->hasOneUse() &&
-        match(Op0I, m_And(m_Value(A), m_Not(m_Value(D)))) &&
-        match(Op1I, m_And(m_Value(B), m_Specific(D)))) {
-      Value *Xor = Builder->CreateXor(B, A, "xor");
-      Value *And = Builder->CreateAnd(Xor, D, "and");
-      return BinaryOperator::CreateXor(And, A);
-    }
   }
     
   // (icmp1 A, B) ^ (icmp2 A, B) --> (icmp3 A, B)

Modified: llvm/trunk/test/Transforms/InstCombine/or.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/or.ll?rev=108148&r1=108147&r2=108148&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/or.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/or.ll Mon Jul 12 09:42:04 2010
@@ -350,16 +350,3 @@
 ; CHECK: or <4 x i32> %and.i, %and.i129
 }
 
-; PR6773
-define i32 @test33(i32 %x, i32 %y, i32 %z) nounwind readnone {
-  %and = and i32 %y, %x
-  %not = xor i32 %x, -1
-  %and2 = and i32 %z, %not
-  %or = or i32 %and2, %and
-  ret i32 %or
-; CHECK: @test33
-; CHECK-NEXT: xor i32
-; CHECK-NEXT: and i32
-; CHECK-NEXT: xor i32
-; CHECK-NEXT: ret i32
-}

Modified: llvm/trunk/test/Transforms/InstCombine/xor2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/xor2.ll?rev=108148&r1=108147&r2=108148&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/xor2.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/xor2.ll Mon Jul 12 09:42:04 2010
@@ -51,17 +51,3 @@
 ; CHECK: %1 = ashr i32 %A, %B
 ; CHECK: ret i32 %1
 }
-
-; PR6773
-define i32 @test5(i32 %x, i32 %y, i32 %z) nounwind readnone {
-  %and = and i32 %y, %x
-  %not = xor i32 %x, -1
-  %and2 = and i32 %z, %not
-  %xor = xor i32 %and2, %and
-  ret i32 %xor
-; CHECK: @test5
-; CHECK-NEXT: xor i32
-; CHECK-NEXT: and i32
-; CHECK-NEXT: xor i32
-; CHECK-NEXT: ret i32
-}