6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-23 01:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Correction for the last patch. Should match the conditional in the first part

Browse Source 
of the select match, not the select instruction itself.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58947 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling
2008-11-09 23:37:53 +00:00
parent 1fb43c32ed
commit 8f24cc237f
1 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -4352,59 +4352,67 @@ Instruction *InstCombiner::visitOr(BinaryOperator &I) {
} }
} }
#define SELECT_MATCH(Val) \
m_Select(m_Value(Val), m_ConstantInt(0), m_ConstantInt(-1))
#define GET_SELECT_COND(Val) \ #define GET_SELECT_COND(Val) \
cast<User>(Val)->getOperand(0) cast<User>(Val)->getOperand(0)
#define SELECT_MATCH(Val) \
m_Select(m_Value(Val), m_ConstantInt(0), m_ConstantInt(-1))
// (A & (C0?-1:0)) | (B & ~(C0?-1:0)) -> C0 ? A : B, and commuted variants // (A & (C0?-1:0)) | (B & ~(C0?-1:0)) -> C0 ? A : B, and commuted variants
if (match(A, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) { if (match(A, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) {
if (match(D, m_Not(SELECT_MATCH(A)))) Value *Cond = GET_SELECT_COND(A);
return SelectInst::Create(GET_SELECT_COND(D), C, B); if (match(D, m_Not(SELECT_MATCH(Cond))))
if (match(B, m_Not(SELECT_MATCH(A)))) return SelectInst::Create(Cond, C, B);
return SelectInst::Create(GET_SELECT_COND(B), C, D); if (match(B, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, C, D);
} }
if (match(B, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) { if (match(B, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) {
if (match(C, m_Not(SELECT_MATCH(B)))) Value *Cond = GET_SELECT_COND(B);
return SelectInst::Create(GET_SELECT_COND(C), A, D); if (match(C, m_Not(SELECT_MATCH(Cond))))
if (match(A, m_Not(SELECT_MATCH(B)))) return SelectInst::Create(Cond, A, D);
return SelectInst::Create(GET_SELECT_COND(A), C, D); if (match(A, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, C, D);
} }
if (match(C, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) { if (match(C, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) {
if (match(D, m_Not(SELECT_MATCH(C)))) Value *Cond = GET_SELECT_COND(C);
return SelectInst::Create(GET_SELECT_COND(D), A, B); if (match(D, m_Not(SELECT_MATCH(Cond))))
if (match(B, m_Not(SELECT_MATCH(C)))) return SelectInst::Create(Cond, A, B);
return SelectInst::Create(GET_SELECT_COND(B), A, D); if (match(B, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, A, D);
} }
if (match(D, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) { if (match(D, m_Select(m_Value(), m_ConstantInt(-1), m_ConstantInt(0)))) {
if (match(C, m_Not(SELECT_MATCH(D)))) Value *Cond = GET_SELECT_COND(D);
return SelectInst::Create(GET_SELECT_COND(C), A, B); if (match(C, m_Not(SELECT_MATCH(Cond))))
if (match(A, m_Not(SELECT_MATCH(D)))) return SelectInst::Create(Cond, A, B);
return SelectInst::Create(GET_SELECT_COND(A), C, B); if (match(A, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, C, B);
} }
if (match(A, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) { if (match(A, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) {
if (match(D, m_Not(SELECT_MATCH(A)))) Value *Cond = GET_SELECT_COND(A);
return SelectInst::Create(GET_SELECT_COND(D), B, C); if (match(D, m_Not(SELECT_MATCH(Cond))))
if (match(B, m_Not(SELECT_MATCH(A)))) return SelectInst::Create(Cond, B, C);
return SelectInst::Create(GET_SELECT_COND(B), D, C); if (match(B, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, D, C);
} }
if (match(B, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) { if (match(B, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) {
if (match(C, m_Not(SELECT_MATCH(B)))) Value *Cond = GET_SELECT_COND(B);
return SelectInst::Create(GET_SELECT_COND(C), D, A); if (match(C, m_Not(SELECT_MATCH(Cond))))
if (match(A, m_Not(SELECT_MATCH(B)))) return SelectInst::Create(Cond, D, A);
return SelectInst::Create(GET_SELECT_COND(A), D, C); if (match(A, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, D, C);
} }
if (match(C, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) { if (match(C, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) {
if (match(D, m_Not(SELECT_MATCH(C)))) Value *Cond = GET_SELECT_COND(C);
return SelectInst::Create(GET_SELECT_COND(D), B, A); if (match(D, m_Not(SELECT_MATCH(Cond))))
if (match(B, m_Not(SELECT_MATCH(C)))) return SelectInst::Create(Cond, B, A);
return SelectInst::Create(GET_SELECT_COND(B), D, A); if (match(B, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, D, A);
} }
if (match(D, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) { if (match(D, m_Select(m_Value(), m_ConstantInt(0), m_ConstantInt(-1)))) {
if (match(C, m_Not(SELECT_MATCH(D)))) Value *Cond = GET_SELECT_COND(D);
return SelectInst::Create(GET_SELECT_COND(C), B, A); if (match(C, m_Not(SELECT_MATCH(Cond))))
if (match(A, m_Not(SELECT_MATCH(D)))) return SelectInst::Create(Cond, B, A);
return SelectInst::Create(GET_SELECT_COND(A), B, C); if (match(A, m_Not(SELECT_MATCH(Cond))))
return SelectInst::Create(Cond, B, C);
} }
#undef SELECT_MATCH #undef SELECT_MATCH
#undef GET_SELECT_COND #undef GET_SELECT_COND