summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@intel.com>2018-03-01 00:08:38 +0000
committerCraig Topper <craig.topper@intel.com>2018-03-01 00:08:38 +0000
commitccfa5257a659cf1f54dd3f8518c8c42218369c41 (patch)
treee710a1096658dea1ca7787f8749a0e78ee82ae3e /llvm
parent75c649c96029a540466010525c36b5f20df25f2f (diff)
downloadbcm5719-llvm-ccfa5257a659cf1f54dd3f8518c8c42218369c41.tar.gz
bcm5719-llvm-ccfa5257a659cf1f54dd3f8518c8c42218369c41.zip
[X86] Make sure we don't combine (fneg (fma X, Y, Z)) to a target specific node when there are no FMA instructions.
This would cause a 'cannot select' error at isel when we should have emitted a lib call and an xor. Fixes PR36553. llvm-svn: 326393
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/Target/X86/X86ISelLowering.cpp2
-rw-r--r--llvm/test/CodeGen/X86/pr36553.ll20
2 files changed, 21 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 8aecfd8fe7d..8921bd44b34 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -35737,7 +35737,7 @@ static SDValue combineFneg(SDNode *N, SelectionDAG &DAG,
// If we're negating an FMA node, then we can adjust the
// instruction to include the extra negation.
unsigned NewOpcode = 0;
- if (Arg.hasOneUse()) {
+ if (Arg.hasOneUse() && Subtarget.hasAnyFMA()) {
switch (Arg.getOpcode()) {
case ISD::FMA: NewOpcode = X86ISD::FNMSUB; break;
case X86ISD::FMSUB: NewOpcode = X86ISD::FNMADD; break;
diff --git a/llvm/test/CodeGen/X86/pr36553.ll b/llvm/test/CodeGen/X86/pr36553.ll
new file mode 100644
index 00000000000..827f80a3e07
--- /dev/null
+++ b/llvm/test/CodeGen/X86/pr36553.ll
@@ -0,0 +1,20 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc < %s -mtriple=x86_64-apple-darwin10 | FileCheck %s
+
+; Make sure we don't crash because we negated an fma when we didn't have any fma instructions.
+
+define float @pr36553(float %a, float %b, float %c) nounwind {
+; CHECK-LABEL: pr36553:
+; CHECK: ## %bb.0: ## %entry
+; CHECK-NEXT: pushq %rax
+; CHECK-NEXT: callq _fmaf
+; CHECK-NEXT: xorps {{.*}}(%rip), %xmm0
+; CHECK-NEXT: popq %rax
+; CHECK-NEXT: retq
+entry:
+ %0 = tail call float @llvm.fma.f32(float %a, float %b, float %c)
+ %sub = fsub float -0.000000e+00, %0
+ ret float %sub
+}
+
+declare float @llvm.fma.f32(float, float, float)
OpenPOWER on IntegriCloud