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

AMDGPU: Re-use TM.getNullPointerValue 

llvm-svn: 297662
This commit is contained in:
Matt Arsenault 2017-03-13 20:18:14 +00:00
parent d31f04b319
commit 747bf8afa8
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Target/AMDGPU/SIISelLowering.cpp
View File

@ -19,6 +19,7 @@
#include "AMDGPU.h" #include "AMDGPU.h"
#include "AMDGPUIntrinsicInfo.h" #include "AMDGPUIntrinsicInfo.h"
#include "AMDGPUTargetMachine.h"
#include "AMDGPUSubtarget.h" #include "AMDGPUSubtarget.h"
#include "SIDefines.h" #include "SIDefines.h"
#include "SIISelLowering.h" #include "SIISelLowering.h"
@ -68,7 +69,6 @@
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include "llvm/Target/TargetCallingConv.h" #include "llvm/Target/TargetCallingConv.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetOptions.h"
#include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetRegisterInfo.h"
#include <cassert> #include <cassert>
@ -2374,11 +2374,6 @@ SDValue SITargetLowering::getSegmentAperture(unsigned AS,
MachineMemOperand::MOInvariant); MachineMemOperand::MOInvariant);
} }
// FIXME: Really support non-0 null pointers.
static int getSegmentNullPtrValue(unsigned AS) {
return AS == AMDGPUAS::LOCAL_ADDRESS ? -1 : 0;
}
SDValue SITargetLowering::lowerADDRSPACECAST(SDValue Op, SDValue SITargetLowering::lowerADDRSPACECAST(SDValue Op,
SelectionDAG &DAG) const { SelectionDAG &DAG) const {
SDLoc SL(Op); SDLoc SL(Op);
@ -2387,12 +2382,15 @@ SDValue SITargetLowering::lowerADDRSPACECAST(SDValue Op,
SDValue Src = ASC->getOperand(0); SDValue Src = ASC->getOperand(0);
SDValue FlatNullPtr = DAG.getConstant(0, SL, MVT::i64); SDValue FlatNullPtr = DAG.getConstant(0, SL, MVT::i64);
const AMDGPUTargetMachine &TM =
static_cast<const AMDGPUTargetMachine &>(getTargetMachine());
// flat -> local/private // flat -> local/private
if (ASC->getSrcAddressSpace() == AMDGPUAS::FLAT_ADDRESS) { if (ASC->getSrcAddressSpace() == AMDGPUAS::FLAT_ADDRESS) {
unsigned DestAS = ASC->getDestAddressSpace(); unsigned DestAS = ASC->getDestAddressSpace();
if (DestAS == AMDGPUAS::LOCAL_ADDRESS || DestAS == AMDGPUAS::PRIVATE_ADDRESS) { if (DestAS == AMDGPUAS::LOCAL_ADDRESS || DestAS == AMDGPUAS::PRIVATE_ADDRESS) {
SDValue SegmentNullPtr unsigned NullVal = TM.getNullPointerValue(DestAS);
= DAG.getConstant(getSegmentNullPtrValue(DestAS), SL, MVT::i32); SDValue SegmentNullPtr = DAG.getConstant(NullVal, SL, MVT::i32);
SDValue NonNull = DAG.getSetCC(SL, MVT::i1, Src, FlatNullPtr, ISD::SETNE); SDValue NonNull = DAG.getSetCC(SL, MVT::i1, Src, FlatNullPtr, ISD::SETNE);
SDValue Ptr = DAG.getNode(ISD::TRUNCATE, SL, MVT::i32, Src); SDValue Ptr = DAG.getNode(ISD::TRUNCATE, SL, MVT::i32, Src);
@ -2405,8 +2403,8 @@ SDValue SITargetLowering::lowerADDRSPACECAST(SDValue Op,
if (ASC->getDestAddressSpace() == AMDGPUAS::FLAT_ADDRESS) { if (ASC->getDestAddressSpace() == AMDGPUAS::FLAT_ADDRESS) {
unsigned SrcAS = ASC->getSrcAddressSpace(); unsigned SrcAS = ASC->getSrcAddressSpace();
if (SrcAS == AMDGPUAS::LOCAL_ADDRESS || SrcAS == AMDGPUAS::PRIVATE_ADDRESS) { if (SrcAS == AMDGPUAS::LOCAL_ADDRESS || SrcAS == AMDGPUAS::PRIVATE_ADDRESS) {
SDValue SegmentNullPtr unsigned NullVal = TM.getNullPointerValue(SrcAS);
= DAG.getConstant(getSegmentNullPtrValue(SrcAS), SL, MVT::i32); SDValue SegmentNullPtr = DAG.getConstant(NullVal, SL, MVT::i32);
SDValue NonNull SDValue NonNull
= DAG.getSetCC(SL, MVT::i1, Src, SegmentNullPtr, ISD::SETNE); = DAG.getSetCC(SL, MVT::i1, Src, SegmentNullPtr, ISD::SETNE);