diff options
| author | Nicolai Haehnle <nhaehnle@gmail.com> | 2017-04-24 16:53:52 +0000 |
|---|---|---|
| committer | Nicolai Haehnle <nhaehnle@gmail.com> | 2017-04-24 16:53:52 +0000 |
| commit | ef449787d8ca2ae1039944ffc81d99397e0ad7f3 (patch) | |
| tree | 651fff8a2b0606b83804485d5881fb8bed654d98 /llvm/lib/Target | |
| parent | dd13e4e0b0830b8c0b84d543ee22ec08684d9589 (diff) | |
| download | bcm5719-llvm-ef449787d8ca2ae1039944ffc81d99397e0ad7f3.tar.gz bcm5719-llvm-ef449787d8ca2ae1039944ffc81d99397e0ad7f3.zip | |
AMDGPU: Fix crash when scheduling non-memory SMRD instructions
Summary: Fixes piglit spec/arb_shader_clock/execution/*
Reviewers: arsenm
Subscribers: kzhuravl, wdng, yaxunl, dstuttard, tpr, llvm-commits, t-tye
Differential Revision: https://reviews.llvm.org/D32345
llvm-svn: 301191
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp index ec8a7f0ad93..d51110bcbd6 100644 --- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp +++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp @@ -138,6 +138,11 @@ bool SIInstrInfo::areLoadsFromSameBasePtr(SDNode *Load0, SDNode *Load1, } if (isSMRD(Opc0) && isSMRD(Opc1)) { + // Skip time and cache invalidation instructions. + if (AMDGPU::getNamedOperandIdx(Opc0, AMDGPU::OpName::sbase) == -1 || + AMDGPU::getNamedOperandIdx(Opc1, AMDGPU::OpName::sbase) == -1) + return false; + assert(getNumOperandsNoGlue(Load0) == getNumOperandsNoGlue(Load1)); // Check base reg. |
