From 9e6b24342874a84186c38ba1ea98dc772921b92e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 1 Dec 2008 05:16:26 +0000 Subject: [PATCH] simplify these patterns using m_Specific. No need to grep for xor in testcase (or is a substring). llvm-svn: 60328 --- .../Scalar/InstructionCombining.cpp | 22 +++++-------------- .../test/Transforms/InstCombine/and-not-or.ll | 4 +--- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp index 11c5f7529771..bc8744480c52 100644 --- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp @@ -3980,22 +3980,12 @@ Instruction *InstCombiner::visitAnd(BinaryOperator &I) { } // (A&((~A)|B)) -> A&B - if (match(Op0, m_Or(m_Not(m_Value(A)), m_Value(B)))) { - if (A == Op1) - return BinaryOperator::CreateAnd(A, B); - } - if (match(Op0, m_Or(m_Value(A), m_Not(m_Value(B))))) { - if (B == Op1) - return BinaryOperator::CreateAnd(A, B); - } - if (match(Op1, m_Or(m_Not(m_Value(A)), m_Value(B)))) { - if (A == Op0) - return BinaryOperator::CreateAnd(A, B); - } - if (match(Op1, m_Or(m_Value(A), m_Not(m_Value(B))))) { - if (B == Op0) - return BinaryOperator::CreateAnd(A, B); - } + if (match(Op0, m_Or(m_Not(m_Specific(Op1)), m_Value(A))) || + match(Op0, m_Or(m_Value(A), m_Not(m_Specific(Op1))))) + return BinaryOperator::CreateAnd(A, Op1); + if (match(Op1, m_Or(m_Not(m_Specific(Op0)), m_Value(A))) || + match(Op1, m_Or(m_Value(A), m_Not(m_Specific(Op0))))) + return BinaryOperator::CreateAnd(A, Op0); } if (ICmpInst *RHS = dyn_cast(Op1)) { diff --git a/llvm/test/Transforms/InstCombine/and-not-or.ll b/llvm/test/Transforms/InstCombine/and-not-or.ll index b183b216e9df..9e9f397c4be3 100644 --- a/llvm/test/Transforms/InstCombine/and-not-or.ll +++ b/llvm/test/Transforms/InstCombine/and-not-or.ll @@ -1,6 +1,4 @@ -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {and i32 %y, %x} | count 2 -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {and i32 %x, %y} | count 2 -; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor} +; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {and i32 %x, %y} | count 4 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {or} define i32 @func1(i32 %x, i32 %y) nounwind {