diff options
| author | Alexander Timofeev <Alexander.Timofeev@amd.com> | 2016-12-15 15:17:19 +0000 |
|---|---|---|
| committer | Alexander Timofeev <Alexander.Timofeev@amd.com> | 2016-12-15 15:17:19 +0000 |
| commit | a57511c45190899308fab851fa461637cb0fbbcd (patch) | |
| tree | bcd420fdfe28996a6f36c564d7abf9a6b8030257 /llvm/lib/Target/AMDGPU/SIISelLowering.cpp | |
| parent | f6ee79c9262a619752318ea4357a8f4d9f449d5c (diff) | |
| download | bcm5719-llvm-a57511c45190899308fab851fa461637cb0fbbcd.tar.gz bcm5719-llvm-a57511c45190899308fab851fa461637cb0fbbcd.zip | |
Fix for regression after Global Load Scalarization patch
llvm-svn: 289822
Diffstat (limited to 'llvm/lib/Target/AMDGPU/SIISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp index 0c35c2757a1..4d4f4c4407b 100644 --- a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp +++ b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp @@ -2785,7 +2785,8 @@ SDValue SITargetLowering::LowerLOAD(SDValue Op, SelectionDAG &DAG) const { // LLVM_FALLTHROUGH; case AMDGPUAS::GLOBAL_ADDRESS: { - if (isMemOpUniform(Load) && isMemOpHasNoClobberedMemOperand(Load)) + if (Subtarget->getScalarizeGlobalBehavior() && isMemOpUniform(Load) && + isMemOpHasNoClobberedMemOperand(Load)) return SDValue(); // Non-uniform loads will be selected to MUBUF instructions, so they // have the same legalization requirements as global and private |
