[llvm-commits] [llvm] r53716 - in /llvm/trunk: lib/Transforms/IPO/GlobalOpt.cpp test/Transforms/GlobalOpt/2008-07-17-addrspace.ll

[Matthijs Kooijman]

Author: matthijs
Date: Thu Jul 17 06:59:53 2008
New Revision: 53716

URL: http://llvm.org/viewvc/llvm-project?rev=53716&view=rev
Log:
Make GlobalOpt preserve address spaces when scalar replacing aggregate globals.

Added:
    llvm/trunk/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=53716&r1=53715&r2=53716&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Thu Jul 17 06:59:53 2008
@@ -486,7 +486,8 @@
                                                GlobalVariable::InternalLinkage,
                                                In, GV->getName()+"."+utostr(i),
                                                (Module *)NULL,
-                                               GV->isThreadLocal());
+                                               GV->isThreadLocal(),
+                                               GV->getType()->getAddressSpace());
       Globals.insert(GV, NGV);
       NewGlobals.push_back(NGV);
       
@@ -520,7 +521,8 @@
                                                GlobalVariable::InternalLinkage,
                                                In, GV->getName()+"."+utostr(i),
                                                (Module *)NULL,
-                                               GV->isThreadLocal());
+                                               GV->isThreadLocal(),
+                                               GV->getType()->getAddressSpace());
       Globals.insert(GV, NGV);
       NewGlobals.push_back(NGV);
       

Added: llvm/trunk/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll?rev=53716&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-07-17-addrspace.ll Thu Jul 17 06:59:53 2008
@@ -0,0 +1,28 @@
+; This test lets globalopt split the global struct and array into different
+; values. This used to crash, because globalopt forgot to put the new var in the
+; same address space as the old one.
+
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis > %t
+; Check that the new global values still have their address space
+; RUN: cat %t | grep global.*addrspace
+
+ at struct = internal global { i32, i32 } zeroinitializer addrspace(1)
+ at array = internal global [ 2 x i32 ] zeroinitializer addrspace(1)
+
+define i32 @foo() {
+  %A = load i32 addrspace(1) * getelementptr ({ i32, i32 } addrspace(1) * @struct, i32 0, i32 0)
+  %B = load i32 addrspace(1) * getelementptr ([ 2 x i32 ] addrspace(1) * @array, i32 0, i32 0)
+  ; Use the loaded values, so they won't get removed completely
+  %R = add i32 %A, %B
+  ret i32 %R
+}
+
+; We put stores in a different function, so that the global variables won't get
+; optimized away completely.
+define void @bar(i32 %R) {
+  store i32 %R, i32 addrspace(1) * getelementptr ([ 2 x i32 ] addrspace(1) * @array, i32 0, i32 0)
+  store i32 %R, i32 addrspace(1) * getelementptr ({ i32, i32 } addrspace(1) * @struct, i32 0, i32 0)
+  ret void
+}
+
+