diff options
| author | Roger Ferrer Ibanez <roger.ferreribanez@arm.com> | 2016-11-08 13:34:41 +0000 |
|---|---|---|
| committer | Roger Ferrer Ibanez <roger.ferreribanez@arm.com> | 2016-11-08 13:34:41 +0000 |
| commit | 80c0f33c2994356dd0c1156a68c27df36896ce26 (patch) | |
| tree | 3bcd52d4e8df6e2e047e54b4807eedd02c4e887b | |
| parent | e7cc54058dc182cab44cc0c77452f20b03bc4ce5 (diff) | |
| download | bcm5719-llvm-80c0f33c2994356dd0c1156a68c27df36896ce26.tar.gz bcm5719-llvm-80c0f33c2994356dd0c1156a68c27df36896ce26.zip | |
[AArch64] Fix incorrect CSEL node created
Under -enable-unsafe-fp-math, SELECT_CC lowering in AArch64
transforms floating point comparisons of the form "a == 0.0 ? 0.0 : x" to
"a == 0.0 ? a : x". But it incorrectly assumes that 'x' and 'a' have
the same type which can lead to a wrong CSEL node that crashes later
due to nonsensical copies.
Differential Revision: https://reviews.llvm.org/D26394
llvm-svn: 286231
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64ISelLowering.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/CodeGen/AArch64/csel-zero-float.ll | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 04219baf041..5bea916ad2a 100644 --- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -4106,10 +4106,11 @@ SDValue AArch64TargetLowering::LowerSELECT_CC(ISD::CondCode CC, SDValue LHS, ConstantFPSDNode *CTVal = dyn_cast<ConstantFPSDNode>(TVal); if ((CC == ISD::SETEQ || CC == ISD::SETOEQ || CC == ISD::SETUEQ) && - CTVal && CTVal->isZero()) + CTVal && CTVal->isZero() && TVal.getValueType() == LHS.getValueType()) TVal = LHS; else if ((CC == ISD::SETNE || CC == ISD::SETONE || CC == ISD::SETUNE) && - CFVal && CFVal->isZero()) + CFVal && CFVal->isZero() && + FVal.getValueType() == LHS.getValueType()) FVal = LHS; } } diff --git a/llvm/test/CodeGen/AArch64/csel-zero-float.ll b/llvm/test/CodeGen/AArch64/csel-zero-float.ll new file mode 100644 index 00000000000..9869c651f56 --- /dev/null +++ b/llvm/test/CodeGen/AArch64/csel-zero-float.ll @@ -0,0 +1,15 @@ +; RUN: llc -mtriple=aarch64-none-linux-gnu -enable-unsafe-fp-math < %s +; There is no invocation to FileCheck as this +; caused a crash in "Post-RA pseudo instruction expansion" + +define double @foo(float *%user, float %t17) { + %t16 = load float, float* %user, align 8 + %conv = fpext float %t16 to double + %cmp26 = fcmp fast oeq float %t17, 0.000000e+00 + %div = fdiv fast float %t16, %t17 + %div.op = fmul fast float %div, 1.000000e+02 + %t18 = fpext float %div.op to double + %conv31 = select i1 %cmp26, double 0.000000e+00, double %t18 + ret double %conv31 +} + |
