diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp --- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp @@ -6577,6 +6577,37 @@ if (Instruction *NI = foldSelectICmp(I.getSwappedPredicate(), SI, Op0, I)) return NI; + // In case of a comparison with two select instructions having the same + // condition, check whether one of the resulting branches can be simplified. + // If so, just compare the other branch and select the appropriate result. + // For example: + // %tmp1 = select i1 %cmp, i32 %y, i32 %x + // %tmp2 = select i1 %cmp, i32 %z, i32 %x + // %cmp2 = icmp slt i32 %tmp2, %tmp1 + // The icmp will result false for the false value of selects and the result + // will depend upon the comparison of true values of selects if %cmp is + // true. Thus, transform this into: + // %cmp = icmp slt i32 %y, %z + // %sel = select i1 %cond, i1 %cmp, i1 false + // This handles similar cases to transform. + { + Value *Cond, *A, *B, *C, *D; + if (match(Op0, m_Select(m_Value(Cond), m_Value(A), m_Value(B))) && + match(Op1, m_Select(m_Specific(Cond), m_Value(C), m_Value(D))) && + Op0->hasOneUse() && Op1->hasOneUse()) { + // Check whether comparison of TrueValues can be simplified + if (Value *Res = simplifyICmpInst(Pred, A, C, SQ)) { + Value *NewICMP = Builder.CreateICmp(Pred, B, D); + return SelectInst::Create(Cond, Res, NewICMP); + } + // Check whether comparison of FalseValues can be simplified + if (Value *Res = simplifyICmpInst(Pred, B, D, SQ)) { + Value *NewICMP = Builder.CreateICmp(Pred, A, C); + return SelectInst::Create(Cond, NewICMP, Res); + } + } + } + // Try to optimize equality comparisons against alloca-based pointers. if (Op0->getType()->isPointerTy() && I.isEquality()) { assert(Op1->getType()->isPointerTy() && "Comparing pointer with non-pointer?"); diff --git a/llvm/test/Transforms/InstCombine/icmp-with-selects.ll b/llvm/test/Transforms/InstCombine/icmp-with-selects.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Transforms/InstCombine/icmp-with-selects.ll @@ -0,0 +1,156 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2 +; RUN: opt < %s -passes=instcombine -S | FileCheck %s + +define i1 @foo(i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo +; CHECK-SAME: (i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: ret i1 false +; +entry: + %cond1 = select i1 %cond, i32 1, i32 %param + %cond6 = select i1 %cond, i32 9, i32 %param + %cmp = icmp slt i32 %cond6, %cond1 + ret i1 %cmp +} + +define i1 @foo1(i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo1 +; CHECK-SAME: (i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[NOT_COND:%.*]] = xor i1 [[COND]], true +; CHECK-NEXT: ret i1 [[NOT_COND]] +; +entry: + %cond1 = select i1 %cond, i32 1, i32 %param + %cond6 = select i1 %cond, i32 9, i32 %param + %cmp = icmp eq i32 %cond6, %cond1 + ret i1 %cmp +} + +define i1 @foo2(i32 %val1, i32 %val2, i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo2 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TMP0:%.*]] = icmp slt i32 [[VAL2]], [[VAL1]] +; CHECK-NEXT: [[CMP:%.*]] = select i1 [[COND]], i1 [[TMP0]], i1 false +; CHECK-NEXT: ret i1 [[CMP]] +; +entry: + %cond1 = select i1 %cond, i32 %val1, i32 %param + %cond6 = select i1 %cond, i32 %val2, i32 %param + %cmp = icmp slt i32 %cond6, %cond1 + ret i1 %cmp +} + +define i1 @foo3(i32 %val1, i32 %val2, i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo3 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TMP0:%.*]] = icmp sgt i32 [[VAL2]], [[VAL1]] +; CHECK-NEXT: [[NOT_COND:%.*]] = xor i1 [[COND]], true +; CHECK-NEXT: [[CMP:%.*]] = select i1 [[NOT_COND]], i1 [[TMP0]], i1 false +; CHECK-NEXT: ret i1 [[CMP]] +; +entry: + %cond1 = select i1 %cond, i32 %param, i32 %val1 + %cond6 = select i1 %cond, i32 %param, i32 %val2 + %cmp = icmp sgt i32 %cond6, %cond1 + ret i1 %cmp +} + +define i1 @foo4(i32 %val1, i32 %val2, i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo4 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TMP0:%.*]] = icmp eq i32 [[VAL2]], [[VAL1]] +; CHECK-NEXT: [[NOT_COND:%.*]] = xor i1 [[COND]], true +; CHECK-NEXT: [[CMP:%.*]] = select i1 [[NOT_COND]], i1 true, i1 [[TMP0]] +; CHECK-NEXT: ret i1 [[CMP]] +; +entry: + %cond1 = select i1 %cond, i32 %val1, i32 %param + %cond6 = select i1 %cond, i32 %val2, i32 %param + %cmp = icmp eq i32 %cond6, %cond1 + ret i1 %cmp +} + +define i1 @foo5(i32 %val1, i32 %val2, i32 %param, i1 %cond1, i1 %cond2) { +; CHECK-LABEL: define i1 @foo5 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[PARAM:%.*]], i1 [[COND1:%.*]], i1 [[COND2:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[COND3:%.*]] = select i1 [[COND1]], i32 [[VAL1]], i32 [[PARAM]] +; CHECK-NEXT: [[COND6:%.*]] = select i1 [[COND2]], i32 [[VAL2]], i32 [[PARAM]] +; CHECK-NEXT: [[CMP:%.*]] = icmp sle i32 [[COND6]], [[COND3]] +; CHECK-NEXT: ret i1 [[CMP]] +; +entry: + %cond3 = select i1 %cond1, i32 %val1, i32 %param + %cond6 = select i1 %cond2, i32 %val2, i32 %param + %cmp = icmp sle i32 %cond6, %cond3 + ret i1 %cmp +} + +define i1 @foo6(i32 %val1, i32 %val2, i32 %val3, i1 %cond) { +; CHECK-LABEL: define i1 @foo6 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[VAL3:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[COND1:%.*]] = select i1 [[COND]], i32 [[VAL1]], i32 [[VAL2]] +; CHECK-NEXT: [[COND6:%.*]] = select i1 [[COND]], i32 [[VAL2]], i32 [[VAL3]] +; CHECK-NEXT: [[CMP:%.*]] = icmp sge i32 [[COND6]], [[COND1]] +; CHECK-NEXT: ret i1 [[CMP]] +; +entry: + %cond1 = select i1 %cond, i32 %val1, i32 %val2 + %cond6 = select i1 %cond, i32 %val2, i32 %val3 + %cmp = icmp sge i32 %cond6, %cond1 + ret i1 %cmp +} + +define i1 @foo7(i32 %val1, i32 %val2, i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo7 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[COND1:%.*]] = select i1 [[COND]], i32 [[VAL1]], i32 [[PARAM]] +; CHECK-NEXT: [[COND6:%.*]] = select i1 [[COND]], i32 [[VAL2]], i32 [[PARAM]] +; CHECK-NEXT: [[SHL:%.*]] = shl i32 [[COND1]], 4 +; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 [[COND6]], [[COND1]] +; CHECK-NEXT: [[COND7:%.*]] = zext i1 [[CMP]] to i32 +; CHECK-NEXT: [[XOR12:%.*]] = or i32 [[SHL]], [[COND7]] +; CHECK-NEXT: [[TOBOOL8:%.*]] = icmp ne i32 [[XOR12]], 0 +; CHECK-NEXT: ret i1 [[TOBOOL8]] +; +entry: + %cond1 = select i1 %cond, i32 %val1, i32 %param + %cond6 = select i1 %cond, i32 %val2, i32 %param + %shl = shl i32 %cond1, 4 + %cmp = icmp sgt i32 %cond6, %cond1 + %cond7 = zext i1 %cmp to i32 + %xor12 = or i32 %shl, %cond7 + %tobool8 = icmp ne i32 %xor12, 0 + ret i1 %tobool8 +} + +define i1 @foo8(i32 %val1, i32 %val2, i32 %param, i1 %cond) { +; CHECK-LABEL: define i1 @foo8 +; CHECK-SAME: (i32 [[VAL1:%.*]], i32 [[VAL2:%.*]], i32 [[PARAM:%.*]], i1 [[COND:%.*]]) { +; CHECK-NEXT: entry: +; CHECK-NEXT: [[COND1:%.*]] = select i1 [[COND]], i32 [[VAL1]], i32 [[PARAM]] +; CHECK-NEXT: [[COND6:%.*]] = select i1 [[COND]], i32 [[VAL2]], i32 [[PARAM]] +; CHECK-NEXT: [[ADD7:%.*]] = add nsw i32 [[COND1]], [[COND6]] +; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 [[COND6]], [[COND1]] +; CHECK-NEXT: [[TMP0:%.*]] = and i32 [[ADD7]], 1 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ne i32 [[TMP0]], 0 +; CHECK-NEXT: [[TOBOOL9:%.*]] = and i1 [[CMP]], [[TMP1]] +; CHECK-NEXT: ret i1 [[TOBOOL9]] +; +entry: + %cond1 = select i1 %cond, i32 %val1, i32 %param + %cond6 = select i1 %cond, i32 %val2, i32 %param + %add7 = add nsw i32 %cond1, %cond6 + %cmp = icmp sgt i32 %cond6, %cond1 + %0 = and i32 %add7, 1 + %1 = icmp ne i32 %0, 0 + %tobool9 = and i1 %cmp, %1 + ret i1 %tobool9 +}