[llvm] a50ab86 - Revert STRICT_FCMP nonan optimisation
Thomas Preud'homme via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 9 03:27:48 PST 2021
Author: Thomas Preud'homme
Date: 2021-02-09T11:27:35Z
New Revision: a50ab8672d160178d7e6daef16b63bc7f61a3e94
URL: https://github.com/llvm/llvm-project/commit/a50ab8672d160178d7e6daef16b63bc7f61a3e94
DIFF: https://github.com/llvm/llvm-project/commit/a50ab8672d160178d7e6daef16b63bc7f61a3e94.diff
LOG: Revert STRICT_FCMP nonan optimisation
Summary: This reverts commit b7b61a7b5bc63df0d84f3722a1dcfa375c35ba30 which fails on some of the builders: http://lab.llvm.org:8011/#/builders/14/builds/5806
Reviewers:
Subscribers:
Added:
Modified:
llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Removed:
llvm/test/CodeGen/AArch64/arm64-constrained-fcmp-no-nans-opt.ll
################################################################################
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index ef3464487749..936b56dad485 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -7125,10 +7125,7 @@ void SelectionDAGBuilder::visitConstrainedFPIntrinsic(
case ISD::STRICT_FSETCC:
case ISD::STRICT_FSETCCS: {
auto *FPCmp = dyn_cast<ConstrainedFPCmpIntrinsic>(&FPI);
- ISD::CondCode Condition = getFCmpCondCode(FPCmp->getPredicate());
- if (TM.Options.NoNaNsFPMath)
- Condition = getFCmpCodeWithoutNaN(Condition);
- Opers.push_back(DAG.getCondCode(Condition));
+ Opers.push_back(DAG.getCondCode(getFCmpCondCode(FPCmp->getPredicate())));
break;
}
}
diff --git a/llvm/test/CodeGen/AArch64/arm64-constrained-fcmp-no-nans-opt.ll b/llvm/test/CodeGen/AArch64/arm64-constrained-fcmp-no-nans-opt.ll
deleted file mode 100644
index c06d55cb9646..000000000000
--- a/llvm/test/CodeGen/AArch64/arm64-constrained-fcmp-no-nans-opt.ll
+++ /dev/null
@@ -1,167 +0,0 @@
-; RUN: llc < %s -mtriple=arm64-eabi -mattr=+fullfp16 -enable-no-nans-fp-math | FileCheck %s
-
-declare i1 @llvm.experimental.constrained.fcmp.f16(half, half, metadata, metadata)
-declare i1 @llvm.experimental.constrained.fcmp.f32(float, float, metadata, metadata)
-declare i1 @llvm.experimental.constrained.fcmp.f64(double, double, metadata, metadata)
-
-; CHECK-LABEL: @f16_constrained_fcmp_ueq
-; CHECK: fcmp h0, h1
-; CHECK-NEXT: cset w0, eq
-; CHECK-NEXT: ret
-define i1 @f16_constrained_fcmp_ueq(half %a, half %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f16(half %a, half %b, metadata !"ueq", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f16_constrained_fcmp_une
-; CHECK: fcmp h0, h1
-; CHECK-NEXT: cset w0, ne
-; CHECK-NEXT: ret
-define i1 @f16_constrained_fcmp_une(half %a, half %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f16(half %a, half %b, metadata !"une", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f16_constrained_fcmp_ugt
-; CHECK: fcmp h0, h1
-; CHECK-NEXT: cset w0, gt
-; CHECK-NEXT: ret
-define i1 @f16_constrained_fcmp_ugt(half %a, half %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f16(half %a, half %b, metadata !"ugt", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f16_constrained_fcmp_uge
-; CHECK: fcmp h0, h1
-; CHECK-NEXT: cset w0, ge
-; CHECK-NEXT: ret
-define i1 @f16_constrained_fcmp_uge(half %a, half %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f16(half %a, half %b, metadata !"uge", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f16_constrained_fcmp_ult
-; CHECK: fcmp h0, h1
-; CHECK-NEXT: cset w0, lt
-; CHECK-NEXT: ret
-define i1 @f16_constrained_fcmp_ult(half %a, half %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f16(half %a, half %b, metadata !"ult", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f16_constrained_fcmp_ule
-; CHECK: fcmp h0, h1
-; CHECK-NEXT: cset w0, le
-; CHECK-NEXT: ret
-define i1 @f16_constrained_fcmp_ule(half %a, half %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f16(half %a, half %b, metadata !"ule", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f32_constrained_fcmp_ueq
-; CHECK: fcmp s0, s1
-; CHECK-NEXT: cset w0, eq
-; CHECK-NEXT: ret
-define i1 @f32_constrained_fcmp_ueq(float %a, float %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f32(float %a, float %b, metadata !"ueq", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f32_constrained_fcmp_une
-; CHECK: fcmp s0, s1
-; CHECK-NEXT: cset w0, ne
-; CHECK-NEXT: ret
-define i1 @f32_constrained_fcmp_une(float %a, float %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f32(float %a, float %b, metadata !"une", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f32_constrained_fcmp_ugt
-; CHECK: fcmp s0, s1
-; CHECK-NEXT: cset w0, gt
-; CHECK-NEXT: ret
-define i1 @f32_constrained_fcmp_ugt(float %a, float %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f32(float %a, float %b, metadata !"ugt", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f32_constrained_fcmp_uge
-; CHECK: fcmp s0, s1
-; CHECK-NEXT: cset w0, ge
-; CHECK-NEXT: ret
-define i1 @f32_constrained_fcmp_uge(float %a, float %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f32(float %a, float %b, metadata !"uge", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f32_constrained_fcmp_ult
-; CHECK: fcmp s0, s1
-; CHECK-NEXT: cset w0, lt
-; CHECK-NEXT: ret
-define i1 @f32_constrained_fcmp_ult(float %a, float %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f32(float %a, float %b, metadata !"ult", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f32_constrained_fcmp_ule
-; CHECK: fcmp s0, s1
-; CHECK-NEXT: cset w0, le
-; CHECK-NEXT: ret
-define i1 @f32_constrained_fcmp_ule(float %a, float %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f32(float %a, float %b, metadata !"ule", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f64_constrained_fcmp_ueq
-; CHECK: fcmp d0, d1
-; CHECK-NEXT: cset w0, eq
-; CHECK-NEXT: ret
-define i1 @f64_constrained_fcmp_ueq(double %a, double %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f64(double %a, double %b, metadata !"ueq", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f64_constrained_fcmp_une
-; CHECK: fcmp d0, d1
-; CHECK-NEXT: cset w0, ne
-; CHECK-NEXT: ret
-define i1 @f64_constrained_fcmp_une(double %a, double %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f64(double %a, double %b, metadata !"une", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f64_constrained_fcmp_ugt
-; CHECK: fcmp d0, d1
-; CHECK-NEXT: cset w0, gt
-; CHECK-NEXT: ret
-define i1 @f64_constrained_fcmp_ugt(double %a, double %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f64(double %a, double %b, metadata !"ugt", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f64_constrained_fcmp_uge
-; CHECK: fcmp d0, d1
-; CHECK-NEXT: cset w0, ge
-; CHECK-NEXT: ret
-define i1 @f64_constrained_fcmp_uge(double %a, double %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f64(double %a, double %b, metadata !"uge", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f64_constrained_fcmp_ult
-; CHECK: fcmp d0, d1
-; CHECK-NEXT: cset w0, lt
-; CHECK-NEXT: ret
-define i1 @f64_constrained_fcmp_ult(double %a, double %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f64(double %a, double %b, metadata !"ult", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
-
-; CHECK-LABEL: @f64_constrained_fcmp_ule
-; CHECK: fcmp d0, d1
-; CHECK-NEXT: cset w0, le
-; CHECK-NEXT: ret
-define i1 @f64_constrained_fcmp_ule(double %a, double %b) nounwind ssp {
- %cmp = tail call i1 @llvm.experimental.constrained.fcmp.f64(double %a, double %b, metadata !"ule", metadata !"fpexcept.strict")
- ret i1 %cmp
-}
More information about the llvm-commits
mailing list