Index: lib/Transforms/IPO/GlobalOpt.cpp =================================================================== --- lib/Transforms/IPO/GlobalOpt.cpp +++ lib/Transforms/IPO/GlobalOpt.cpp @@ -500,6 +500,7 @@ GV->getType()->getAddressSpace()); NGV->setExternallyInitialized(GV->isExternallyInitialized()); Globals.push_back(NGV); + NGV->copyAttributesFrom(GV); NewGlobals.push_back(NGV); // Calculate the known alignment of the field. If the original aggregate @@ -534,6 +535,7 @@ GV->getType()->getAddressSpace()); NGV->setExternallyInitialized(GV->isExternallyInitialized()); Globals.push_back(NGV); + NGV->copyAttributesFrom(GV); NewGlobals.push_back(NGV); // Calculate the known alignment of the field. If the original aggregate @@ -1292,6 +1294,7 @@ *GV->getParent(), PFieldTy, false, GlobalValue::InternalLinkage, Constant::getNullValue(PFieldTy), GV->getName() + ".f" + Twine(FieldNo), nullptr, GV->getThreadLocalMode()); + NGV->copyAttributesFrom(GV); FieldGlobals.push_back(NGV); unsigned TypeSize = DL.getTypeAllocSize(FieldTy); @@ -1611,6 +1614,7 @@ GV->getName()+".b", GV->getThreadLocalMode(), GV->getType()->getAddressSpace()); + NewGV->copyAttributesFrom(GV); GV->getParent()->getGlobalList().insert(GV->getIterator(), NewGV); Constant *InitVal = GV->getInitializer(); Index: test/Transforms/GlobalOpt/GSROA-section.ll =================================================================== --- /dev/null +++ test/Transforms/GlobalOpt/GSROA-section.ll @@ -0,0 +1,31 @@ +; 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: opt < %s -globalopt -S | FileCheck %s +; Check that the new global values still have their address space +; CHECK: @struct +; CHECK: section ".foo" +; CHECK: @array +; CHECK-NOT: section ".foo" + +@struct = internal addrspace(1) global { i32, i32 } zeroinitializer, section ".foo" +@array = internal addrspace(1) global [ 2 x i32 ] zeroinitializer + +define i32 @foo() { + %A = load i32, i32 addrspace(1) * getelementptr ({ i32, i32 }, { i32, i32 } addrspace(1) * @struct, i32 0, i32 0) + %B = load i32, i32 addrspace(1) * getelementptr ([ 2 x i32 ], [ 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 ], [ 2 x i32 ] addrspace(1) * @array, i32 0, i32 0) + store i32 %R, i32 addrspace(1) * getelementptr ({ i32, i32 }, { i32, i32 } addrspace(1) * @struct, i32 0, i32 0) + ret void +} + + Index: test/Transforms/GlobalOpt/MallocSROA-section.ll =================================================================== --- /dev/null +++ test/Transforms/GlobalOpt/MallocSROA-section.ll @@ -0,0 +1,28 @@ +; RUN: opt -globalopt -S < %s | FileCheck %s +; CHECK: @Y.f0 +; CHECK: section ".foo" +; CHECK: @Y.f1 +; CHECK: section ".foo" + +%struct.xyz = type { double, i32 } + +@Y = internal global %struct.xyz* null ,section ".foo" ; <%struct.xyz**> [#uses=2] +@numf2s = external global i32 ; [#uses=1] + +define fastcc void @init_net() nounwind { +entry: + %0 = load i32, i32* @numf2s, align 4 ; [#uses=1] + %mallocsize2 = shl i32 %0, 4 ; [#uses=1] + %malloccall3 = tail call i8* @malloc(i32 %mallocsize2) nounwind ; [#uses=1] + %1 = bitcast i8* %malloccall3 to %struct.xyz* ; <%struct.xyz*> [#uses=1] + store %struct.xyz* %1, %struct.xyz** @Y, align 8 + ret void +} + +define fastcc void @load_train(i8* %trainfile, i32 %mode, i32 %objects) nounwind { +entry: + %0 = load %struct.xyz*, %struct.xyz** @Y, align 8 ; <%struct.xyz*> [#uses=0] + ret void +} + +declare noalias i8* @malloc(i32) Index: test/Transforms/GlobalOpt/SROA-section.ll =================================================================== --- /dev/null +++ test/Transforms/GlobalOpt/SROA-section.ll @@ -0,0 +1,27 @@ +; Verify that section assignment is copied during SROA +; RUN: opt < %s -globalopt -S | FileCheck %s +; CHECK: @G.0 +; CHECK: section ".foo" +; CHECK: @G.1 +; CHECK: section ".foo" +; CHECK: @G.2 +; CHECK: section ".foo" + +%T = type { double, double, double } +@G = internal global %T zeroinitializer, align 16, section ".foo" + +define void @test() { + store double 1.0, double* getelementptr (%T, %T* @G, i32 0, i32 0), align 16 + store double 2.0, double* getelementptr (%T, %T* @G, i32 0, i32 1), align 8 + store double 3.0, double* getelementptr (%T, %T* @G, i32 0, i32 2), align 16 + ret void +} + +define double @test2() { + %V1 = load double, double* getelementptr (%T, %T* @G, i32 0, i32 0), align 16 + %V2 = load double, double* getelementptr (%T, %T* @G, i32 0, i32 1), align 8 + %V3 = load double, double* getelementptr (%T, %T* @G, i32 0, i32 2), align 16 + %R = fadd double %V1, %V2 + %R2 = fadd double %R, %V3 + ret double %R2 +}