[llvm] r304884 - [Linker] Remove warning when linking ARM and Thumb IR modules.
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 7 02:17:02 PDT 2017
Author: fhahn
Date: Wed Jun 7 04:17:01 2017
New Revision: 304884
URL: http://llvm.org/viewvc/llvm-project?rev=304884&view=rev
Log:
[Linker] Remove warning when linking ARM and Thumb IR modules.
Summary:
This patch updates Triple::isCompatibleWith to make armxx and thumbxx
triples compatible, as long as the subarch, vendor, os, envorionment and
object format match. Thumb/ARM code generation should be controlled
using the thumb-mode per-function target feature rather than by the
triple to allow mixing Thumb and ARM functions.
D33448 updates Clang's codegen to add thumb-mode for all functions with
armxx or thumbxx triples.
Reviewers: echristo, t.p.northover, rafael, kristof.beyls, rengolin, tejohnson
Reviewed By: tejohnson
Subscribers: rinon, eugenis, pcc, srhines, aemerson, mehdi_amini, javed.absar, llvm-commits
Differential Revision: https://reviews.llvm.org/D33287
Added:
llvm/trunk/test/LTO/ARM/Inputs/
llvm/trunk/test/LTO/ARM/Inputs/thumb.ll
llvm/trunk/test/LTO/ARM/link-arm-and-thumb.ll
llvm/trunk/test/Linker/Inputs/thumb.ll
llvm/trunk/test/Linker/link-arm-and-thumb.ll
Modified:
llvm/trunk/lib/Support/Triple.cpp
Modified: llvm/trunk/lib/Support/Triple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Triple.cpp?rev=304884&r1=304883&r2=304884&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Triple.cpp (original)
+++ llvm/trunk/lib/Support/Triple.cpp Wed Jun 7 04:17:01 2017
@@ -1488,6 +1488,21 @@ bool Triple::isLittleEndian() const {
}
bool Triple::isCompatibleWith(const Triple &Other) const {
+ // ARM and Thumb triples are compatible, if subarch, vendor and OS match.
+ if ((getArch() == Triple::thumb && Other.getArch() == Triple::arm) ||
+ (getArch() == Triple::arm && Other.getArch() == Triple::thumb) ||
+ (getArch() == Triple::thumbeb && Other.getArch() == Triple::armeb) ||
+ (getArch() == Triple::armeb && Other.getArch() == Triple::thumbeb)) {
+ if (getVendor() == Triple::Apple)
+ return getSubArch() == Other.getSubArch() &&
+ getVendor() == Other.getVendor() && getOS() == Other.getOS();
+ else
+ return getSubArch() == Other.getSubArch() &&
+ getVendor() == Other.getVendor() && getOS() == Other.getOS() &&
+ getEnvironment() == Other.getEnvironment() &&
+ getObjectFormat() == Other.getObjectFormat();
+ }
+
// If vendor is apple, ignore the version number.
if (getVendor() == Triple::Apple)
return getArch() == Other.getArch() && getSubArch() == Other.getSubArch() &&
Added: llvm/trunk/test/LTO/ARM/Inputs/thumb.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/ARM/Inputs/thumb.ll?rev=304884&view=auto
==============================================================================
--- llvm/trunk/test/LTO/ARM/Inputs/thumb.ll (added)
+++ llvm/trunk/test/LTO/ARM/Inputs/thumb.ll Wed Jun 7 04:17:01 2017
@@ -0,0 +1,15 @@
+target triple = "thumbv7-linux-gnueabihf"
+
+define i32 @foo(i32 %a, i32 %b) #0 {
+entry:
+ %add = add i32 %a, %b
+ ret i32 %add
+}
+
+define i32 @bar(i32 %a, i32 %b) #0 {
+entry:
+ %add = add i32 %a, %b
+ ret i32 %add
+}
+
+attributes #0 = { "target-features"="+thumb-mode" }
Added: llvm/trunk/test/LTO/ARM/link-arm-and-thumb.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/ARM/link-arm-and-thumb.ll?rev=304884&view=auto
==============================================================================
--- llvm/trunk/test/LTO/ARM/link-arm-and-thumb.ll (added)
+++ llvm/trunk/test/LTO/ARM/link-arm-and-thumb.ll Wed Jun 7 04:17:01 2017
@@ -0,0 +1,32 @@
+; Testcase to check that functions from a Thumb module can be inlined in an
+; ARM function.
+;
+; RUN: llvm-as %s -o %t1.bc
+; RUN: llvm-as %p/Inputs/thumb.ll -o %t2.bc
+; RUN: llvm-lto -exported-symbol main \
+; RUN: -exported-symbol bar \
+; RUN: -filetype=asm \
+; RUN: -o - \
+; RUN: %t1.bc %t2.bc 2> %t3.out| FileCheck %s
+; RUN: FileCheck --allow-empty --input-file %t3.out --check-prefix STDERR %s
+
+target triple = "armv7-linux-gnueabihf"
+
+; CHECK: .code 32
+; CHECK-NEXT: main
+; CHECK-NEXT: .fnstart
+; CHECK-NEXT: mov r0, #30
+
+; CHECK: .code 16
+; CHECK-NEXT: .thumb_func
+; CHECK-NEXT: bar
+
+declare i32 @foo(i32 %a, i32 %b);
+
+define i32 @main() {
+entry:
+ %add = call i32 @foo(i32 10, i32 20)
+ ret i32 %add
+}
+
+; STDERR-NOT: warning: Linking two modules of different target triples:
Added: llvm/trunk/test/Linker/Inputs/thumb.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/thumb.ll?rev=304884&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/thumb.ll (added)
+++ llvm/trunk/test/Linker/Inputs/thumb.ll Wed Jun 7 04:17:01 2017
@@ -0,0 +1,16 @@
+target triple = "thumbv7-linux-gnueabihf"
+
+define i32 @foo(i32 %a, i32 %b) #0 {
+entry:
+ %add = add i32 %a, %b
+ ret i32 %add
+}
+
+define i32 @bar(i32 %a, i32 %b) #1 {
+entry:
+ %add = add i32 %a, %b
+ ret i32 %add
+}
+
+attributes #0 = { "target-features"="-thumb-mode" }
+attributes #1 = { "target-features"="+thumb-mode" }
Added: llvm/trunk/test/Linker/link-arm-and-thumb.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/link-arm-and-thumb.ll?rev=304884&view=auto
==============================================================================
--- llvm/trunk/test/Linker/link-arm-and-thumb.ll (added)
+++ llvm/trunk/test/Linker/link-arm-and-thumb.ll Wed Jun 7 04:17:01 2017
@@ -0,0 +1,26 @@
+; RUN: llvm-as %s -o %t1.bc
+; RUN: llvm-as %p/Inputs/thumb.ll -o %t2.bc
+; RUN: llvm-link %t1.bc %t2.bc -S 2> %t3.out | llc | FileCheck %s
+; RUN: FileCheck --allow-empty --input-file %t3.out --check-prefix STDERR %s
+
+target triple = "armv7-linux-gnueabihf"
+
+declare i32 @foo(i32 %a, i32 %b);
+
+define i32 @main() {
+entry:
+ %add = call i32 @foo(i32 10, i32 20)
+ ret i32 %add
+}
+
+; CHECK: .code 32 @ @main
+; CHECK-NEXT: main
+
+; CHECK: .code 32 @ @foo
+; CHECK-NEXT: foo
+
+; CHECK: .code 16 @ @bar
+; CHECK-NEXT: .thumb_func
+; CHECK-NEXT: bar
+
+; STDERR-NOT: warning: Linking two modules of different target triples:
More information about the llvm-commits
mailing list