diff options
-rw-r--r-- | llvm/lib/Analysis/InstructionSimplify.cpp | 47 | ||||
-rw-r--r-- | llvm/test/Transforms/InstSimplify/floating-point-compare.ll | 16 |
2 files changed, 34 insertions, 29 deletions
diff --git a/llvm/lib/Analysis/InstructionSimplify.cpp b/llvm/lib/Analysis/InstructionSimplify.cpp index 092aaf610ca..843b3e97c07 100644 --- a/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/llvm/lib/Analysis/InstructionSimplify.cpp @@ -3648,31 +3648,6 @@ static Value *SimplifyFCmpInst(unsigned Predicate, Value *LHS, Value *RHS, } // Handle fcmp with constant RHS. - if (match(RHS, m_AnyZeroFP())) { - switch (Pred) { - case FCmpInst::FCMP_OGE: - if (FMF.noNaNs() && CannotBeOrderedLessThanZero(LHS, Q.TLI)) - return getTrue(RetTy); - break; - case FCmpInst::FCMP_UGE: - if (CannotBeOrderedLessThanZero(LHS, Q.TLI)) - return getTrue(RetTy); - break; - case FCmpInst::FCMP_ULT: - if (FMF.noNaNs() && CannotBeOrderedLessThanZero(LHS, Q.TLI)) - return getFalse(RetTy); - break; - case FCmpInst::FCMP_OLT: - if (CannotBeOrderedLessThanZero(LHS, Q.TLI)) - return getFalse(RetTy); - break; - default: - break; - } - } - - // TODO: Use match with a specific FP value, so these work with vectors with - // undef lanes. const APFloat *C; if (match(RHS, m_APFloat(C))) { // Check whether the constant is an infinity. @@ -3700,6 +3675,28 @@ static Value *SimplifyFCmpInst(unsigned Predicate, Value *LHS, Value *RHS, break; } } + } + if (C->isZero()) { + switch (Pred) { + case FCmpInst::FCMP_OGE: + if (FMF.noNaNs() && CannotBeOrderedLessThanZero(LHS, Q.TLI)) + return getTrue(RetTy); + break; + case FCmpInst::FCMP_UGE: + if (CannotBeOrderedLessThanZero(LHS, Q.TLI)) + return getTrue(RetTy); + break; + case FCmpInst::FCMP_ULT: + if (FMF.noNaNs() && CannotBeOrderedLessThanZero(LHS, Q.TLI)) + return getFalse(RetTy); + break; + case FCmpInst::FCMP_OLT: + if (CannotBeOrderedLessThanZero(LHS, Q.TLI)) + return getFalse(RetTy); + break; + default: + break; + } } else if (C->isNegative()) { assert(!C->isNaN() && "Unexpected NaN constant!"); // TODO: We can catch more cases by using a range check rather than diff --git a/llvm/test/Transforms/InstSimplify/floating-point-compare.ll b/llvm/test/Transforms/InstSimplify/floating-point-compare.ll index 5ce56e029d3..77db0522c98 100644 --- a/llvm/test/Transforms/InstSimplify/floating-point-compare.ll +++ b/llvm/test/Transforms/InstSimplify/floating-point-compare.ll @@ -399,7 +399,9 @@ define <2 x i1> @fabs_is_not_negative_poszero(<2 x float> %V) { define <2 x i1> @fabs_is_not_negative_anyzero(<2 x float> %V) { ; CHECK-LABEL: @fabs_is_not_negative_anyzero( -; CHECK-NEXT: ret <2 x i1> zeroinitializer +; CHECK-NEXT: [[ABS:%.*]] = call <2 x float> @llvm.fabs.v2f32(<2 x float> [[V:%.*]]) +; CHECK-NEXT: [[CMP:%.*]] = fcmp olt <2 x float> [[ABS]], <float 0.000000e+00, float -0.000000e+00> +; CHECK-NEXT: ret <2 x i1> [[CMP]] ; %abs = call <2 x float> @llvm.fabs.v2f32(<2 x float> %V) %cmp = fcmp olt <2 x float> %abs, <float 0.0, float -0.0> @@ -408,7 +410,9 @@ define <2 x i1> @fabs_is_not_negative_anyzero(<2 x float> %V) { define <3 x i1> @fabs_is_not_negative_negzero_undef(<3 x float> %V) { ; CHECK-LABEL: @fabs_is_not_negative_negzero_undef( -; CHECK-NEXT: ret <3 x i1> zeroinitializer +; CHECK-NEXT: [[ABS:%.*]] = call <3 x float> @llvm.fabs.v3f32(<3 x float> [[V:%.*]]) +; CHECK-NEXT: [[CMP:%.*]] = fcmp olt <3 x float> [[ABS]], <float -0.000000e+00, float -0.000000e+00, float undef> +; CHECK-NEXT: ret <3 x i1> [[CMP]] ; %abs = call <3 x float> @llvm.fabs.v3f32(<3 x float> %V) %cmp = fcmp olt <3 x float> %abs, <float -0.0, float -0.0, float undef> @@ -417,7 +421,9 @@ define <3 x i1> @fabs_is_not_negative_negzero_undef(<3 x float> %V) { define <3 x i1> @fabs_is_not_negative_poszero_undef(<3 x float> %V) { ; CHECK-LABEL: @fabs_is_not_negative_poszero_undef( -; CHECK-NEXT: ret <3 x i1> zeroinitializer +; CHECK-NEXT: [[ABS:%.*]] = call <3 x float> @llvm.fabs.v3f32(<3 x float> [[V:%.*]]) +; CHECK-NEXT: [[CMP:%.*]] = fcmp olt <3 x float> [[ABS]], <float 0.000000e+00, float 0.000000e+00, float undef> +; CHECK-NEXT: ret <3 x i1> [[CMP]] ; %abs = call <3 x float> @llvm.fabs.v3f32(<3 x float> %V) %cmp = fcmp olt <3 x float> %abs, <float 0.0, float 0.0, float undef> @@ -426,7 +432,9 @@ define <3 x i1> @fabs_is_not_negative_poszero_undef(<3 x float> %V) { define <3 x i1> @fabs_is_not_negative_anyzero_undef(<3 x float> %V) { ; CHECK-LABEL: @fabs_is_not_negative_anyzero_undef( -; CHECK-NEXT: ret <3 x i1> zeroinitializer +; CHECK-NEXT: [[ABS:%.*]] = call <3 x float> @llvm.fabs.v3f32(<3 x float> [[V:%.*]]) +; CHECK-NEXT: [[CMP:%.*]] = fcmp olt <3 x float> [[ABS]], <float 0.000000e+00, float -0.000000e+00, float undef> +; CHECK-NEXT: ret <3 x i1> [[CMP]] ; %abs = call <3 x float> @llvm.fabs.v3f32(<3 x float> %V) %cmp = fcmp olt <3 x float> %abs, <float 0.0, float -0.0, float undef> |