From c5f68270ad4a9ae3a578358e6b3172a3edfa7f9e Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sun, 9 Apr 2017 06:12:39 +0000 Subject: [PATCH] [InstCombine] Extend a canonicalization check to apply to vector constants too. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@299821 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/InstCombine/InstCombineAndOrXor.cpp | 3 ++- test/Transforms/InstCombine/and.ll | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp index 62fad853908..e94b6797d11 100644 --- a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp +++ b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp @@ -2567,8 +2567,9 @@ Instruction *InstCombiner::visitXor(BinaryOperator &I) { Op0I->hasOneUse()){ if (A == Op1) // (A&B)^A -> (B&A)^A std::swap(A, B); + const APInt *C; if (B == Op1 && // (B&A)^A == ~B & A - !isa(Op1)) { // Canonical form is (B&C)^C + !match(Op1, m_APInt(C))) { // Canonical form is (B&C)^C return BinaryOperator::CreateAnd(Builder->CreateNot(A), Op1); } } diff --git a/test/Transforms/InstCombine/and.ll b/test/Transforms/InstCombine/and.ll index be8aba99916..868042be773 100644 --- a/test/Transforms/InstCombine/and.ll +++ b/test/Transforms/InstCombine/and.ll @@ -431,8 +431,8 @@ define i32 @test33b(i32 %b) { define <2 x i32> @test33vec(<2 x i32> %b) { ; CHECK-LABEL: @test33vec( -; CHECK-NEXT: [[TMP1:%.*]] = xor <2 x i32> [[B:%.*]], -; CHECK-NEXT: [[TMP_10:%.*]] = and <2 x i32> [[TMP1]], +; CHECK-NEXT: [[TMP_4_MASK:%.*]] = and <2 x i32> [[B:%.*]], +; CHECK-NEXT: [[TMP_10:%.*]] = xor <2 x i32> [[TMP_4_MASK]], ; CHECK-NEXT: [[TMP_12:%.*]] = and <2 x i32> [[B]], ; CHECK-NEXT: [[TMP_13:%.*]] = or <2 x i32> [[TMP_12]], [[TMP_10]] ; CHECK-NEXT: ret <2 x i32> [[TMP_13]] @@ -446,8 +446,8 @@ define <2 x i32> @test33vec(<2 x i32> %b) { define <2 x i32> @test33vecb(<2 x i32> %b) { ; CHECK-LABEL: @test33vecb( -; CHECK-NEXT: [[TMP1:%.*]] = xor <2 x i32> [[B:%.*]], -; CHECK-NEXT: [[TMP_10:%.*]] = and <2 x i32> [[TMP1]], +; CHECK-NEXT: [[TMP_4_MASK:%.*]] = and <2 x i32> [[B:%.*]], +; CHECK-NEXT: [[TMP_10:%.*]] = xor <2 x i32> [[TMP_4_MASK]], ; CHECK-NEXT: [[TMP_12:%.*]] = and <2 x i32> [[B]], ; CHECK-NEXT: [[TMP_13:%.*]] = or <2 x i32> [[TMP_10]], [[TMP_12]] ; CHECK-NEXT: ret <2 x i32> [[TMP_13]] -- 2.40.0