[PATCH] D18358: AMDGPU: Account for globals in AMDGPUPromoteAlloca pass

[Bas Nieuwenhuizen via llvm-commits]

bnieuwenhuizen updated this revision to Diff 55137.
bnieuwenhuizen added a comment.



  v2: - Use users.
      - Check LDS size in testcase.
      - Ran instnamer on testcase.
      - Changed unused GEP.
      - Enlarge array for 64 KiB LDS.


http://reviews.llvm.org/D18358

Files:
  lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
  test/CodeGen/AMDGPU/promote-alloca-globals.ll

Index: test/CodeGen/AMDGPU/promote-alloca-globals.ll
===================================================================
--- /dev/null
+++ test/CodeGen/AMDGPU/promote-alloca-globals.ll
@@ -0,0 +1,32 @@
+; RUN: opt -S -mtriple=amdgcn-unknown-unknown -amdgpu-promote-alloca < %s | FileCheck -check-prefix=IR %s
+; RUN: llc -march=amdgcn -mcpu=tonga < %s | FileCheck -check-prefix=ASM %s
+
+
+ at global_array= internal unnamed_addr addrspace(3) global [1500 x [10 x i32]] undef, align 4
+
+; IR-LABEL: define void @promote_alloca_size_256(i32 addrspace(1)* nocapture %out, i32 addrspace(1)* nocapture %in) {
+; IR: alloca [10 x i32]
+; ASM-LABEL: {{^}}promote_alloca_size_256:
+; ASM: ; LDSByteSize: 60000 bytes/workgroup (compile time only)
+
+define void @promote_alloca_size_256(i32 addrspace(1)* nocapture %out, i32 addrspace(1)* nocapture %in) {
+entry:
+  %stack = alloca [10 x i32], align 4
+  %tmp = load i32, i32 addrspace(1)* %in, align 4
+  %arrayidx1 = getelementptr inbounds [10 x i32], [10 x i32]* %stack, i32 0, i32 %tmp
+  store i32 4, i32* %arrayidx1, align 4
+  %arrayidx2 = getelementptr inbounds i32, i32 addrspace(1)* %in, i32 1
+  %tmp1 = load i32, i32 addrspace(1)* %arrayidx2, align 4
+  %arrayidx3 = getelementptr inbounds [10 x i32], [10 x i32]* %stack, i32 0, i32 %tmp1
+  store i32 5, i32* %arrayidx3, align 4
+  %arrayidx10 = getelementptr inbounds [10 x i32], [10 x i32]* %stack, i32 0, i32 0
+  %tmp2 = load i32, i32* %arrayidx10, align 4
+  store i32 %tmp2, i32 addrspace(1)* %out, align 4
+  %arrayidx12 = getelementptr inbounds [10 x i32], [10 x i32]* %stack, i32 0, i32 1
+  %tmp3 = load i32, i32* %arrayidx12
+  %arrayidx13 = getelementptr inbounds i32, i32 addrspace(1)* %out, i32 1
+  store i32 %tmp3, i32 addrspace(1)* %arrayidx13
+  %v = getelementptr inbounds [1500 x [10 x i32]], [1500 x [10 x i32]] addrspace(3)* @global_array, i32 0, i32 0, i32 0
+  store i32 %tmp3, i32 addrspace(3)* %v
+  ret void
+}
Index: lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
===================================================================
--- lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
+++ lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
@@ -125,14 +125,16 @@
     if (GV.getType()->getAddressSpace() != AMDGPUAS::LOCAL_ADDRESS)
       continue;
 
-    for (Use &U : GV.uses()) {
+    for (User *U : GV.users()) {
       Instruction *Use = dyn_cast<Instruction>(U);
       if (!Use)
         continue;
 
-      if (Use->getParent()->getParent() == &F)
+      if (Use->getParent()->getParent() == &F) {
         LocalMemAvailable -=
           Mod->getDataLayout().getTypeAllocSize(GV.getValueType());
+        break;
+      }
     }
   }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18358.55137.patch
Type: text/x-patch
Size: 2653 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160427/ca396821/attachment.bin>