llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-llvm-transforms Author: None (llvmbot) <details> <summary>Changes</summary> Backport 8abc917fe04140b6c6088a67e0398f637efde808 Requested by: @<!-- -->dtcxzyw --- Full diff: https://github.com/llvm/llvm-project/pull/137606.diff 2 Files Affected: - (modified) llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp (+3-1) - (modified) llvm/test/Transforms/InstCombine/and-fcmp.ll (+28) ``````````diff diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp index ca8a20b4b7312..ebb84d177a832 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp @@ -1475,7 +1475,9 @@ Value *InstCombinerImpl::foldLogicOfFCmps(FCmpInst *LHS, FCmpInst *RHS, } } - if (IsAnd && stripSignOnlyFPOps(LHS0) == stripSignOnlyFPOps(RHS0)) { + // This transform is not valid for a logical select. + if (!IsLogicalSelect && IsAnd && + stripSignOnlyFPOps(LHS0) == stripSignOnlyFPOps(RHS0)) { // and (fcmp ord x, 0), (fcmp u* x, inf) -> fcmp o* x, inf // and (fcmp ord x, 0), (fcmp u* fabs(x), inf) -> fcmp o* x, inf if (Value *Left = matchIsFiniteTest(Builder, LHS, RHS)) diff --git a/llvm/test/Transforms/InstCombine/and-fcmp.ll b/llvm/test/Transforms/InstCombine/and-fcmp.ll index c7bbc8ab56f9a..ec1b6ad2ea168 100644 --- a/llvm/test/Transforms/InstCombine/and-fcmp.ll +++ b/llvm/test/Transforms/InstCombine/and-fcmp.ll @@ -4990,6 +4990,34 @@ define i1 @clang_builtin_isnormal_inf_check_copysign(half %x, half %y) { ret i1 %and } +define i1 @clang_builtin_isnormal_inf_check_copysign_logical_select(half %x, half %y) { +; CHECK-LABEL: @clang_builtin_isnormal_inf_check_copysign_logical_select( +; CHECK-NEXT: [[COPYSIGN_X:%.*]] = call half @llvm.copysign.f16(half [[X:%.*]], half [[Y:%.*]]) +; CHECK-NEXT: [[ORD:%.*]] = fcmp ord half [[X]], 0xH0000 +; CHECK-NEXT: [[CMP:%.*]] = fcmp ueq half [[COPYSIGN_X]], 0xH7C00 +; CHECK-NEXT: [[AND:%.*]] = select i1 [[ORD]], i1 [[CMP]], i1 false +; CHECK-NEXT: ret i1 [[AND]] +; + %copysign.x = call half @llvm.copysign.f16(half %x, half %y) + %ord = fcmp ord half %x, 0.0 + %cmp = fcmp uge half %copysign.x, 0xH7C00 + %and = select i1 %ord, i1 %cmp, i1 false + ret i1 %and +} + +define i1 @clang_builtin_isnormal_inf_check_fabs_nnan_logical_select(half %x) { +; CHECK-LABEL: @clang_builtin_isnormal_inf_check_fabs_nnan_logical_select( +; CHECK-NEXT: [[COPYSIGN_X:%.*]] = call half @llvm.fabs.f16(half [[X:%.*]]) +; CHECK-NEXT: [[AND:%.*]] = fcmp oeq half [[COPYSIGN_X]], 0xH7C00 +; CHECK-NEXT: ret i1 [[AND]] +; + %copysign.x = call nnan half @llvm.fabs.f16(half %x) + %ord = fcmp ord half %x, 0.0 + %cmp = fcmp uge half %copysign.x, 0xH7C00 + %and = select i1 %ord, i1 %cmp, i1 false + ret i1 %and +} + define i1 @isnormal_logical_select_0(half %x) { ; CHECK-LABEL: @isnormal_logical_select_0( ; CHECK-NEXT: [[FABS_X:%.*]] = call half @llvm.fabs.f16(half [[X:%.*]]) `````````` </details> https://github.com/llvm/llvm-project/pull/137606 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
