[InstCombine] Fold fcmp into select #86482

dtcxzyw · 2024-03-25T10:25:37Z

This patch simplifies fcmp (select Cond, C1, C2), C3 patterns in ceres:
Alive2: https://alive2.llvm.org/ce/z/fWh_sD

define i1 @src(double %x) {
  %cmp1 = fcmp ord double %x, 0.000000e+00
  %sel = select i1 %cmp1, double 0xFFFFFFFFFFFFFFFF, double 0.000000e+00
  %cmp2 = fcmp oeq double %sel, 0.000000e+00
  ret i1 %cmp2
}

define i1 @tgt(double %x) {
  %cmp1 = fcmp uno double %x, 0.000000e+00
  ret i1 %cmp1
}

llvmbot · 2024-03-25T10:26:07Z

@llvm/pr-subscribers-llvm-transforms

Author: Yingwei Zheng (dtcxzyw)

Changes

This patch simplifies fcmp (select Cond, C1, C2), C3 patterns in ceres:
Alive2: https://alive2.llvm.org/ce/z/fWh_sD

define i1 @<!-- -->src(double %x) {
  %cmp1 = fcmp ord double %x, 0.000000e+00
  %sel = select i1 %cmp1, double 0xFFFFFFFFFFFFFFFF, double 0.000000e+00
  %cmp2 = fcmp oeq double %sel, 0.000000e+00
  ret i1 %cmp2
}

define i1 @<!-- -->tgt(double %x) {
  %cmp1 = fcmp uno double %x, 0.000000e+00
  ret i1 %cmp1
}

Full diff: https://github.com/llvm/llvm-project/pull/86482.diff

3 Files Affected:

