[llvm] r222681 - Pass the .ll files to llvm-link directly. NFC.
Rafael Espindola
rafael.espindola at gmail.com
Mon Nov 24 12:35:59 PST 2014
Author: rafael
Date: Mon Nov 24 14:35:59 2014
New Revision: 222681
URL: http://llvm.org/viewvc/llvm-project?rev=222681&view=rev
Log:
Pass the .ll files to llvm-link directly. NFC.
Added:
llvm/trunk/test/Linker/Inputs/testlink.ll
- copied, changed from r222658, llvm/trunk/test/Linker/testlink2.ll
llvm/trunk/test/Linker/testlink.ll
- copied, changed from r222658, llvm/trunk/test/Linker/testlink1.ll
Removed:
llvm/trunk/test/Linker/testlink1.ll
llvm/trunk/test/Linker/testlink2.ll
Modified:
llvm/trunk/test/Linker/weakextern.ll
Copied: llvm/trunk/test/Linker/Inputs/testlink.ll (from r222658, llvm/trunk/test/Linker/testlink2.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/testlink.ll?p2=llvm/trunk/test/Linker/Inputs/testlink.ll&p1=llvm/trunk/test/Linker/testlink2.ll&r1=222658&r2=222681&rev=222681&view=diff
==============================================================================
--- llvm/trunk/test/Linker/testlink2.ll (original)
+++ llvm/trunk/test/Linker/Inputs/testlink.ll Mon Nov 24 14:35:59 2014
@@ -1,7 +1,3 @@
-; This file is used by testlink1.ll, so it doesn't actually do anything itself
-;
-; RUN: true
-
%intlist = type { %intlist*, i32 }
Copied: llvm/trunk/test/Linker/testlink.ll (from r222658, llvm/trunk/test/Linker/testlink1.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/testlink.ll?p2=llvm/trunk/test/Linker/testlink.ll&p1=llvm/trunk/test/Linker/testlink1.ll&r1=222658&r2=222681&rev=222681&view=diff
==============================================================================
--- llvm/trunk/test/Linker/testlink1.ll (original)
+++ llvm/trunk/test/Linker/testlink.ll Mon Nov 24 14:35:59 2014
@@ -1,6 +1,4 @@
-; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-as < %p/testlink2.ll > %t2.bc
-; RUN: llvm-link %t.bc %t2.bc -S | FileCheck %s
+; RUN: llvm-link %s %S/Inputs/testlink.ll -S | FileCheck %s
; CHECK: %Ty2 = type { %Ty1* }
; CHECK: %Ty1 = type { %Ty2* }
Removed: llvm/trunk/test/Linker/testlink1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/testlink1.ll?rev=222680&view=auto
==============================================================================
--- llvm/trunk/test/Linker/testlink1.ll (original)
+++ llvm/trunk/test/Linker/testlink1.ll (removed)
@@ -1,101 +0,0 @@
-; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-as < %p/testlink2.ll > %t2.bc
-; RUN: llvm-link %t.bc %t2.bc -S | FileCheck %s
-
-; CHECK: %Ty2 = type { %Ty1* }
-; CHECK: %Ty1 = type { %Ty2* }
-%Ty1 = type opaque
-%Ty2 = type { %Ty1* }
-
-; CHECK: %intlist = type { %intlist*, i32 }
-%intlist = type { %intlist*, i32 }
-
-; The uses of intlist in the other file should be remapped.
-; CHECK-NOT: {{%intlist.[0-9]}}
-
-; CHECK: %VecSize = type { <5 x i32> }
-; CHECK: %VecSize.{{[0-9]}} = type { <10 x i32> }
-%VecSize = type { <5 x i32> }
-
-%Struct1 = type opaque
- at S1GV = external global %Struct1*
-
-
- at GVTy1 = external global %Ty1*
- at GVTy2 = global %Ty2* null
-
-
-; This should stay the same
-; CHECK: @MyIntList = global %intlist { %intlist* null, i32 17 }
- at MyIntList = global %intlist { %intlist* null, i32 17 }
-
-
-; Nothing to link here.
-
-; CHECK: @0 = external global i32
- at 0 = external global i32
-; CHECK: @Inte = global i32 1
- at Inte = global i32 1
-
-; Intern1 is intern in both files, rename testlink2's.
-; CHECK: @Intern1 = internal constant i32 42
- at Intern1 = internal constant i32 42
-
-; This should get renamed since there is a definition that is non-internal in
-; the other module.
-; CHECK: @Intern2{{[0-9]+}} = internal constant i32 792
- at Intern2 = internal constant i32 792
-
-
-; CHECK: @MyVarPtr = linkonce global { i32* } { i32* @MyVar }
- at MyVarPtr = linkonce global { i32* } { i32* @MyVar }
-
-; CHECK: @MyVar = global i32 4
- at MyVar = external global i32
-
-; Take value from other module.
-; CHECK: AConst = constant i32 1234
- at AConst = linkonce constant i32 123
-
-; Renamed version of Intern1.
-; CHECK: @Intern1{{[0-9]+}} = internal constant i32 52
-
-
-; Globals linked from testlink2.
-; CHECK: @Intern2 = constant i32 12345
-
-; CHECK: @MyIntListPtr = constant
-; CHECK: @1 = constant i32 412
-
-
-declare i32 @foo(i32)
-
-declare void @print(i32)
-
-define void @main() {
- %v1 = load i32* @MyVar
- call void @print(i32 %v1)
- %idx = getelementptr %intlist* @MyIntList, i64 0, i32 1
- %v2 = load i32* %idx
- call void @print(i32 %v2)
- %1 = call i32 @foo(i32 5)
- %v3 = load i32* @MyVar
- call void @print(i32 %v3)
- %v4 = load i32* %idx
- call void @print(i32 %v4)
- ret void
-}
-
-define internal void @testintern() {
- ret void
-}
-
-define internal void @Testintern() {
- ret void
-}
-
-define void @testIntern() {
- ret void
-}
-
-declare void @VecSizeCrash(%VecSize)
Removed: llvm/trunk/test/Linker/testlink2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/testlink2.ll?rev=222680&view=auto
==============================================================================
--- llvm/trunk/test/Linker/testlink2.ll (original)
+++ llvm/trunk/test/Linker/testlink2.ll (removed)
@@ -1,58 +0,0 @@
-; This file is used by testlink1.ll, so it doesn't actually do anything itself
-;
-; RUN: true
-
-%intlist = type { %intlist*, i32 }
-
-
-%Ty1 = type { %Ty2* }
-%Ty2 = type opaque
-
-%VecSize = type { <10 x i32> }
-
- at GVTy1 = global %Ty1* null
- at GVTy2 = external global %Ty2*
-
-
- at MyVar = global i32 4
- at MyIntList = external global %intlist
- at AConst = constant i32 1234
-
-;; Intern in both testlink[12].ll
- at Intern1 = internal constant i32 52
-
-;; Intern in one but not in other
- at Intern2 = constant i32 12345
-
- at MyIntListPtr = constant { %intlist* } { %intlist* @MyIntList }
- at MyVarPtr = linkonce global { i32* } { i32* @MyVar }
- at 0 = constant i32 412
-
-; Provides definition of Struct1 and of S1GV.
-%Struct1 = type { i32 }
- at S1GV = global %Struct1* null
-
-define i32 @foo(i32 %blah) {
- store i32 %blah, i32* @MyVar
- %idx = getelementptr %intlist* @MyIntList, i64 0, i32 1
- store i32 12, i32* %idx
- %ack = load i32* @0
- %fzo = add i32 %ack, %blah
- ret i32 %fzo
-}
-
-declare void @unimp(float, double)
-
-define internal void @testintern() {
- ret void
-}
-
-define void @Testintern() {
- ret void
-}
-
-define internal void @testIntern() {
- ret void
-}
-
-declare void @VecSizeCrash1(%VecSize)
Modified: llvm/trunk/test/Linker/weakextern.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/weakextern.ll?rev=222681&r1=222680&r2=222681&view=diff
==============================================================================
--- llvm/trunk/test/Linker/weakextern.ll (original)
+++ llvm/trunk/test/Linker/weakextern.ll Mon Nov 24 14:35:59 2014
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-as < %p/testlink1.ll > %t2.bc
+; RUN: llvm-as < %p/testlink.ll > %t2.bc
; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc
; RUN: llvm-dis < %t1.bc | FileCheck %s
; CHECK: kallsyms_names = extern_weak
More information about the llvm-commits
mailing list