mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-26 05:32:25 +00:00
PPC: Map frin to round() not nearbyint() and rint()
Making use of the recently-added ISD::FROUND, which allows for custom lowering of round(), the PPC backend will now map frin to round(). Previously, we had been using frin to lower nearbyint() (and rint() via some custom lowering to handle the extra fenv flags requirements), but only in fast-math mode because frin does not tie-to-even. Several users had complained about this behavior, and this new mapping of frin to round is certainly more appropriate (and does not require fast-math mode). In effect, this reverts r178362 (and part of r178337, replacing the nearbyint mapping with the round mapping). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187960 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hal Finkel
parent
9706d43b56
commit
05a4d2642b
@ -156,21 +156,12 @@ PPCTargetLowering::PPCTargetLowering(PPCTargetMachine &TM)
|
||||
setOperationAction(ISD::FFLOOR, MVT::f64, Legal);
|
||||
setOperationAction(ISD::FCEIL, MVT::f64, Legal);
|
||||
setOperationAction(ISD::FTRUNC, MVT::f64, Legal);
|
||||
setOperationAction(ISD::FROUND, MVT::f64, Legal);
|
||||
|
||||
setOperationAction(ISD::FFLOOR, MVT::f32, Legal);
|
||||
setOperationAction(ISD::FCEIL, MVT::f32, Legal);
|
||||
setOperationAction(ISD::FTRUNC, MVT::f32, Legal);
|
||||
|
||||
// frin does not implement "ties to even." Thus, this is safe only in
|
||||
// fast-math mode.
|
||||
if (TM.Options.UnsafeFPMath) {
|
||||
setOperationAction(ISD::FNEARBYINT, MVT::f64, Legal);
|
||||
setOperationAction(ISD::FNEARBYINT, MVT::f32, Legal);
|
||||
|
||||
// These need to set FE_INEXACT, and use a custom inserter.
|
||||
setOperationAction(ISD::FRINT, MVT::f64, Legal);
|
||||
setOperationAction(ISD::FRINT, MVT::f32, Legal);
|
||||
}
|
||||
setOperationAction(ISD::FROUND, MVT::f32, Legal);
|
||||
}
|
||||
|
||||
// PowerPC does not have BSWAP, CTPOP or CTTZ
|
||||
@ -6676,51 +6667,6 @@ PPCTargetLowering::EmitInstrWithCustomInserter(MachineInstr *MI,
|
||||
|
||||
// Restore FPSCR value.
|
||||
BuildMI(*BB, MI, dl, TII->get(PPC::MTFSF)).addImm(1).addReg(MFFSReg);
|
||||
} else if (MI->getOpcode() == PPC::FRINDrint ||
|
||||
MI->getOpcode() == PPC::FRINSrint) {
|
||||
bool isf32 = MI->getOpcode() == PPC::FRINSrint;
|
||||
unsigned Dest = MI->getOperand(0).getReg();
|
||||
unsigned Src = MI->getOperand(1).getReg();
|
||||
DebugLoc dl = MI->getDebugLoc();
|
||||
|
||||
MachineRegisterInfo &RegInfo = F->getRegInfo();
|
||||
unsigned CRReg = RegInfo.createVirtualRegister(&PPC::CRRCRegClass);
|
||||
|
||||
// Perform the rounding.
|
||||
BuildMI(*BB, MI, dl, TII->get(isf32 ? PPC::FRINS : PPC::FRIND), Dest)
|
||||
.addReg(Src);
|
||||
|
||||
// Compare the results.
|
||||
BuildMI(*BB, MI, dl, TII->get(isf32 ? PPC::FCMPUS : PPC::FCMPUD), CRReg)
|
||||
.addReg(Dest).addReg(Src);
|
||||
|
||||
// If the results were not equal, then set the FPSCR XX bit.
|
||||
MachineBasicBlock *midMBB = F->CreateMachineBasicBlock(LLVM_BB);
|
||||
MachineBasicBlock *exitMBB = F->CreateMachineBasicBlock(LLVM_BB);
|
||||
F->insert(It, midMBB);
|
||||
F->insert(It, exitMBB);
|
||||
exitMBB->splice(exitMBB->begin(), BB,
|
||||
llvm::next(MachineBasicBlock::iterator(MI)),
|
||||
BB->end());
|
||||
exitMBB->transferSuccessorsAndUpdatePHIs(BB);
|
||||
|
||||
BuildMI(*BB, MI, dl, TII->get(PPC::BCC))
|
||||
.addImm(PPC::PRED_EQ).addReg(CRReg).addMBB(exitMBB);
|
||||
|
||||
BB->addSuccessor(midMBB);
|
||||
BB->addSuccessor(exitMBB);
|
||||
|
||||
BB = midMBB;
|
||||
|
||||
// Set the FPSCR XX bit (FE_INEXACT). Note that we cannot just set
|
||||
// the FI bit here because that will not automatically set XX also,
|
||||
// and XX is what libm interprets as the FE_INEXACT flag.
|
||||
BuildMI(BB, dl, TII->get(PPC::MTFSB1)).addImm(/* 38 - 32 = */ 6);
|
||||
BuildMI(BB, dl, TII->get(PPC::B)).addMBB(exitMBB);
|
||||
|
||||
BB->addSuccessor(exitMBB);
|
||||
|
||||
BB = exitMBB;
|
||||
} else {
|
||||
llvm_unreachable("Unexpected instr type to insert");
|
||||
}
|
||||
|
||||
@ -1686,23 +1686,13 @@ let Uses = [RM] in {
|
||||
"frsp", "$frD, $frB", FPGeneral,
|
||||
[(set f32:$frD, (fround f64:$frB))]>;
|
||||
|
||||
// The frin -> nearbyint mapping is valid only in fast-math mode.
|
||||
let Interpretation64Bit = 1 in
|
||||
defm FRIND : XForm_26r<63, 392, (outs f8rc:$frD), (ins f8rc:$frB),
|
||||
"frin", "$frD, $frB", FPGeneral,
|
||||
[(set f64:$frD, (fnearbyint f64:$frB))]>;
|
||||
[(set f64:$frD, (frnd f64:$frB))]>;
|
||||
defm FRINS : XForm_26r<63, 392, (outs f4rc:$frD), (ins f4rc:$frB),
|
||||
"frin", "$frD, $frB", FPGeneral,
|
||||
[(set f32:$frD, (fnearbyint f32:$frB))]>;
|
||||
}
|
||||
|
||||
// These pseudos expand to rint but also set FE_INEXACT when the result does
|
||||
// not equal the argument.
|
||||
let usesCustomInserter = 1, Defs = [RM] in { // FIXME: Model FPSCR!
|
||||
def FRINDrint : Pseudo<(outs f8rc:$frD), (ins f8rc:$frB),
|
||||
"#FRINDrint", [(set f64:$frD, (frint f64:$frB))]>;
|
||||
def FRINSrint : Pseudo<(outs f4rc:$frD), (ins f4rc:$frB),
|
||||
"#FRINSrint", [(set f32:$frD, (frint f32:$frB))]>;
|
||||
[(set f32:$frD, (frnd f32:$frB))]>;
|
||||
}
|
||||
|
||||
let neverHasSideEffects = 1 in {
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s
|
||||
; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 -enable-unsafe-fp-math | FileCheck -check-prefix=CHECK-FM %s
|
||||
target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64"
|
||||
target triple = "powerpc64-unknown-linux-gnu"
|
||||
|
||||
@ -9,9 +8,6 @@ define float @test1(float %x) nounwind {
|
||||
|
||||
; CHECK-LABEL: test1:
|
||||
; CHECK: frim 1, 1
|
||||
|
||||
; CHECK-FM-LABEL: test1:
|
||||
; CHECK-FM: frim 1, 1
|
||||
}
|
||||
|
||||
declare float @floorf(float) nounwind readnone
|
||||
@ -22,38 +18,29 @@ define double @test2(double %x) nounwind {
|
||||
|
||||
; CHECK-LABEL: test2:
|
||||
; CHECK: frim 1, 1
|
||||
|
||||
; CHECK-FM-LABEL: test2:
|
||||
; CHECK-FM: frim 1, 1
|
||||
}
|
||||
|
||||
declare double @floor(double) nounwind readnone
|
||||
|
||||
define float @test3(float %x) nounwind {
|
||||
%call = tail call float @nearbyintf(float %x) nounwind readnone
|
||||
%call = tail call float @roundf(float %x) nounwind readnone
|
||||
ret float %call
|
||||
|
||||
; CHECK-LABEL: test3:
|
||||
; CHECK-NOT: frin
|
||||
|
||||
; CHECK-FM-LABEL: test3:
|
||||
; CHECK-FM: frin 1, 1
|
||||
; CHECK: frin 1, 1
|
||||
}
|
||||
|
||||
declare float @nearbyintf(float) nounwind readnone
|
||||
declare float @roundf(float) nounwind readnone
|
||||
|
||||
define double @test4(double %x) nounwind {
|
||||
%call = tail call double @nearbyint(double %x) nounwind readnone
|
||||
%call = tail call double @round(double %x) nounwind readnone
|
||||
ret double %call
|
||||
|
||||
; CHECK-LABEL: test4:
|
||||
; CHECK-NOT: frin
|
||||
|
||||
; CHECK-FM-LABEL: test4:
|
||||
; CHECK-FM: frin 1, 1
|
||||
; CHECK: frin 1, 1
|
||||
}
|
||||
|
||||
declare double @nearbyint(double) nounwind readnone
|
||||
declare double @round(double) nounwind readnone
|
||||
|
||||
define float @test5(float %x) nounwind {
|
||||
%call = tail call float @ceilf(float %x) nounwind readnone
|
||||
@ -61,9 +48,6 @@ define float @test5(float %x) nounwind {
|
||||
|
||||
; CHECK-LABEL: test5:
|
||||
; CHECK: frip 1, 1
|
||||
|
||||
; CHECK-FM-LABEL: test5:
|
||||
; CHECK-FM: frip 1, 1
|
||||
}
|
||||
|
||||
declare float @ceilf(float) nounwind readnone
|
||||
@ -74,9 +58,6 @@ define double @test6(double %x) nounwind {
|
||||
|
||||
; CHECK-LABEL: test6:
|
||||
; CHECK: frip 1, 1
|
||||
|
||||
; CHECK-FM-LABEL: test6:
|
||||
; CHECK-FM: frip 1, 1
|
||||
}
|
||||
|
||||
declare double @ceil(double) nounwind readnone
|
||||
@ -87,9 +68,6 @@ define float @test9(float %x) nounwind {
|
||||
|
||||
; CHECK-LABEL: test9:
|
||||
; CHECK: friz 1, 1
|
||||
|
||||
; CHECK-FM-LABEL: test9:
|
||||
; CHECK-FM: friz 1, 1
|
||||
}
|
||||
|
||||
declare float @truncf(float) nounwind readnone
|
||||
@ -100,48 +78,7 @@ define double @test10(double %x) nounwind {
|
||||
|
||||
; CHECK-LABEL: test10:
|
||||
; CHECK: friz 1, 1
|
||||
|
||||
; CHECK-FM-LABEL: test10:
|
||||
; CHECK-FM: friz 1, 1
|
||||
}
|
||||
|
||||
declare double @trunc(double) nounwind readnone
|
||||
|
||||
define void @test11(float %x, float* %y) nounwind {
|
||||
%call = tail call float @rintf(float %x) nounwind readnone
|
||||
store float %call, float* %y
|
||||
ret void
|
||||
|
||||
; CHECK-LABEL: test11:
|
||||
; CHECK-NOT: frin
|
||||
|
||||
; CHECK-FM-LABEL: test11:
|
||||
; CHECK-FM: frin [[R2:[0-9]+]], [[R1:[0-9]+]]
|
||||
; CHECK-FM: fcmpu [[CR:[0-9]+]], [[R2]], [[R1]]
|
||||
; CHECK-FM: beq [[CR]], .LBB[[BB:[0-9]+]]_2
|
||||
; CHECK-FM: mtfsb1 6
|
||||
; CHECK-FM: .LBB[[BB]]_2:
|
||||
; CHECK-FM: blr
|
||||
}
|
||||
|
||||
declare float @rintf(float) nounwind readnone
|
||||
|
||||
define void @test12(double %x, double* %y) nounwind {
|
||||
%call = tail call double @rint(double %x) nounwind readnone
|
||||
store double %call, double* %y
|
||||
ret void
|
||||
|
||||
; CHECK-LABEL: test12:
|
||||
; CHECK-NOT: frin
|
||||
|
||||
; CHECK-FM-LABEL: test12:
|
||||
; CHECK-FM: frin [[R2:[0-9]+]], [[R1:[0-9]+]]
|
||||
; CHECK-FM: fcmpu [[CR:[0-9]+]], [[R2]], [[R1]]
|
||||
; CHECK-FM: beq [[CR]], .LBB[[BB:[0-9]+]]_2
|
||||
; CHECK-FM: mtfsb1 6
|
||||
; CHECK-FM: .LBB[[BB]]_2:
|
||||
; CHECK-FM: blr
|
||||
}
|
||||
|
||||
declare double @rint(double) nounwind readnone
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user