maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ARM] Support float literals under XO 

Follow up patch of r328313 to support the UseVMOVSR constraint. Removed
some unneeded instructions from the test and removed some stray
comments.

Differential Revision: https://reviews.llvm.org/D44941

llvm-svn: 328691
This commit is contained in:
Christof Douma 2018-03-28 10:02:26 +00:00
parent 203917e26e
commit a1e77c0e02
4 changed files with 32 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/ARM/ARMISelLowering.cpp
View File

@ -4519,8 +4519,8 @@ SDValue ARMTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
bool InvalidOnQNaN;
FPCCToARMCC(CC, CondCode, CondCode2, InvalidOnQNaN);
// Try to generate VMAXNM/VMINNM on ARMv8. Except if we compare to a zero.
// This ensures we use CMPFPw0 instead of CMPFP in such case.
// Normalize the fp compare. If RHS is zero we keep it there so we match
// CMPFPw0 instead of CMPFP.
if (Subtarget->hasFPARMv8() && !isFloatingPointZero(RHS) &&
(TrueVal.getValueType() == MVT::f32 || TrueVal.getValueType() == MVT::f64)) {
bool swpCmpOps = false;

3
llvm/lib/Target/ARM/ARMInstrNEON.td
View File

@ -6935,6 +6935,9 @@ def : VFPPat<(f64 (uint_to_fp (extractelt (v4i32 QPR:$src), imm:$lane))),
def : Pat<(f32 (bitconvert GPR:$a)),
(EXTRACT_SUBREG (VMOVDRR GPR:$a, GPR:$a), ssub_0)>,
Requires<[HasNEON, DontUseVMOVSR]>;
def : Pat<(arm_vmovsr GPR:$a),
(EXTRACT_SUBREG (VMOVDRR GPR:$a, GPR:$a), ssub_0)>,
Requires<[HasNEON, DontUseVMOVSR]>;
//===----------------------------------------------------------------------===//
// Non-Instruction Patterns

2
llvm/lib/Target/ARM/ARMInstrVFP.td
View File

@ -1069,7 +1069,7 @@ def VMOVSR : AVConv4I<0b11100000, 0b1010,
// pipelines.
let D = VFPNeonDomain;
}
def : Pat<(arm_vmovsr GPR:$Rt), (VMOVSR GPR:$Rt)>;
def : Pat<(arm_vmovsr GPR:$Rt), (VMOVSR GPR:$Rt)>, Requires<[HasVFP2, UseVMOVSR]>;
let hasSideEffects = 0 in {
def VMOVRRD : AVConv3I<0b11000101, 0b1011,

109
llvm/test/CodeGen/ARM/fcmp-xo.ll
View File

@ -1,118 +1,61 @@
; RUN: llc -mtriple=thumbv7m-arm-none-eabi -mattr=+execute-only,+fp-armv8 %s -o - | FileCheck %s
; RUN: llc -mtriple=thumbv7m-arm-none-eabi -mattr=+execute-only,+fp-armv8 %s -o - | FileCheck --check-prefixes=CHECK,VMOVSR %s
; RUN: llc -mtriple=thumbv7m-arm-none-eabi -mattr=+execute-only,+fp-armv8,+neon,+neonfp %s -o - | FileCheck --check-prefixes=CHECK,NEON %s
; This function used to run into a code selection error on fp-armv8 due to
; different ordering of the constant arguments of fcmp. Fixed by extending the
; code selection to handle the missing case.
define arm_aapcs_vfpcc void @foo0() local_unnamed_addr {
br i1 undef, label %.end, label %1
%2 = fcmp nsz olt float undef, 0.000000e+00
%3 = select i1 %2, float -5.000000e-01, float 5.000000e-01
%4 = fadd nsz float undef, %3
%5 = fptosi float %4 to i32
%6 = ashr i32 %5, 4
%7 = icmp slt i32 %6, 0
br i1 %7, label %8, label %.end
tail call arm_aapcs_vfpcc void @bar()
br label %.end
.end:
ret void
define arm_aapcs_vfpcc float @foo0() local_unnamed_addr {
%1 = fcmp nsz olt float undef, 0.000000e+00
%2 = select i1 %1, float -5.000000e-01, float 5.000000e-01
ret float %2
}
; CHECK-LABEL: foo0
; CHECK: vcmpe.f32 {{s[0-9]+}}, #0
define arm_aapcs_vfpcc void @float1() local_unnamed_addr {
define arm_aapcs_vfpcc float @float1() local_unnamed_addr {
br i1 undef, label %.end, label %1
%2 = fcmp nsz olt float undef, 1.000000e+00
%3 = select i1 %2, float -5.000000e-01, float 5.000000e-01
%4 = fadd nsz float undef, %3
%5 = fptosi float %4 to i32
%6 = ashr i32 %5, 4
%7 = icmp slt i32 %6, 0
br i1 %7, label %8, label %.end
tail call arm_aapcs_vfpcc void @bar()
br label %.end
.end:
ret void
%4 = phi float [ undef, %0 ], [ %3, %1]
ret float %4
}
; CHECK-LABEL: float1
; CHECK: vmov.f32 [[FPREG:s[0-9]+]], #1.000000e+00
; CHECK: vcmpe.f32 [[FPREG]], {{s[0-9]+}}
define arm_aapcs_vfpcc void @float128() local_unnamed_addr {
br i1 undef, label %.end, label %1
%2 = fcmp nsz olt float undef, 128.000000e+00
%3 = select i1 %2, float -5.000000e-01, float 5.000000e-01
%4 = fadd nsz float undef, %3
%5 = fptosi float %4 to i32
%6 = ashr i32 %5, 4
%7 = icmp slt i32 %6, 0
br i1 %7, label %8, label %.end
tail call arm_aapcs_vfpcc void @bar()
br label %.end
.end:
ret void
define arm_aapcs_vfpcc float @float128() local_unnamed_addr {
%1 = fcmp nsz olt float undef, 128.000000e+00
%2 = select i1 %1, float -5.000000e-01, float 5.000000e-01
ret float %2
}
; CHECK-LABEL: float128
; CHECK: mov.w [[REG:r[0-9]+]], #1124073472
; CHECK: vmov [[FPREG:s[0-9]+]], [[REG]]
; CHECK: vcmpe.f32 [[FPREG]], {{s[0-9]+}}
; VMOVSR: vmov [[FPREG:s[0-9]+]], [[REG]]
; VMOVSR: vcmpe.f32 [[FPREG]], {{s[0-9]+}}
; NEON: vmov d2, [[REG]], [[REG]]
; NEON: vcmpe.f32 s4, {{s[0-9]+}}
define arm_aapcs_vfpcc void @double1() local_unnamed_addr {
br i1 undef, label %.end, label %1
%2 = fcmp nsz olt double undef, 1.000000e+00
%3 = select i1 %2, double -5.000000e-01, double 5.000000e-01
%4 = fadd nsz double undef, %3
%5 = fptosi double %4 to i32
%6 = ashr i32 %5, 4
%7 = icmp slt i32 %6, 0
br i1 %7, label %8, label %.end
tail call arm_aapcs_vfpcc void @bar()
br label %.end
.end:
ret void
define arm_aapcs_vfpcc double @double1() local_unnamed_addr {
%1 = fcmp nsz olt double undef, 1.000000e+00
%2 = select i1 %1, double -5.000000e-01, double 5.000000e-01
ret double %2
}
; CHECK-LABEL: double1
; CHECK: vmov.f64 [[FPREG:d[0-9]+]], #1.000000e+00
; CHECK: vcmpe.f64 [[FPREG]], {{d[0-9]+}}
define arm_aapcs_vfpcc void @double128() local_unnamed_addr {
br i1 undef, label %.end, label %1
%2 = fcmp nsz olt double undef, 128.000000e+00
%3 = select i1 %2, double -5.000000e-01, double 5.000000e-01
%4 = fadd nsz double undef, %3
%5 = fptosi double %4 to i32
%6 = ashr i32 %5, 4
%7 = icmp slt i32 %6, 0
br i1 %7, label %8, label %.end
tail call arm_aapcs_vfpcc void @bar()
br label %.end
.end:
ret void
define arm_aapcs_vfpcc double @double128() local_unnamed_addr {
%1 = fcmp nsz olt double undef, 128.000000e+00
%2 = select i1 %1, double -5.000000e-01, double 5.000000e-01
ret double %2
}
; CHECK-LABEL: double128
; CHECK: movs [[REGL:r[0-9]+]], #0
; CHECK: movs [[REGH:r[0-9]+]], #0
; CHECK: movt [[REGH]], #16480
; CHECK: movs [[REGL:r[0-9]+]], #0
; CHECK: vmov [[FPREG:d[0-9]+]], [[REGL]], [[REGH]]
; CHECK: vcmpe.f64 [[FPREG]], {{d[0-9]+}}
declare arm_aapcs_vfpcc void @bar() local_unnamed_addr