commit a57511c45190899308fab851fa461637cb0fbbcd
author Alexander Timofeev <Alexander.Timofeev@amd.com> Thu Dec 15 15:17:19 2016 +0000
committer Alexander Timofeev <Alexander.Timofeev@amd.com> Thu Dec 15 15:17:19 2016 +0000
tree bcd420fdfe28996a6f36c564d7abf9a6b8030257
parent f6ee79c9262a619752318ea4357a8f4d9f449d5c

Fix for regression after Global Load Scalarization patch

llvm-svn: 289822

llvm/lib/Target/AMDGPU/SIISelLowering.cpp

diff --git a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
index 0c35c27..4d4f4c44 100644
--- a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
@@ -2785,7 +2785,8 @@
     //
     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