Index: lib/Transforms/InstCombine/InstCombineSelect.cpp =================================================================== --- lib/Transforms/InstCombine/InstCombineSelect.cpp +++ lib/Transforms/InstCombine/InstCombineSelect.cpp @@ -61,25 +61,31 @@ /// To /// %C = select i1 %A, i8 %z, i8 %y /// OP: binop with an identity constant -/// TODO: support for non-commutative and FP opcodes +/// TODO: support for undefs and FP opcodes static Instruction *foldSelectBinOpIdentity(SelectInst &Sel) { - Value *Cond = Sel.getCondition(); Value *X, *Z; Constant *C; CmpInst::Predicate Pred; - if (!match(Cond, m_ICmp(Pred, m_Value(X), m_Constant(C))) || + if (!match(Cond, m_Cmp(Pred, m_Value(X), m_Constant(C))) || !ICmpInst::isEquality(Pred)) return nullptr; bool IsEq = Pred == ICmpInst::ICMP_EQ; auto *BO = dyn_cast(IsEq ? Sel.getTrueValue() : Sel.getFalseValue()); - // TODO: support for undefs - if (BO && match(BO, m_c_BinOp(m_Specific(X), m_Value(Z))) && + if (!BO) + return nullptr; + + if (match(BO, m_c_BinOp(m_Specific(X), m_Value(Z))) && ConstantExpr::getBinOpIdentity(BO->getOpcode(), X->getType()) == C) { Sel.setOperand(IsEq ? 1 : 2, Z); return &Sel; + } else if (match(BO, m_BinOp(m_Value(Z), m_Specific(X))) && + ConstantExpr::getBinOpIdentity(BO->getOpcode(), X->getType(), + true) == C) { + Sel.setOperand(IsEq ? 1 : 2, Z); + return &Sel; } return nullptr; } Index: test/Transforms/InstCombine/select-binop-icmp.ll =================================================================== --- test/Transforms/InstCombine/select-binop-icmp.ll +++ test/Transforms/InstCombine/select-binop-icmp.ll @@ -2,6 +2,7 @@ ; RUN: opt < %s -instcombine -S | FileCheck %s declare void @use(<2 x i1>) +declare void @use2(i1) define i32 @select_xor_icmp(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_xor_icmp( @@ -137,9 +138,9 @@ ret i32 %C } -; TODO: Support for FP opcodes -define float @select_fadd_icmp(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fadd_icmp( +; TODO: FP opcodes support +define float @select_fadd_fcmp(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fadd_fcmp( ; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], -0.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fadd float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -151,8 +152,8 @@ ret float %C } -define float @select_fadd_icmp2(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fadd_icmp2( +define float @select_fadd_fcmp2(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fadd_fcmp2( ; CHECK-NEXT: [[A:%.*]] = fcmp ueq float [[X:%.*]], -0.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fadd float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -164,8 +165,8 @@ ret float %C } -define float @select_fmul_icmp(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fmul_icmp( +define float @select_fmul_fcmp(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fmul_fcmp( ; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], 1.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fmul float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -177,29 +178,78 @@ ret float %C } -; TODO: Support for non-commutative opcodes +define float @select_fsub_fcmp(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fsub_fcmp( +; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], 0.000000e+00 +; CHECK-NEXT: [[B:%.*]] = fsub float [[X]], [[Z:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] +; CHECK-NEXT: ret float [[C]] +; + %A = fcmp oeq float %x, 0.0 + %B = fsub float %x, %z + %C = select i1 %A, float %B, float %y + ret float %C +} + +define float @select_fdiv_fcmp(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fdiv_fcmp( +; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], 1.000000e+00 +; CHECK-NEXT: [[B:%.*]] = fdiv float [[X]], [[Z:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] +; CHECK-NEXT: ret float [[C]] +; + %A = fcmp oeq float %x, 1.0 + %B = fdiv float %x, %z + %C = select i1 %A, float %B, float %y + ret float %C +} + define i32 @select_sub_icmp(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_sub_icmp( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 -; CHECK-NEXT: [[B:%.*]] = sub i32 [[X]], [[Z:%.*]] -; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 0 - %B = sub i32 %x, %z + %B = sub i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C } +define i32 @select_sub_icmp_2(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_sub_icmp_2( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 +; CHECK-NEXT: call void @use2(i1 [[A]]) +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp eq i32 %x, 0 + call void @use2(i1 %A) + %B = sub i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define <2 x i8> @select_sub_icmp_vec(<2 x i8> %x, <2 x i8> %y, <2 x i8> %z) { +; CHECK-LABEL: @select_sub_icmp_vec( +; CHECK-NEXT: [[A:%.*]] = icmp eq <2 x i8> [[X:%.*]], zeroinitializer +; CHECK-NEXT: [[C:%.*]] = select <2 x i1> [[A]], <2 x i8> [[Z:%.*]], <2 x i8> [[Y:%.*]] +; CHECK-NEXT: ret <2 x i8> [[C]] +; + %A = icmp eq <2 x i8> %x, + %B = sub <2 x i8> %z, %x + %C = select <2 x i1> %A, <2 x i8> %B, <2 x i8> %y + ret <2 x i8> %C +} + define i32 @select_shl_icmp(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_shl_icmp( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 -; CHECK-NEXT: [[B:%.*]] = shl i32 [[X]], [[Z:%.*]] -; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 0 - %B = shl i32 %x, %z + %B = shl i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C } @@ -207,12 +257,11 @@ define i32 @select_lshr_icmp(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_lshr_icmp( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 -; CHECK-NEXT: [[B:%.*]] = lshr i32 [[X]], [[Z:%.*]] -; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 0 - %B = lshr i32 %x, %z + %B = lshr i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C } @@ -220,12 +269,35 @@ define i32 @select_ashr_icmp(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_ashr_icmp( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 -; CHECK-NEXT: [[B:%.*]] = ashr i32 [[X]], [[Z:%.*]] -; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 0 - %B = ashr i32 %x, %z + %B = ashr i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_udiv_icmp(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_udiv_icmp( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp eq i32 %x, 1 + %B = udiv i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_sdiv_icmp(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_sdiv_icmp( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[Z:%.*]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp eq i32 %x, 1 + %B = sdiv i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C } @@ -388,8 +460,8 @@ ret i32 %C } -define float @select_fadd_icmp_bad(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fadd_icmp_bad( +define float @select_fadd_fcmp_bad(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fadd_fcmp_bad( ; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], -1.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fadd float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -401,8 +473,8 @@ ret float %C } -define float @select_fadd_icmp_bad_2(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fadd_icmp_bad_2( +define float @select_fadd_fcmp_bad_2(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fadd_fcmp_bad_2( ; CHECK-NEXT: [[A:%.*]] = fcmp ueq float [[X:%.*]], -1.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fadd float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -414,8 +486,8 @@ ret float %C } -define float @select_fmul_icmp_bad(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fmul_icmp_bad( +define float @select_fmul_fcmp_bad(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fmul_fcmp_bad( ; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], 3.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fmul float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -427,8 +499,8 @@ ret float %C } -define float @select_fdiv_icmp_bad(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fdiv_icmp_bad( +define float @select_fdiv_fcmp_bad(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fdiv_fcmp_bad( ; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], 3.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fdiv float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -440,8 +512,8 @@ ret float %C } -define float @select_fsub_icmp_bad(float %x, float %y, float %z) { -; CHECK-LABEL: @select_fsub_icmp_bad( +define float @select_fsub_fcmp_bad(float %x, float %y, float %z) { +; CHECK-LABEL: @select_fsub_fcmp_bad( ; CHECK-NEXT: [[A:%.*]] = fcmp oeq float [[X:%.*]], 1.000000e+00 ; CHECK-NEXT: [[B:%.*]] = fsub float [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], float [[B]], float [[Y:%.*]] @@ -455,25 +527,66 @@ define i32 @select_sub_icmp_bad(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_sub_icmp_bad( -; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 ; CHECK-NEXT: [[B:%.*]] = sub i32 [[X]], [[Z:%.*]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; - %A = icmp eq i32 %x, 1 + %A = icmp eq i32 %x, 0 %B = sub i32 %x, %z %C = select i1 %A, i32 %B, i32 %y ret i32 %C } -define i32 @select_sub_icmp_bad_sub_inv(i32 %x, i32 %y, i32 %z) { -; CHECK-LABEL: @select_sub_icmp_bad_sub_inv( -; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 +define i32 @select_sub_icmp_bad_2(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_sub_icmp_bad_2( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 ; CHECK-NEXT: [[B:%.*]] = sub i32 [[Z:%.*]], [[X]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; + %A = icmp eq i32 %x, 1 + %B = sub i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_sub_icmp_bad_3(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_sub_icmp_bad_3( +; CHECK-NEXT: [[A:%.*]] = icmp ne i32 [[X:%.*]], 0 +; CHECK-NEXT: call void @use2(i1 [[A]]) +; CHECK-NEXT: [[B:%.*]] = sub i32 [[Z:%.*]], [[X]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp ne i32 %x, 0 + call void @use2(i1 %A) + %B = sub i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_sub_icmp_bad_4(i32 %x, i32 %y, i32 %z, i32 %k) { +; CHECK-LABEL: @select_sub_icmp_bad_4( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 0 +; CHECK-NEXT: [[B:%.*]] = sub i32 [[Z:%.*]], [[K:%.*]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; %A = icmp eq i32 %x, 0 + %B = sub i32 %z, %k + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_sub_icmp_bad_5(i32 %x, i32 %y, i32 %z, i32 %k) { +; CHECK-LABEL: @select_sub_icmp_bad_5( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], [[K:%.*]] +; CHECK-NEXT: [[B:%.*]] = sub i32 [[Z:%.*]], [[X]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp eq i32 %x, %k %B = sub i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C @@ -482,12 +595,12 @@ define i32 @select_shl_icmp_bad(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_shl_icmp_bad( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 -; CHECK-NEXT: [[B:%.*]] = shl i32 [[X]], [[Z:%.*]] +; CHECK-NEXT: [[B:%.*]] = shl i32 [[Z:%.*]], [[X]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 1 - %B = shl i32 %x, %z + %B = shl i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C } @@ -495,12 +608,12 @@ define i32 @select_lshr_icmp_bad(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_lshr_icmp_bad( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 -; CHECK-NEXT: [[B:%.*]] = lshr i32 [[X]], [[Z:%.*]] +; CHECK-NEXT: [[B:%.*]] = lshr i32 [[Z:%.*]], [[X]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 1 - %B = lshr i32 %x, %z + %B = lshr i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C } @@ -508,12 +621,38 @@ define i32 @select_ashr_icmp_bad(i32 %x, i32 %y, i32 %z) { ; CHECK-LABEL: @select_ashr_icmp_bad( ; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 1 -; CHECK-NEXT: [[B:%.*]] = ashr i32 [[X]], [[Z:%.*]] +; CHECK-NEXT: [[B:%.*]] = ashr i32 [[Z:%.*]], [[X]] ; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] ; CHECK-NEXT: ret i32 [[C]] ; %A = icmp eq i32 %x, 1 - %B = ashr i32 %x, %z + %B = ashr i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_udiv_icmp_bad(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_udiv_icmp_bad( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 3 +; CHECK-NEXT: [[B:%.*]] = udiv i32 [[Z:%.*]], [[X]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp eq i32 %x, 3 + %B = udiv i32 %z, %x + %C = select i1 %A, i32 %B, i32 %y + ret i32 %C +} + +define i32 @select_sdiv_icmp_bad(i32 %x, i32 %y, i32 %z) { +; CHECK-LABEL: @select_sdiv_icmp_bad( +; CHECK-NEXT: [[A:%.*]] = icmp eq i32 [[X:%.*]], 3 +; CHECK-NEXT: [[B:%.*]] = sdiv i32 [[Z:%.*]], [[X]] +; CHECK-NEXT: [[C:%.*]] = select i1 [[A]], i32 [[B]], i32 [[Y:%.*]] +; CHECK-NEXT: ret i32 [[C]] +; + %A = icmp eq i32 %x, 3 + %B = sdiv i32 %z, %x %C = select i1 %A, i32 %B, i32 %y ret i32 %C }