(modified) llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp (+4)
(modified) llvm/test/Transforms/InstCombine/fcmp-select.ll (+65)
(modified) llvm/test/Transforms/InstCombine/select-select.ll (+3-4)

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
index db302d7e526844..ba13c59e047b52 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -8020,6 +8020,10 @@ Instruction *InstCombinerImpl::visitFCmpInst(FCmpInst &I) {
       if (Instruction *NV = foldOpIntoPhi(I, cast<PHINode>(LHSI)))
         return NV;
       break;
+    case Instruction::Select:
+      if (Instruction *NV = FoldOpIntoSelect(I, cast<SelectInst>(LHSI)))
+        return NV;
+      break;
     case Instruction::SIToFP:
     case Instruction::UIToFP:
       if (Instruction *NV = foldFCmpIntToFPConst(I, LHSI, RHSC))
diff --git a/llvm/test/Transforms/InstCombine/fcmp-select.ll b/llvm/test/Transforms/InstCombine/fcmp-select.ll
index f37c586845b12d..62fad8349d22e2 100644
--- a/llvm/test/Transforms/InstCombine/fcmp-select.ll
+++ b/llvm/test/Transforms/InstCombine/fcmp-select.ll
@@ -148,3 +148,68 @@ define i1 @fcmp_ogt_select(i1 %cond, float %a, float %b) {
   %res = fcmp ogt float %lhs, %rhs
   ret i1 %res
 }
+
+define i1 @test_fcmp_select_const_const(double %x) {
+; CHECK-LABEL: @test_fcmp_select_const_const(
+; CHECK-NEXT:    [[CMP1:%.*]] = fcmp uno double [[X:%.*]], 0.000000e+00
+; CHECK-NEXT:    ret i1 [[CMP1]]
+;
+  %cmp1 = fcmp ord double %x, 0.000000e+00
+  %sel = select i1 %cmp1, double 0xFFFFFFFFFFFFFFFF, double 0.000000e+00
+  %cmp2 = fcmp oeq double %sel, 0.000000e+00
+  ret i1 %cmp2
+}
+
+define i1 @test_fcmp_select_var_const(double %x, double %y) {
+; CHECK-LABEL: @test_fcmp_select_var_const(
+; CHECK-NEXT:    [[CMP1:%.*]] = fcmp ule double [[X:%.*]], 0x3E80000000000000
+; CHECK-NEXT:    [[TMP1:%.*]] = fcmp olt double [[Y:%.*]], 0x3E80000000000000
+; CHECK-NEXT:    [[CMP2:%.*]] = select i1 [[CMP1]], i1 true, i1 [[TMP1]]
+; CHECK-NEXT:    ret i1 [[CMP2]]
+;
+  %cmp1 = fcmp ogt double %x, 0x3E80000000000000
+  %sel = select i1 %cmp1, double %y, double 0.000000e+00
+  %cmp2 = fcmp olt double %sel, 0x3E80000000000000
+  ret i1 %cmp2
+}
+
+define i1 @test_fcmp_select_var_const_fmf(double %x, double %y) {
+; CHECK-LABEL: @test_fcmp_select_var_const_fmf(
+; CHECK-NEXT:    [[CMP1:%.*]] = fcmp ule double [[X:%.*]], 0x3E80000000000000
+; CHECK-NEXT:    [[CMP2:%.*]] = fcmp nnan olt double [[SEL:%.*]], 0x3E80000000000000
+; CHECK-NEXT:    [[CMP3:%.*]] = select i1 [[CMP1]], i1 true, i1 [[CMP2]]
+; CHECK-NEXT:    ret i1 [[CMP3]]
+;
+  %cmp1 = fcmp ogt double %x, 0x3E80000000000000
+  %sel = select i1 %cmp1, double %y, double 0.000000e+00
+  %cmp2 = fcmp nnan olt double %sel, 0x3E80000000000000
+  ret i1 %cmp2
+}
+
+define <2 x i1> @test_fcmp_select_const_const_vec(<2 x double> %x) {
+; CHECK-LABEL: @test_fcmp_select_const_const_vec(
+; CHECK-NEXT:    [[CMP1:%.*]] = fcmp uno <2 x double> [[X:%.*]], zeroinitializer
+; CHECK-NEXT:    ret <2 x i1> [[CMP1]]
+;
+  %cmp1 = fcmp ord <2 x double> %x, zeroinitializer
+  %sel = select <2 x i1> %cmp1, <2 x double> <double 0xFFFFFFFFFFFFFFFF, double 0xFFFFFFFFFFFFFFFF>, <2 x double> zeroinitializer
+  %cmp2 = fcmp oeq <2 x double> %sel, zeroinitializer
+  ret <2 x i1> %cmp2
+}
+
+; Don't break clamp idioms
+
+define double @test_fcmp_select_clamp(double %x) {
+; CHECK-LABEL: @test_fcmp_select_clamp(
+; CHECK-NEXT:    [[CMP1:%.*]] = fcmp ogt double [[X:%.*]], 9.000000e-01
+; CHECK-NEXT:    [[SEL1:%.*]] = select i1 [[CMP1]], double 9.000000e-01, double [[X]]
+; CHECK-NEXT:    [[CMP2:%.*]] = fcmp olt double [[SEL1]], 5.000000e-01
+; CHECK-NEXT:    [[SEL2:%.*]] = select i1 [[CMP2]], double 5.000000e-01, double [[SEL1]]
+; CHECK-NEXT:    ret double [[SEL2]]
+;
+  %cmp1 = fcmp ogt double %x, 9.000000e-01
+  %sel1 = select i1 %cmp1, double 9.000000e-01, double %x
+  %cmp2 = fcmp olt double %sel1, 5.000000e-01
+  %sel2 = select i1 %cmp2, double 5.000000e-01, double %sel1
+  ret double %sel2
+}
diff --git a/llvm/test/Transforms/InstCombine/select-select.ll b/llvm/test/Transforms/InstCombine/select-select.ll
index 785766136fb71b..84fe973093e327 100644
--- a/llvm/test/Transforms/InstCombine/select-select.ll
+++ b/llvm/test/Transforms/InstCombine/select-select.ll
@@ -18,11 +18,10 @@ define float @foo1(float %a) {
 
 define float @foo2(float %a) {
 ; CHECK-LABEL: @foo2(
-; CHECK-NEXT:    [[B:%.*]] = fcmp ogt float [[A:%.*]], 0.000000e+00
-; CHECK-NEXT:    [[C:%.*]] = select i1 [[B]], float [[A]], float 0.000000e+00
+; CHECK-NEXT:    [[B:%.*]] = fcmp ule float [[C:%.*]], 0.000000e+00
 ; CHECK-NEXT:    [[D:%.*]] = fcmp olt float [[C]], 1.000000e+00
-; CHECK-NEXT:    [[E:%.*]] = select i1 [[B]], float [[A]], float 0.000000e+00
-; CHECK-NEXT:    [[F:%.*]] = select i1 [[D]], float [[E]], float 1.000000e+00
+; CHECK-NEXT:    [[E:%.*]] = select i1 [[D]], float [[C]], float 1.000000e+00
+; CHECK-NEXT:    [[F:%.*]] = select i1 [[B]], float 0.000000e+00, float [[E]]
 ; CHECK-NEXT:    ret float [[F]]
 ;
   %b = fcmp ogt float %a, 0.0

PR Link: llvm/llvm-project#86482

github-actions · 2024-03-25T10:28:42Z

✅ With the latest revision this PR passed the C/C++ code formatter.

github-actions · 2024-03-25T10:28:42Z

✅ With the latest revision this PR passed the Python code formatter.

goldsteinn · 2024-03-25T16:52:52Z

llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp

+    case Instruction::Select:
+      if (Instruction *NV = FoldOpIntoSelect(I, cast<SelectInst>(LHSI)))
+        return NV;
+      break;


If both arms are constant, should we allow multiuse select?

Yeah, we can relax it in InstCombinerImpl::FoldOpIntoSelect.

IMO here, we have the argument FoldWithMultiUse and it would be a bit confusing if we started to surreptitiously assume it.

llvm/test/Transforms/InstCombine/fcmp-select.ll

goldsteinn · 2024-03-25T16:55:16Z

llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp

@@ -8020,6 +8020,10 @@ Instruction *InstCombinerImpl::visitFCmpInst(FCmpInst &I) {
      if (Instruction *NV = foldOpIntoPhi(I, cast<PHINode>(LHSI)))
        return NV;
      break;
+    case Instruction::Select:
+      if (Instruction *NV = FoldOpIntoSelect(I, cast<SelectInst>(LHSI)))


Should we update constantFoldOperationIntoSelectOperand to recognize fcmp?

It should be done in a separate patch.
Related patch: https://reviews.llvm.org/D146349

nikic

LGTM, but please add a multi-use test. (Without changing your current multi-use handling.)

dtcxzyw · 2024-04-22T06:10:27Z

LGTM, but please add a multi-use test. (Without changing your current multi-use handling.)

Done.

llvm/test/Transforms/InstCombine/fcmp-select.ll

dtcxzyw requested review from arsenm and goldsteinn March 25, 2024 10:25

dtcxzyw requested a review from nikic as a code owner March 25, 2024 10:25

llvmbot added the llvm:transforms label Mar 25, 2024

dtcxzyw added a commit to dtcxzyw/llvm-opt-benchmark that referenced this pull request Mar 25, 2024

pre-commit: test PR86482

bf2eff0

PR Link: llvm/llvm-project#86482

dtcxzyw mentioned this pull request Mar 25, 2024

pre-commit: test PR86482 dtcxzyw/llvm-opt-benchmark#455

Open

goldsteinn reviewed Mar 25, 2024

View reviewed changes

llvm/test/Transforms/InstCombine/fcmp-select.ll Show resolved Hide resolved

goldsteinn reviewed Mar 25, 2024

View reviewed changes

nikic approved these changes Apr 19, 2024

View reviewed changes

dtcxzyw added 3 commits April 22, 2024 13:44

[InstCombine] Add pre-commit tests. NFC.

97112e2

[InstCombine] Fold fcmp into select

d17041a

[InstCombine] Add additional tests. NFC.

09fd267

dtcxzyw force-pushed the perf/fcmp-into-select branch from 2eb6ea7 to 09fd267 Compare April 22, 2024 06:09

arsenm reviewed Apr 22, 2024

View reviewed changes

llvm/test/Transforms/InstCombine/fcmp-select.ll Show resolved Hide resolved

[InstCombine] Add additional unordered tests. NFC.

faac6c4

arsenm approved these changes Apr 23, 2024

View reviewed changes

dtcxzyw merged commit 9fb7a73 into llvm:main Apr 23, 2024
4 checks passed

dtcxzyw deleted the perf/fcmp-into-select branch April 23, 2024 11:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[InstCombine] Fold fcmp into select #86482

[InstCombine] Fold fcmp into select #86482

dtcxzyw commented Mar 25, 2024

llvmbot commented Mar 25, 2024

github-actions bot commented Mar 25, 2024

github-actions bot commented Mar 25, 2024

goldsteinn Mar 25, 2024

dtcxzyw Apr 11, 2024

goldsteinn Apr 11, 2024

goldsteinn Mar 25, 2024

dtcxzyw Mar 25, 2024

nikic left a comment

dtcxzyw commented Apr 22, 2024

[InstCombine] Fold fcmp into select #86482

[InstCombine] Fold fcmp into select #86482

Conversation

dtcxzyw commented Mar 25, 2024

llvmbot commented Mar 25, 2024

github-actions bot commented Mar 25, 2024

github-actions bot commented Mar 25, 2024

goldsteinn Mar 25, 2024

Choose a reason for hiding this comment

dtcxzyw Apr 11, 2024

Choose a reason for hiding this comment

goldsteinn Apr 11, 2024

Choose a reason for hiding this comment

goldsteinn Mar 25, 2024

Choose a reason for hiding this comment

dtcxzyw Mar 25, 2024

Choose a reason for hiding this comment

nikic left a comment

Choose a reason for hiding this comment

dtcxzyw commented Apr 22, 2024