commit f97de00745e0cae92d9bfd7117fef8e2a1056225
author Jan Vesely <jan.vesely@rutgers.edu> Fri May 13 20:39:29 2016 +0000
committer Jan Vesely <jan.vesely@rutgers.edu> Fri May 13 20:39:29 2016 +0000
tree 3bbf9dad44ee33e5773831ba9dbcee30c8a94974
parent a1f9fdfcbcd04c41a12b59cd94008adc0bd78ee7

AMDGPU/R600: Implement memory loads from constant AS

Reviewers: tstellard

Subscribers: arsenm

Differential Revision: http://reviews.llvm.org/D19792

llvm-svn: 269479

llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp

diff --git a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
index 3faae8a..96f7287 100644
--- a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
+++ b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
@@ -429,13 +429,15 @@
         if (Literals[i]->isImm()) {
             MILit.addImm(Literals[i]->getImm());
         } else {
-            MILit.addImm(0);
+            MILit.addGlobalAddress(Literals[i]->getGlobal(),
+                                   Literals[i]->getOffset());
         }
         if (i + 1 < e) {
           if (Literals[i + 1]->isImm()) {
             MILit.addImm(Literals[i + 1]->getImm());
           } else {
-            MILit.addImm(0);
+            MILit.addGlobalAddress(Literals[i + 1]->getGlobal(),
+                                   Literals[i + 1]->getOffset());
           }
         } else
           MILit.addImm(0);