commit f4e3f3e31cacd412bcef0906da3c6a4bd503d0a2
author Rafael Espindola <rafael.espindola@gmail.com> Wed Feb 07 18:09:35 2018 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Feb 07 18:09:35 2018 +0000
tree 7acf9b28cd39d6d52948a9e69f9e01d386d31d8c
parent 36df7631b44cb7f8babae9bdea08a982fc9a4c40

Revert "AMDGPU: Add 32-bit constant address space"

This reverts commit r324487.

It broke clang tests.

llvm-svn: 324494

llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp b/llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp
index 7cb6ef0..b7f65c2 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp
@@ -229,9 +229,6 @@
       isa<Constant>(Ptr) || isa<GlobalValue>(Ptr))
     return true;
 
-  if (MMO->getAddrSpace() == AMDGPUAS::CONSTANT_ADDRESS_32BIT)
-    return true;
-
   const Instruction *I = dyn_cast<Instruction>(Ptr);
   return I && I->getMetadata("amdgpu.uniform");
 }
@@ -296,8 +293,7 @@
   if (!I.hasOneMemOperand())
     return false;
 
-  if ((*I.memoperands_begin())->getAddrSpace() != AMDGPUASI.CONSTANT_ADDRESS &&
-      (*I.memoperands_begin())->getAddrSpace() != AMDGPUASI.CONSTANT_ADDRESS_32BIT)
+  if ((*I.memoperands_begin())->getAddrSpace() != AMDGPUASI.CONSTANT_ADDRESS)
     return false;
 
   if (!isInstrUniform(I))