[InstSimplify] move (A & ~B) | (A ^ B) -> (A ^ B) from InstCombine

This is a straight cut and paste, but there's a bigger problem: if this
fold exists for simplifyOr, there should be a DeMorganized version for
simplifyAnd. But more than that, we have a patchwork of ad hoc logic
optimizations in InstCombine. There should be some structure to ensure 
that we're not missing sibling folds across and/or/xor.
 

llvm-svn: 301213
This commit is contained in:
Sanjay Patel 2017-04-24 18:24:36 +00:00
parent f2fc5b068e
commit 0889225f51
4 changed files with 66 additions and 66 deletions

View File

@ -1877,6 +1877,19 @@ static Value *SimplifyOrInst(Value *Op0, Value *Op1, const Query &Q,
(A == Op0 || B == Op0))
return Constant::getAllOnesValue(Op0->getType());
// (A & ~B) | (A ^ B) -> (A ^ B)
// (~B & A) | (A ^ B) -> (A ^ B)
if (match(Op0, m_c_And(m_Value(A), m_Not(m_Value(B)))) &&
match(Op1, m_Xor(m_Specific(A), m_Specific(B))))
return Op1;
// Commute the 'or' operands.
// (A ^ B) | (A & ~B) -> (A ^ B)
// (A ^ B) | (~B & A) -> (A ^ B)
if (match(Op1, m_c_And(m_Value(A), m_Not(m_Value(B)))) &&
match(Op0, m_Xor(m_Specific(A), m_Specific(B))))
return Op0;
if (auto *ICILHS = dyn_cast<ICmpInst>(Op0)) {
if (auto *ICIRHS = dyn_cast<ICmpInst>(Op1)) {
if (Value *V = SimplifyOrOfICmps(ICILHS, ICIRHS))

View File

@ -2151,19 +2151,6 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
match(Op0, m_c_And(m_Specific(A), m_Value(B))))
return BinaryOperator::CreateOr(Op1, B);
// (A & ~B) | (A ^ B) -> (A ^ B)
// (~B & A) | (A ^ B) -> (A ^ B)
if (match(Op0, m_c_And(m_Value(A), m_Not(m_Value(B)))) &&
match(Op1, m_Xor(m_Specific(A), m_Specific(B))))
return BinaryOperator::CreateXor(A, B);
// Commute the 'or' operands.
// (A ^ B) | (A & ~B) -> (A ^ B)
// (A ^ B) | (~B & A) -> (A ^ B)
if (match(Op1, m_c_And(m_Value(A), m_Not(m_Value(B)))) &&
match(Op0, m_Xor(m_Specific(A), m_Specific(B))))
return BinaryOperator::CreateXor(A, B);
// (A & C)|(B & D)
Value *C = nullptr, *D = nullptr;
if (match(Op0, m_And(m_Value(A), m_Value(C))) &&

View File

@ -619,59 +619,6 @@ define i32 @test42_commuted_xor(i32 %a, i32 %b) {
ret i32 %or
}
; (A & ~B) | (A ^ B) -> A ^ B
define i32 @test43(i32 %a, i32 %b) {
; CHECK-LABEL: @test43(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%neg = xor i32 %b, -1
%and = and i32 %a, %neg
%xor = xor i32 %a, %b
%or = or i32 %and, %xor
ret i32 %or
}
define i32 @test43_commuted_and(i32 %a, i32 %b) {
; CHECK-LABEL: @test43_commuted_and(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%neg = xor i32 %b, -1
%and = and i32 %neg, %a
%xor = xor i32 %a, %b
%or = or i32 %and, %xor
ret i32 %or
}
; Commute operands of the 'or'.
; (A ^ B) | (A & ~B) -> A ^ B
define i32 @test44(i32 %a, i32 %b) {
; CHECK-LABEL: @test44(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%xor = xor i32 %a, %b
%neg = xor i32 %b, -1
%and = and i32 %a, %neg
%or = or i32 %xor, %and
ret i32 %or
}
define i32 @test44_commuted_and(i32 %a, i32 %b) {
; CHECK-LABEL: @test44_commuted_and(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%xor = xor i32 %a, %b
%neg = xor i32 %b, -1
%and = and i32 %neg, %a
%or = or i32 %xor, %and
ret i32 %or
}
define i32 @test45(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: @test45(
; CHECK-NEXT: [[TMP1:%.*]] = and i32 %x, %z

View File

@ -468,3 +468,56 @@ define <2 x i3> @and_of_different_cast_icmps_vec(<2 x i8> %i, <2 x i16> %j) {
ret <2 x i3> %and
}
; (A & ~B) | (A ^ B) -> A ^ B
define i32 @test43(i32 %a, i32 %b) {
; CHECK-LABEL: @test43(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%neg = xor i32 %b, -1
%and = and i32 %a, %neg
%xor = xor i32 %a, %b
%or = or i32 %and, %xor
ret i32 %or
}
define i32 @test43_commuted_and(i32 %a, i32 %b) {
; CHECK-LABEL: @test43_commuted_and(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%neg = xor i32 %b, -1
%and = and i32 %neg, %a
%xor = xor i32 %a, %b
%or = or i32 %and, %xor
ret i32 %or
}
; Commute operands of the 'or'.
; (A ^ B) | (A & ~B) -> A ^ B
define i32 @test44(i32 %a, i32 %b) {
; CHECK-LABEL: @test44(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%xor = xor i32 %a, %b
%neg = xor i32 %b, -1
%and = and i32 %a, %neg
%or = or i32 %xor, %and
ret i32 %or
}
define i32 @test44_commuted_and(i32 %a, i32 %b) {
; CHECK-LABEL: @test44_commuted_and(
; CHECK-NEXT: [[OR:%.*]] = xor i32 %a, %b
; CHECK-NEXT: ret i32 [[OR]]
;
%xor = xor i32 %a, %b
%neg = xor i32 %b, -1
%and = and i32 %neg, %a
%or = or i32 %xor, %and
ret i32 %or
}