mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 19:12:56 +02:00
AMDGPU/SI: Remove address space query functions from AMDGPUDAGToDAGISel
Summary: These have been replaced with TableGen code (except for isConstantLoad, which is still used for R600). The queries were broken for cases where MemOperand was a PseudoSourceValue. Reviewers: arsenm Subscribers: arsenm, kzhuravl, llvm-commits Differential Revision: http://reviews.llvm.org/D21684 llvm-svn: 274561
This commit is contained in:
Tom Stellard
parent
8a76d0f316
commit
222891328a
@ -73,17 +73,7 @@ private:
|
||||
bool FoldOperands(unsigned, const R600InstrInfo *, std::vector<SDValue> &);
|
||||
bool FoldDotOperands(unsigned, const R600InstrInfo *, std::vector<SDValue> &);
|
||||
|
||||
static bool checkType(const Value *ptr, unsigned int addrspace);
|
||||
|
||||
static bool isGlobalStore(const MemSDNode *N);
|
||||
static bool isFlatStore(const MemSDNode *N);
|
||||
static bool isLocalStore(const StoreSDNode *N);
|
||||
|
||||
bool isConstantLoad(const MemSDNode *N, int cbID) const;
|
||||
bool isGlobalLoad(const MemSDNode *N) const;
|
||||
bool isFlatLoad(const MemSDNode *N) const;
|
||||
bool isLocalLoad(const LoadSDNode *N) const;
|
||||
|
||||
bool isUniformBr(const SDNode *N) const;
|
||||
|
||||
SDNode *glueCopyToM0(SDNode *N) const;
|
||||
@ -227,8 +217,7 @@ const TargetRegisterClass *AMDGPUDAGToDAGISel::getOperandRegClass(SDNode *N,
|
||||
|
||||
SDNode *AMDGPUDAGToDAGISel::glueCopyToM0(SDNode *N) const {
|
||||
if (Subtarget->getGeneration() < AMDGPUSubtarget::SOUTHERN_ISLANDS ||
|
||||
!checkType(cast<MemSDNode>(N)->getMemOperand()->getValue(),
|
||||
AMDGPUAS::LOCAL_ADDRESS))
|
||||
cast<MemSDNode>(N)->getAddressSpace() != AMDGPUAS::LOCAL_ADDRESS)
|
||||
return N;
|
||||
|
||||
const SITargetLowering& Lowering =
|
||||
@ -492,55 +481,13 @@ void AMDGPUDAGToDAGISel::Select(SDNode *N) {
|
||||
SelectCode(N);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::checkType(const Value *Ptr, unsigned AS) {
|
||||
assert(AS != 0 && "Use checkPrivateAddress instead.");
|
||||
if (!Ptr)
|
||||
return false;
|
||||
|
||||
return Ptr->getType()->getPointerAddressSpace() == AS;
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isGlobalStore(const MemSDNode *N) {
|
||||
if (!N->writeMem())
|
||||
return false;
|
||||
return checkType(N->getMemOperand()->getValue(), AMDGPUAS::GLOBAL_ADDRESS);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isLocalStore(const StoreSDNode *N) {
|
||||
return checkType(N->getMemOperand()->getValue(), AMDGPUAS::LOCAL_ADDRESS);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isFlatStore(const MemSDNode *N) {
|
||||
if (!N->writeMem())
|
||||
return false;
|
||||
return checkType(N->getMemOperand()->getValue(), AMDGPUAS::FLAT_ADDRESS);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isConstantLoad(const MemSDNode *N, int CbId) const {
|
||||
if (!N->readMem())
|
||||
return false;
|
||||
const Value *MemVal = N->getMemOperand()->getValue();
|
||||
if (CbId == -1)
|
||||
return checkType(MemVal, AMDGPUAS::CONSTANT_ADDRESS);
|
||||
return N->getAddressSpace() == AMDGPUAS::CONSTANT_ADDRESS;
|
||||
|
||||
return checkType(MemVal, AMDGPUAS::CONSTANT_BUFFER_0 + CbId);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isGlobalLoad(const MemSDNode *N) const {
|
||||
if (!N->readMem())
|
||||
return false;
|
||||
|
||||
return checkType(N->getMemOperand()->getValue(), AMDGPUAS::GLOBAL_ADDRESS);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isLocalLoad(const LoadSDNode *N) const {
|
||||
return checkType(N->getMemOperand()->getValue(), AMDGPUAS::LOCAL_ADDRESS);
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isFlatLoad(const MemSDNode *N) const {
|
||||
if (!N->readMem())
|
||||
return false;
|
||||
return checkType(N->getMemOperand()->getValue(), AMDGPUAS::FLAT_ADDRESS);
|
||||
return N->getAddressSpace() == AMDGPUAS::CONSTANT_BUFFER_0 + CbId;
|
||||
}
|
||||
|
||||
bool AMDGPUDAGToDAGISel::isUniformBr(const SDNode *N) const {
|
||||
|
||||
@ -187,26 +187,58 @@ def truncstorei8_private : PrivateStore <truncstorei8>;
|
||||
def truncstorei16_private : PrivateStore <truncstorei16>;
|
||||
def store_private : PrivateStore <store>;
|
||||
|
||||
def global_store : PatFrag<(ops node:$val, node:$ptr),
|
||||
(store node:$val, node:$ptr), [{
|
||||
return isGlobalStore(dyn_cast<StoreSDNode>(N));
|
||||
}]>;
|
||||
|
||||
def global_store_atomic : PatFrag<(ops node:$val, node:$ptr),
|
||||
(atomic_store node:$val, node:$ptr), [{
|
||||
return isGlobalStore(dyn_cast<MemSDNode>(N));
|
||||
class GlobalMemOp <dag ops, dag frag> : PatFrag <ops, frag, [{
|
||||
return cast<MemSDNode>(N)->getAddressSpace() == AMDGPUAS::GLOBAL_ADDRESS;
|
||||
}]>;
|
||||
|
||||
// Global address space loads
|
||||
def global_load : PatFrag<(ops node:$ptr), (load node:$ptr), [{
|
||||
return isGlobalLoad(dyn_cast<LoadSDNode>(N));
|
||||
class GlobalLoad <SDPatternOperator op> : GlobalMemOp <
|
||||
(ops node:$ptr), (op node:$ptr)
|
||||
>;
|
||||
|
||||
def global_load : GlobalLoad <load>;
|
||||
|
||||
// Global address space stores
|
||||
class GlobalStore <SDPatternOperator op> : GlobalMemOp <
|
||||
(ops node:$value, node:$ptr), (op node:$value, node:$ptr)
|
||||
>;
|
||||
|
||||
def global_store : GlobalStore <store>;
|
||||
def global_store_atomic : GlobalStore<atomic_store>;
|
||||
|
||||
|
||||
class ConstantMemOp <dag ops, dag frag> : PatFrag <ops, frag, [{
|
||||
return cast<MemSDNode>(N)->getAddressSpace() == AMDGPUAS::CONSTANT_ADDRESS;
|
||||
}]>;
|
||||
|
||||
// Constant address space loads
|
||||
def constant_load : PatFrag<(ops node:$ptr), (load node:$ptr), [{
|
||||
return isConstantLoad(dyn_cast<LoadSDNode>(N), -1);
|
||||
class ConstantLoad <SDPatternOperator op> : ConstantMemOp <
|
||||
(ops node:$ptr), (op node:$ptr)
|
||||
>;
|
||||
|
||||
def constant_load : ConstantLoad<load>;
|
||||
|
||||
class LocalMemOp <dag ops, dag frag> : PatFrag <ops, frag, [{
|
||||
return cast<MemSDNode>(N)->getAddressSpace() == AMDGPUAS::LOCAL_ADDRESS;
|
||||
}]>;
|
||||
|
||||
// Local address space loads
|
||||
class LocalLoad <SDPatternOperator op> : LocalMemOp <
|
||||
(ops node:$ptr), (op node:$ptr)
|
||||
>;
|
||||
|
||||
class LocalStore <SDPatternOperator op> : LocalMemOp <
|
||||
(ops node:$value, node:$ptr), (op node:$value, node:$ptr)
|
||||
>;
|
||||
|
||||
class FlatMemOp <dag ops, dag frag> : PatFrag <ops, frag, [{
|
||||
return cast<MemSDNode>(N)->getAddressSPace() == AMDGPUAS::FLAT_ADDRESS;
|
||||
}]>;
|
||||
|
||||
class FlatLoad <SDPatternOperator op> : FlatMemOp <
|
||||
(ops node:$ptr), (op node:$ptr)
|
||||
>;
|
||||
|
||||
class AZExtLoadBase <SDPatternOperator ld_node>: PatFrag<(ops node:$ptr),
|
||||
(ld_node node:$ptr), [{
|
||||
LoadSDNode *L = cast<LoadSDNode>(N);
|
||||
@ -220,29 +252,14 @@ def az_extloadi8 : PatFrag<(ops node:$ptr), (az_extload node:$ptr), [{
|
||||
return cast<LoadSDNode>(N)->getMemoryVT() == MVT::i8;
|
||||
}]>;
|
||||
|
||||
def az_extloadi8_global : PatFrag<(ops node:$ptr), (az_extloadi8 node:$ptr), [{
|
||||
return isGlobalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi8_global : GlobalLoad <az_extloadi8>;
|
||||
def sextloadi8_global : GlobalLoad <sextloadi8>;
|
||||
|
||||
def sextloadi8_global : PatFrag<(ops node:$ptr), (sextloadi8 node:$ptr), [{
|
||||
return isGlobalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi8_constant : ConstantLoad <az_extloadi8>;
|
||||
def sextloadi8_constant : ConstantLoad <sextloadi8>;
|
||||
|
||||
def az_extloadi8_constant : PatFrag<(ops node:$ptr), (az_extloadi8 node:$ptr), [{
|
||||
return isConstantLoad(dyn_cast<LoadSDNode>(N), -1);
|
||||
}]>;
|
||||
|
||||
def sextloadi8_constant : PatFrag<(ops node:$ptr), (sextloadi8 node:$ptr), [{
|
||||
return isConstantLoad(dyn_cast<LoadSDNode>(N), -1);
|
||||
}]>;
|
||||
|
||||
def az_extloadi8_local : PatFrag<(ops node:$ptr), (az_extloadi8 node:$ptr), [{
|
||||
return isLocalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
|
||||
def sextloadi8_local : PatFrag<(ops node:$ptr), (sextloadi8 node:$ptr), [{
|
||||
return isLocalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi8_local : LocalLoad <az_extloadi8>;
|
||||
def sextloadi8_local : LocalLoad <sextloadi8>;
|
||||
|
||||
def extloadi8_private : PrivateLoad <az_extloadi8>;
|
||||
def sextloadi8_private : PrivateLoad <sextloadi8>;
|
||||
@ -251,29 +268,14 @@ def az_extloadi16 : PatFrag<(ops node:$ptr), (az_extload node:$ptr), [{
|
||||
return cast<LoadSDNode>(N)->getMemoryVT() == MVT::i16;
|
||||
}]>;
|
||||
|
||||
def az_extloadi16_global : PatFrag<(ops node:$ptr), (az_extloadi16 node:$ptr), [{
|
||||
return isGlobalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi16_global : GlobalLoad <az_extloadi16>;
|
||||
def sextloadi16_global : GlobalLoad <sextloadi16>;
|
||||
|
||||
def sextloadi16_global : PatFrag<(ops node:$ptr), (sextloadi16 node:$ptr), [{
|
||||
return isGlobalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi16_constant : ConstantLoad <az_extloadi16>;
|
||||
def sextloadi16_constant : ConstantLoad <sextloadi16>;
|
||||
|
||||
def az_extloadi16_constant : PatFrag<(ops node:$ptr), (az_extloadi16 node:$ptr), [{
|
||||
return isConstantLoad(dyn_cast<LoadSDNode>(N), -1);
|
||||
}]>;
|
||||
|
||||
def sextloadi16_constant : PatFrag<(ops node:$ptr), (sextloadi16 node:$ptr), [{
|
||||
return isConstantLoad(dyn_cast<LoadSDNode>(N), -1);
|
||||
}]>;
|
||||
|
||||
def az_extloadi16_local : PatFrag<(ops node:$ptr), (az_extloadi16 node:$ptr), [{
|
||||
return isLocalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
|
||||
def sextloadi16_local : PatFrag<(ops node:$ptr), (sextloadi16 node:$ptr), [{
|
||||
return isLocalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi16_local : LocalLoad <az_extloadi16>;
|
||||
def sextloadi16_local : LocalLoad <sextloadi16>;
|
||||
|
||||
def extloadi16_private : PrivateLoad <az_extloadi16>;
|
||||
def sextloadi16_private : PrivateLoad <sextloadi16>;
|
||||
@ -282,49 +284,20 @@ def az_extloadi32 : PatFrag<(ops node:$ptr), (az_extload node:$ptr), [{
|
||||
return cast<LoadSDNode>(N)->getMemoryVT() == MVT::i32;
|
||||
}]>;
|
||||
|
||||
def az_extloadi32_global : PatFrag<(ops node:$ptr),
|
||||
(az_extloadi32 node:$ptr), [{
|
||||
return isGlobalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi32_global : GlobalLoad <az_extloadi32>;
|
||||
|
||||
def az_extloadi32_flat : PatFrag<(ops node:$ptr),
|
||||
(az_extloadi32 node:$ptr), [{
|
||||
return isFlatLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def az_extloadi32_flat : FlatLoad <az_extloadi32>;
|
||||
|
||||
def az_extloadi32_constant : PatFrag<(ops node:$ptr),
|
||||
(az_extloadi32 node:$ptr), [{
|
||||
return isConstantLoad(dyn_cast<LoadSDNode>(N), -1);
|
||||
}]>;
|
||||
def az_extloadi32_constant : ConstantLoad <az_extloadi32>;
|
||||
|
||||
def truncstorei8_global : PatFrag<(ops node:$val, node:$ptr),
|
||||
(truncstorei8 node:$val, node:$ptr), [{
|
||||
return isGlobalStore(dyn_cast<StoreSDNode>(N));
|
||||
}]>;
|
||||
def truncstorei8_global : GlobalStore <truncstorei8>;
|
||||
def truncstorei16_global : GlobalStore <truncstorei16>;
|
||||
|
||||
def truncstorei16_global : PatFrag<(ops node:$val, node:$ptr),
|
||||
(truncstorei16 node:$val, node:$ptr), [{
|
||||
return isGlobalStore(dyn_cast<StoreSDNode>(N));
|
||||
}]>;
|
||||
def local_store : LocalStore <store>;
|
||||
def truncstorei8_local : LocalStore <truncstorei8>;
|
||||
def truncstorei16_local : LocalStore <truncstorei16>;
|
||||
|
||||
def local_store : PatFrag<(ops node:$val, node:$ptr),
|
||||
(store node:$val, node:$ptr), [{
|
||||
return isLocalStore(dyn_cast<StoreSDNode>(N));
|
||||
}]>;
|
||||
|
||||
def truncstorei8_local : PatFrag<(ops node:$val, node:$ptr),
|
||||
(truncstorei8 node:$val, node:$ptr), [{
|
||||
return isLocalStore(dyn_cast<StoreSDNode>(N));
|
||||
}]>;
|
||||
|
||||
def truncstorei16_local : PatFrag<(ops node:$val, node:$ptr),
|
||||
(truncstorei16 node:$val, node:$ptr), [{
|
||||
return isLocalStore(dyn_cast<StoreSDNode>(N));
|
||||
}]>;
|
||||
|
||||
def local_load : PatFrag<(ops node:$ptr), (load node:$ptr), [{
|
||||
return isLocalLoad(dyn_cast<LoadSDNode>(N));
|
||||
}]>;
|
||||
def local_load : LocalLoad <load>;
|
||||
|
||||
class Aligned8Bytes <dag ops, dag frag> : PatFrag <ops, frag, [{
|
||||
return cast<MemSDNode>(N)->getAlignment() % 8 == 0;
|
||||
|
||||
@ -147,9 +147,10 @@ def SIpc_add_rel_offset : SDNode<"AMDGPUISD::PC_ADD_REL_OFFSET",
|
||||
|
||||
class flat_ld <SDPatternOperator ld> : PatFrag<(ops node:$ptr),
|
||||
(ld node:$ptr), [{
|
||||
return isFlatLoad(dyn_cast<MemSDNode>(N)) ||
|
||||
isGlobalLoad(dyn_cast<MemSDNode>(N)) ||
|
||||
isConstantLoad(cast<MemSDNode>(N), -1);
|
||||
const MemSDNode *LD = cast<MemSDNode>(N);
|
||||
return LD->getAddressSpace() == AMDGPUAS::FLAT_ADDRESS ||
|
||||
LD->getAddressSpace() == AMDGPUAS::GLOBAL_ADDRESS ||
|
||||
LD->getAddressSpace() == AMDGPUAS::CONSTANT_ADDRESS;
|
||||
}]>;
|
||||
|
||||
def flat_load : flat_ld <load>;
|
||||
@ -161,8 +162,9 @@ def flat_sextloadi16 : flat_ld <sextloadi16>;
|
||||
|
||||
class flat_st <SDPatternOperator st> : PatFrag<(ops node:$val, node:$ptr),
|
||||
(st node:$val, node:$ptr), [{
|
||||
return isFlatStore(dyn_cast<MemSDNode>(N)) ||
|
||||
isGlobalStore(dyn_cast<MemSDNode>(N));
|
||||
const MemSDNode *ST = cast<MemSDNode>(N);
|
||||
return ST->getAddressSpace() == AMDGPUAS::FLAT_ADDRESS ||
|
||||
ST->getAddressSpace() == AMDGPUAS::GLOBAL_ADDRESS;
|
||||
}]>;
|
||||
|
||||
def flat_store: flat_st <store>;
|
||||
@ -189,7 +191,7 @@ def mubuf_load_atomic : MubufLoad <atomic_load>;
|
||||
def smrd_load : PatFrag <(ops node:$ptr), (load node:$ptr), [{
|
||||
auto Ld = cast<LoadSDNode>(N);
|
||||
return Ld->getAlignment() >= 4 &&
|
||||
isConstantLoad(Ld, -1) &&
|
||||
Ld->getAddressSpace() == AMDGPUAS::CONSTANT_ADDRESS &&
|
||||
static_cast<const SITargetLowering *>(getTargetLowering())->isMemOpUniform(N);
|
||||
}]>;
|
||||
|
||||
@ -213,7 +215,7 @@ def SIld_local : SDNode <"ISD::LOAD", SDTLoad,
|
||||
>;
|
||||
|
||||
def si_ld_local : PatFrag <(ops node:$ptr), (SIld_local node:$ptr), [{
|
||||
return isLocalLoad(cast<LoadSDNode>(N));
|
||||
return cast<LoadSDNode>(N)->getAddressSpace() == AMDGPUAS::LOCAL_ADDRESS;
|
||||
}]>;
|
||||
|
||||
def si_load_local : PatFrag <(ops node:$ptr), (si_ld_local node:$ptr), [{
|
||||
@ -250,7 +252,7 @@ def SIst_local : SDNode <"ISD::STORE", SDTStore,
|
||||
|
||||
def si_st_local : PatFrag <
|
||||
(ops node:$val, node:$ptr), (SIst_local node:$val, node:$ptr), [{
|
||||
return isLocalStore(cast<StoreSDNode>(N));
|
||||
return cast<StoreSDNode>(N)->getAddressSpace() == AMDGPUAS::LOCAL_ADDRESS;
|
||||
}]>;
|
||||
|
||||
def si_store_local : PatFrag <
|
||||
|
||||
Loading…
Reference in New Issue
Block a user