replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporarily revert "For X86-64 linux and PPC64 linux align int128 to 16 bytes." 

until we can get better TargetMachine::isCompatibleDataLayout to compare - otherwise
we can't code generate existing bitcode without a string equality data layout.

This reverts commit r294702.

llvm-svn: 294709
This commit is contained in:
Eric Christopher 2017-02-10 04:35:32 +00:00
parent f6ee1f3d69
commit 0824096cc0
21 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
View File

@ -120,11 +120,6 @@ static std::string getDataLayoutString(const Triple &T) {
else
Ret += "-f64:32:64";
// 128 bit integers are always aligned to 128 bits, but only 64-bit matters,
// because __int128 is only supoprted on 64-bit targets.
if (is64Bit && T.isOSLinux())
Ret += "-i128:128";
// PPC64 has 32 and 64 bit registers, PPC32 has only 32 bit ones.
if (is64Bit)
Ret += "-n32:64";

5
llvm/lib/Target/X86/X86TargetMachine.cpp
View File

@ -109,11 +109,6 @@ static std::string computeDataLayout(const Triple &TT) {
else
Ret += "-f64:32:64";
// 128 bit integers are always aligned to 128 bits, but only 64-bit matters,
// because __int128 is only supoprted on 64-bit targets.
if (TT.isArch64Bit() && TT.isOSLinux())
Ret += "-i128:128";
// Some ABIs align long double to 128 bits, others to 32.
if (TT.isOSNaCl() || TT.isOSIAMCU())
; // No f80

2
llvm/test/LTO/Resolution/X86/Inputs/comdat.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
$c2 = comdat any

2
llvm/test/LTO/Resolution/X86/Inputs/common2.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@v = common global i16 0, align 4

2
llvm/test/LTO/Resolution/X86/Inputs/mixed_lto.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
declare i32 @g()
define i32 @main() {

2
llvm/test/LTO/Resolution/X86/comdat.ll
View File

@ -22,7 +22,7 @@
; RUN: -r=%t2.o,a25,px
; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
$c1 = comdat any

2
llvm/test/LTO/Resolution/X86/common2.ll
View File

@ -70,7 +70,7 @@
; RUN: -r %t2.bc,bar,px
; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=BOTH-PREVAILED2
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@v = common global i8 0, align 8

2
llvm/test/LTO/Resolution/X86/lowertypetests.ll
View File

@ -6,7 +6,7 @@
; MERGED: R __typeid_foo_global_addr
; CHECK: U __typeid_foo_global_addr
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@foo = global i32 0, !type !0

2
llvm/test/LTO/Resolution/X86/mixed_lto.ll
View File

@ -19,7 +19,7 @@
; RUN: llvm-nm %t5.o.0 | FileCheck %s --check-prefix=NM0
; RUN: llvm-nm %t5.o.1 | FileCheck %s --check-prefix=NM1
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
ret i32 0

2
llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll
View File

@ -1,6 +1,6 @@
; ModuleID = 'debuginfo-compositetype-import2.c'
source_filename = "debuginfo-compositetype-import2.c"
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; Function Attrs: nounwind uwtable

2
llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-grtev4-linux-gnu"
define i32 @main() #0 {

2
llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
$c2 = comdat any

2
llvm/test/ThinLTO/X86/Inputs/module_asm.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @main({ i64, { i64, i8* }* } %unnamed) #0 {

2
llvm/test/ThinLTO/X86/Inputs/module_asm2.ll
View File

@ -1,4 +1,4 @@
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @main({ i64, { i64, i8* }* } %unnamed) #0 {

2
llvm/test/ThinLTO/X86/cache-config.ll
View File

@ -18,7 +18,7 @@
; RUN: llvm-lto2 -o %t.o %t.bc -cache-dir %t.cache -r=%t.bc,globalfunc,plx -default-triple=x86_64-unknown-linux-gnu
; RUN: ls %t.cache | count 15
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define void @globalfunc() {

2
llvm/test/ThinLTO/X86/debuginfo-compositetype-import.ll
View File

@ -34,7 +34,7 @@
; ModuleID = 'debuginfo-compositetype-import.c'
source_filename = "debuginfo-compositetype-import.c"
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; Function Attrs: nounwind uwtable

2
llvm/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll
View File

@ -24,7 +24,7 @@
; Check that we imported a ref (and not def) to baz.clone
; NM2: U baz.clone
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-grtev4-linux-gnu"
$baz.clone = comdat any

2
llvm/test/ThinLTO/X86/linkonce_resolution_comdat.ll
View File

@ -21,7 +21,7 @@
; and inlined into g()
; NM2-NOT: f
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
$c1 = comdat any

2
llvm/test/ThinLTO/X86/module_asm2.ll
View File

@ -64,7 +64,7 @@
; NM1-NOT: b
; NM1-NOT: x
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@b = internal global i32 1, align 4

2
llvm/test/ThinLTO/X86/module_asm_glob.ll
View File

@ -17,7 +17,7 @@
; NM0: T foo
; NM1-NOT: foo
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
module asm "\09.text"

2
llvm/test/tools/llvm-lto2/X86/pipeline.ll
View File

@ -10,7 +10,7 @@
; is accepted).
; RUN: llvm-lto2 %t1.bc -o %t.o -lto-use-new-pm -r %t1.bc,patatino,px
target datalayout = "e-m:e-i64:64-i128:128-f80:128-n8:16:32:64-S128"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define void @patatino() {