This is an archive of the discontinued LLVM Phabricator instance.

Differential D51796

AMDGPU: Remove function pointer type hack
ClosedPublic

Authored by arsenm on Sep 7 2018, 8:33 AM.

Details

Reviewers
rampitec

Diff Detail

Event Timeline

arsenm created this revision.Sep 7 2018, 8:33 AM
Herald added subscribers: t-tye, tpr, dstuttard and 5 others. · View Herald TranscriptSep 7 2018, 8:33 AM
rampitec accepted this revision.Sep 7 2018, 12:26 PM

LGTM

This revision is now accepted and ready to land.Sep 7 2018, 12:26 PM
arsenm closed this revision.Sep 10 2018, 5:17 AM

r341806

Revision Contents

PathSize
lib/
Target/
AMDGPU/
11 lines

Diff 164435

lib/Target/AMDGPU/SIISelLowering.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 4,430 Lines • ▼ Show 20 LinesbuildPCRelGlobalAddress(SelectionDAG &DAG, const GlobalValue *GV,
return DAG.getNode(AMDGPUISD::PC_ADD_REL_OFFSET, DL, PtrVT, PtrLo, PtrHi); return DAG.getNode(AMDGPUISD::PC_ADD_REL_OFFSET, DL, PtrVT, PtrLo, PtrHi);
} }
SDValue SITargetLowering::LowerGlobalAddress(AMDGPUMachineFunction *MFI, SDValue SITargetLowering::LowerGlobalAddress(AMDGPUMachineFunction *MFI,
SDValue Op, SDValue Op,
SelectionDAG &DAG) const { SelectionDAG &DAG) const {
GlobalAddressSDNode *GSD = cast<GlobalAddressSDNode>(Op); GlobalAddressSDNode *GSD = cast<GlobalAddressSDNode>(Op);
const GlobalValue *GV = GSD->getGlobal(); const GlobalValue *GV = GSD->getGlobal();
if (GSD->getAddressSpace() == AMDGPUAS::LOCAL_ADDRESS ||
if (GSD->getAddressSpace() != AMDGPUAS::CONSTANT_ADDRESS && GSD->getAddressSpace() == AMDGPUAS::REGION_ADDRESS ||
GSD->getAddressSpace() != AMDGPUAS::CONSTANT_ADDRESS_32BIT && GSD->getAddressSpace() == AMDGPUAS::PRIVATE_ADDRESS)
GSD->getAddressSpace() != AMDGPUAS::GLOBAL_ADDRESS &&
// FIXME: It isn't correct to rely on the type of the pointer. This should
// be removed when address space 0 is 64-bit.
!GV->getType()->getElementType()->isFunctionTy())
return AMDGPUTargetLowering::LowerGlobalAddress(MFI, Op, DAG); return AMDGPUTargetLowering::LowerGlobalAddress(MFI, Op, DAG);
SDLoc DL(GSD); SDLoc DL(GSD);
EVT PtrVT = Op.getValueType(); EVT PtrVT = Op.getValueType();
// FIXME: Should not make address space based decisions here.
if (shouldEmitFixup(GV)) if (shouldEmitFixup(GV))
return buildPCRelGlobalAddress(DAG, GV, DL, GSD->getOffset(), PtrVT); return buildPCRelGlobalAddress(DAG, GV, DL, GSD->getOffset(), PtrVT);
else if (shouldEmitPCReloc(GV)) else if (shouldEmitPCReloc(GV))
return buildPCRelGlobalAddress(DAG, GV, DL, GSD->getOffset(), PtrVT, return buildPCRelGlobalAddress(DAG, GV, DL, GSD->getOffset(), PtrVT,
SIInstrInfo::MO_REL32); SIInstrInfo::MO_REL32);
SDValue GOTAddr = buildPCRelGlobalAddress(DAG, GV, DL, 0, PtrVT, SDValue GOTAddr = buildPCRelGlobalAddress(DAG, GV, DL, 0, PtrVT,
SIInstrInfo::MO_GOTPCREL32); SIInstrInfo::MO_GOTPCREL32);
▲ Show 20 Lines • Show All 4,790 Lines • Show Last 20 Lines