[llvm-commits] [llvm] r132458 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/2011-06-01-fildll.ll

[Eli Friedman]

On Thu, Jun 2, 2011 at 8:57 AM, Stuart Hastings <stuart at apple.com> wrote:
> Author: stuart
> Date: Thu Jun  2 10:57:11 2011
> New Revision: 132458
>
> URL: http://llvm.org/viewvc/llvm-project?rev=132458&view=rev
> Log:
> Omit unnecessary stack copy when x87 input is a load.
> rdar://problem/6373334
>
> Added:
>    llvm/trunk/test/CodeGen/X86/2011-06-01-fildll.ll
> Modified:
>    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=132458&r1=132457&r2=132458&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Jun  2 10:57:11 2011
> @@ -6700,6 +6700,11 @@
>   DebugLoc dl = Op.getDebugLoc();
>   unsigned Size = SrcVT.getSizeInBits()/8;
>   MachineFunction &MF = DAG.getMachineFunction();
> +
> +  SDValue Addr = Op.getOperand(0);
> +  if (Addr.getOpcode() == ISD::LOAD)
> +    return BuildFILD(Op, SrcVT, DAG.getEntryNode(), Addr, DAG);

You're ignoring both the chain operand and chain result of the load
here.  This is also missing some safety checks; in particular, it
doesn't check whether the load is an extload, or whether the load is
volatile, or whether the load has multiple uses.

-Eli

>   int SSFI = MF.getFrameInfo()->CreateStackObject(Size, Size, false);
>   SDValue StackSlot = DAG.getFrameIndex(SSFI, getPointerTy());
>   SDValue Chain = DAG.getStore(DAG.getEntryNode(), dl, Op.getOperand(0),
> @@ -6723,12 +6728,18 @@
>
>   unsigned ByteSize = SrcVT.getSizeInBits()/8;
>
> -  int SSFI = cast<FrameIndexSDNode>(StackSlot)->getIndex();
> -  MachineMemOperand *MMO =
> -    DAG.getMachineFunction()
> -    .getMachineMemOperand(MachinePointerInfo::getFixedStack(SSFI),
> -                          MachineMemOperand::MOLoad, ByteSize, ByteSize);
> -
> +  FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(StackSlot);
> +  MachineMemOperand *MMO;
> +  if (FI) {
> +    int SSFI = FI->getIndex();
> +    MMO =
> +      DAG.getMachineFunction()
> +      .getMachineMemOperand(MachinePointerInfo::getFixedStack(SSFI),
> +                            MachineMemOperand::MOLoad, ByteSize, ByteSize);
> +  } else {
> +    MMO = cast<LoadSDNode>(StackSlot)->getMemOperand();
> +    StackSlot = StackSlot.getOperand(1);
> +  }
>   SDValue Ops[] = { Chain, StackSlot, DAG.getValueType(SrcVT) };
>   SDValue Result = DAG.getMemIntrinsicNode(useSSE ? X86ISD::FILD_FLAG :
>                                            X86ISD::FILD, DL,
>
> Added: llvm/trunk/test/CodeGen/X86/2011-06-01-fildll.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2011-06-01-fildll.ll?rev=132458&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/2011-06-01-fildll.ll (added)
> +++ llvm/trunk/test/CodeGen/X86/2011-06-01-fildll.ll Thu Jun  2 10:57:11 2011
> @@ -0,0 +1,15 @@
> +; RUN: llc %s -march=x86
> +; ModuleID = '<stdin>'
> +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
> +target triple = "i386-apple-macosx10.6.6"
> +
> +define float @f(i64* nocapture %x) nounwind readonly ssp {
> +entry:
> +; CHECK: movl
> +; CHECK-NOT: movl
> +  %tmp1 = load i64* %x, align 4
> +; CHECK: fildll
> +  %conv = sitofp i64 %tmp1 to float
> +  %add = fadd float %conv, 1.000000e+00
> +  ret float %add
> +}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>