From owner-svn-src-projects@freebsd.org Sat Sep 10 16:11:44 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20A8CBD41B3 for ; Sat, 10 Sep 2016 16:11:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E3A15320; Sat, 10 Sep 2016 16:11:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AGBhfm008946; Sat, 10 Sep 2016 16:11:43 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AGBgmt008938; Sat, 10 Sep 2016 16:11:42 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101611.u8AGBgmt008938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 16:11:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305683 - in projects/clang390-import/contrib/llvm: include/llvm/CodeGen lib/CodeGen/SelectionDAG lib/Target/Mips lib/Target/PowerPC X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 16:11:44 -0000 Author: dim Date: Sat Sep 10 16:11:42 2016 New Revision: 305683 URL: https://svnweb.freebsd.org/changeset/base/305683 Log: Pull in r280350 from upstream llvm trunk (by Hal Finkel): Add ISD::EH_DWARF_CFA, simplify @llvm.eh.dwarf.cfa on Mips, fix on PowerPC LLVM has an @llvm.eh.dwarf.cfa intrinsic, used to lower the GCC-compatible __builtin_dwarf_cfa() builtin. As pointed out in PR26761, this is currently broken on PowerPC (and likely on ARM as well). Currently, @llvm.eh.dwarf.cfa is lowered using: ADD(FRAMEADDR, FRAME_TO_ARGS_OFFSET) where FRAME_TO_ARGS_OFFSET defaults to the constant zero. On x86, FRAME_TO_ARGS_OFFSET is lowered to 2*SlotSize. This setup, however, does not work for PowerPC. Because of the way that the stack layout works, the canonical frame address is not exactly (FRAMEADDR + FRAME_TO_ARGS_OFFSET) on PowerPC (there is a lower save-area offset as well), so it is not just a matter of implementing FRAME_TO_ARGS_OFFSET for PowerPC (unless we redefine its semantics -- We can do that, since it is currently used only for @llvm.eh.dwarf.cfa lowering, but the better to directly lower the CFA construct itself (since it can be easily represented as a fixed-offset FrameIndex)). Mips currently does this, but by using a custom lowering for ADD that specifically recognizes the (FRAMEADDR, FRAME_TO_ARGS_OFFSET) pattern. This change introduces a ISD::EH_DWARF_CFA node, which by default expands using the existing logic, but can be directly lowered by the target. Mips is updated to use this method (which simplifies its implementation, and I suspect makes it more robust), and updates PowerPC to do the same. Fixes PR26761. Differential Revision: https://reviews.llvm.org/D24038 Modified: projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h Modified: projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h ============================================================================== --- projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h Sat Sep 10 16:11:42 2016 (r305683) @@ -90,6 +90,11 @@ namespace ISD { /// adjustment during unwind. FRAME_TO_ARGS_OFFSET, + /// EH_DWARF_CFA - This node represents the pointer to the DWARF Canonical + /// Frame Address (CFA), generally the value of the stack pointer at the + /// call site in the previous frame. + EH_DWARF_CFA, + /// OUTCHAIN = EH_RETURN(INCHAIN, OFFSET, HANDLER) - This node represents /// 'eh_return' gcc dwarf builtin, which is used to return from /// exception. The general meaning is: adjust stack by OFFSET and pass Modified: projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -999,6 +999,7 @@ void SelectionDAGLegalize::LegalizeOp(SD case ISD::MERGE_VALUES: case ISD::EH_RETURN: case ISD::FRAME_TO_ARGS_OFFSET: + case ISD::EH_DWARF_CFA: case ISD::EH_SJLJ_SETJMP: case ISD::EH_SJLJ_LONGJMP: case ISD::EH_SJLJ_SETUP_DISPATCH: @@ -2732,6 +2733,21 @@ bool SelectionDAGLegalize::ExpandNode(SD case ISD::FRAME_TO_ARGS_OFFSET: Results.push_back(DAG.getConstant(0, dl, Node->getValueType(0))); break; + case ISD::EH_DWARF_CFA: { + SDValue CfaArg = DAG.getSExtOrTrunc(Node->getOperand(0), dl, + TLI.getPointerTy(DAG.getDataLayout())); + SDValue Offset = DAG.getNode(ISD::ADD, dl, + CfaArg.getValueType(), + DAG.getNode(ISD::FRAME_TO_ARGS_OFFSET, dl, + CfaArg.getValueType()), + CfaArg); + SDValue FA = DAG.getNode( + ISD::FRAMEADDR, dl, TLI.getPointerTy(DAG.getDataLayout()), + DAG.getConstant(0, dl, TLI.getPointerTy(DAG.getDataLayout()))); + Results.push_back(DAG.getNode(ISD::ADD, dl, FA.getValueType(), + FA, Offset)); + break; + } case ISD::FLT_ROUNDS_: Results.push_back(DAG.getConstant(1, dl, Node->getValueType(0))); break; Modified: projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -4999,18 +4999,9 @@ SelectionDAGBuilder::visitIntrinsicCall( DAG.getMachineFunction().getMMI().setCallsUnwindInit(true); return nullptr; case Intrinsic::eh_dwarf_cfa: { - SDValue CfaArg = DAG.getSExtOrTrunc(getValue(I.getArgOperand(0)), sdl, - TLI.getPointerTy(DAG.getDataLayout())); - SDValue Offset = DAG.getNode(ISD::ADD, sdl, - CfaArg.getValueType(), - DAG.getNode(ISD::FRAME_TO_ARGS_OFFSET, sdl, - CfaArg.getValueType()), - CfaArg); - SDValue FA = DAG.getNode( - ISD::FRAMEADDR, sdl, TLI.getPointerTy(DAG.getDataLayout()), - DAG.getConstant(0, sdl, TLI.getPointerTy(DAG.getDataLayout()))); - setValue(&I, DAG.getNode(ISD::ADD, sdl, FA.getValueType(), - FA, Offset)); + setValue(&I, DAG.getNode(ISD::EH_DWARF_CFA, sdl, + TLI.getPointerTy(DAG.getDataLayout()), + getValue(I.getArgOperand(0)))); return nullptr; } case Intrinsic::eh_sjlj_callsite: { Modified: projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -105,6 +105,7 @@ std::string SDNode::getOperationName(con case ISD::READ_REGISTER: return "READ_REGISTER"; case ISD::WRITE_REGISTER: return "WRITE_REGISTER"; case ISD::FRAME_TO_ARGS_OFFSET: return "FRAME_TO_ARGS_OFFSET"; + case ISD::EH_DWARF_CFA: return "EH_DWARF_CFA"; case ISD::EH_RETURN: return "EH_RETURN"; case ISD::EH_SJLJ_SETJMP: return "EH_SJLJ_SETJMP"; case ISD::EH_SJLJ_LONGJMP: return "EH_SJLJ_LONGJMP"; Modified: projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -305,9 +305,9 @@ MipsTargetLowering::MipsTargetLowering(c setOperationAction(ISD::SRL_PARTS, MVT::i32, Custom); } - setOperationAction(ISD::ADD, MVT::i32, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i32, Custom); if (Subtarget.isGP64bit()) - setOperationAction(ISD::ADD, MVT::i64, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i64, Custom); setOperationAction(ISD::SDIV, MVT::i32, Expand); setOperationAction(ISD::SREM, MVT::i32, Expand); @@ -914,7 +914,7 @@ LowerOperation(SDValue Op, SelectionDAG case ISD::SRL_PARTS: return lowerShiftRightParts(Op, DAG, false); case ISD::LOAD: return lowerLOAD(Op, DAG); case ISD::STORE: return lowerSTORE(Op, DAG); - case ISD::ADD: return lowerADD(Op, DAG); + case ISD::EH_DWARF_CFA: return lowerEH_DWARF_CFA(Op, DAG); case ISD::FP_TO_SINT: return lowerFP_TO_SINT(Op, DAG); } return SDValue(); @@ -2393,26 +2393,15 @@ SDValue MipsTargetLowering::lowerSTORE(S return lowerFP_TO_SINT_STORE(SD, DAG); } -SDValue MipsTargetLowering::lowerADD(SDValue Op, SelectionDAG &DAG) const { - if (Op->getOperand(0).getOpcode() != ISD::FRAMEADDR - || cast - (Op->getOperand(0).getOperand(0))->getZExtValue() != 0 - || Op->getOperand(1).getOpcode() != ISD::FRAME_TO_ARGS_OFFSET) - return SDValue(); +SDValue MipsTargetLowering::lowerEH_DWARF_CFA(SDValue Op, + SelectionDAG &DAG) const { - // The pattern - // (add (frameaddr 0), (frame_to_args_offset)) - // results from lowering llvm.eh.dwarf.cfa intrinsic. Transform it to - // (add FrameObject, 0) - // where FrameObject is a fixed StackObject with offset 0 which points to - // the old stack pointer. + // Return a fixed StackObject with offset 0 which points to the old stack + // pointer. MachineFrameInfo *MFI = DAG.getMachineFunction().getFrameInfo(); EVT ValTy = Op->getValueType(0); int FI = MFI->CreateFixedObject(Op.getValueSizeInBits() / 8, 0, false); - SDValue InArgsAddr = DAG.getFrameIndex(FI, ValTy); - SDLoc DL(Op); - return DAG.getNode(ISD::ADD, DL, ValTy, InArgsAddr, - DAG.getConstant(0, DL, ValTy)); + return DAG.getFrameIndex(FI, ValTy); } SDValue MipsTargetLowering::lowerFP_TO_SINT(SDValue Op, Modified: projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h Sat Sep 10 16:11:42 2016 (r305683) @@ -446,7 +446,7 @@ namespace llvm { SDValue lowerShiftLeftParts(SDValue Op, SelectionDAG& DAG) const; SDValue lowerShiftRightParts(SDValue Op, SelectionDAG& DAG, bool IsSRA) const; - SDValue lowerADD(SDValue Op, SelectionDAG &DAG) const; + SDValue lowerEH_DWARF_CFA(SDValue Op, SelectionDAG &DAG) const; SDValue lowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG) const; /// isEligibleForTailCallOptimization - Check whether the call is eligible Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -344,6 +344,8 @@ PPCTargetLowering::PPCTargetLowering(con setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i64 , Custom); setOperationAction(ISD::GET_DYNAMIC_AREA_OFFSET, MVT::i32, Custom); setOperationAction(ISD::GET_DYNAMIC_AREA_OFFSET, MVT::i64, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i32, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i64, Custom); // We want to custom lower some of our intrinsics. setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::Other, Custom); @@ -6173,6 +6175,17 @@ SDValue PPCTargetLowering::LowerDYNAMIC_ return DAG.getNode(PPCISD::DYNALLOC, dl, VTs, Ops); } +SDValue PPCTargetLowering::LowerEH_DWARF_CFA(SDValue Op, + SelectionDAG &DAG) const { + MachineFunction &MF = DAG.getMachineFunction(); + + bool isPPC64 = Subtarget.isPPC64(); + EVT PtrVT = getPointerTy(DAG.getDataLayout()); + + int FI = MF.getFrameInfo()->CreateFixedObject(isPPC64 ? 8 : 4, 0, false); + return DAG.getFrameIndex(FI, PtrVT); +} + SDValue PPCTargetLowering::lowerEH_SJLJ_SETJMP(SDValue Op, SelectionDAG &DAG) const { SDLoc DL(Op); @@ -8231,6 +8244,9 @@ SDValue PPCTargetLowering::LowerOperatio case ISD::GET_DYNAMIC_AREA_OFFSET: return LowerGET_DYNAMIC_AREA_OFFSET(Op, DAG); + case ISD::EH_DWARF_CFA: + return LowerEH_DWARF_CFA(Op, DAG); + case ISD::EH_SJLJ_SETJMP: return lowerEH_SJLJ_SETJMP(Op, DAG); case ISD::EH_SJLJ_LONGJMP: return lowerEH_SJLJ_LONGJMP(Op, DAG); Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h Sat Sep 10 16:11:42 2016 (r305683) @@ -811,6 +811,7 @@ namespace llvm { SDValue LowerSTACKRESTORE(SDValue Op, SelectionDAG &DAG) const; SDValue LowerGET_DYNAMIC_AREA_OFFSET(SDValue Op, SelectionDAG &DAG) const; SDValue LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG) const; + SDValue LowerEH_DWARF_CFA(SDValue Op, SelectionDAG &DAG) const; SDValue LowerLOAD(SDValue Op, SelectionDAG &DAG) const; SDValue LowerSTORE(SDValue Op, SelectionDAG &DAG) const; SDValue LowerTRUNCATE(SDValue Op, SelectionDAG &DAG) const;