diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2015-06-26 21:58:42 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2015-06-26 21:58:42 +0000 |
| commit | 4694ed0a1456d30c8eacd56d024afabe53cfd0f8 (patch) | |
| tree | 53d30034a5fd33dd9a7fdb1611f61c1367cc324f /llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | |
| parent | 1a07e191807032584b669319339341c3fa937212 (diff) | |
| download | bcm5719-llvm-4694ed0a1456d30c8eacd56d024afabe53cfd0f8.tar.gz bcm5719-llvm-4694ed0a1456d30c8eacd56d024afabe53cfd0f8.zip | |
AMDPGU/SI: Use correct resource descriptors for VI on HSA
Summary: We need to set MTYPE = 2 for VI shaders when targeting the HSA runtime.
Reviewers: arsenm
Differential Revision: http://reviews.llvm.org/D10777
llvm-svn: 240841
Diffstat (limited to 'llvm/lib/Target/AMDGPU/SIInstrInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp index b517fb2f71c..eb96bd0227b 100644 --- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp +++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp @@ -2720,8 +2720,13 @@ MachineOperand *SIInstrInfo::getNamedOperand(MachineInstr &MI, uint64_t SIInstrInfo::getDefaultRsrcDataFormat() const { uint64_t RsrcDataFormat = AMDGPU::RSRC_DATA_FORMAT; - if (ST.isAmdHsaOS()) + if (ST.isAmdHsaOS()) { RsrcDataFormat |= (1ULL << 56); + if (ST.getGeneration() >= AMDGPUSubtarget::VOLCANIC_ISLANDS) + // Set MTYPE = 2 + RsrcDataFormat |= (2ULL << 59); + } + return RsrcDataFormat; } |
