From 8c54b816e554ff9f9a75ec8a1d50198d2bfd9633 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 10 Feb 2017 04:35:32 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294709 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/PowerPC/PPCTargetMachine.cpp | 5 ----- lib/Target/X86/X86TargetMachine.cpp | 5 ----- test/LTO/Resolution/X86/Inputs/comdat.ll | 2 +- test/LTO/Resolution/X86/Inputs/common2.ll | 2 +- test/LTO/Resolution/X86/Inputs/mixed_lto.ll | 2 +- test/LTO/Resolution/X86/comdat.ll | 2 +- test/LTO/Resolution/X86/common2.ll | 2 +- test/LTO/Resolution/X86/lowertypetests.ll | 2 +- test/LTO/Resolution/X86/mixed_lto.ll | 2 +- test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll | 2 +- test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll | 2 +- test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll | 2 +- test/ThinLTO/X86/Inputs/module_asm.ll | 2 +- test/ThinLTO/X86/Inputs/module_asm2.ll | 2 +- test/ThinLTO/X86/cache-config.ll | 2 +- test/ThinLTO/X86/debuginfo-compositetype-import.ll | 2 +- test/ThinLTO/X86/linkonce_aliasee_ref_import.ll | 2 +- test/ThinLTO/X86/linkonce_resolution_comdat.ll | 2 +- test/ThinLTO/X86/module_asm2.ll | 2 +- test/ThinLTO/X86/module_asm_glob.ll | 2 +- test/tools/llvm-lto2/X86/pipeline.ll | 2 +- 21 files changed, 19 insertions(+), 29 deletions(-) diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index 8df1a89308f..5d68f32ccc5 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -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"; diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index 585d5433e62..7dd878e8a90 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -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 diff --git a/test/LTO/Resolution/X86/Inputs/comdat.ll b/test/LTO/Resolution/X86/Inputs/comdat.ll index 253b4e74090..ca4bbb4bf81 100644 --- a/test/LTO/Resolution/X86/Inputs/comdat.ll +++ b/test/LTO/Resolution/X86/Inputs/comdat.ll @@ -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 diff --git a/test/LTO/Resolution/X86/Inputs/common2.ll b/test/LTO/Resolution/X86/Inputs/common2.ll index 449f3d5c343..c3a7f753684 100644 --- a/test/LTO/Resolution/X86/Inputs/common2.ll +++ b/test/LTO/Resolution/X86/Inputs/common2.ll @@ -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 diff --git a/test/LTO/Resolution/X86/Inputs/mixed_lto.ll b/test/LTO/Resolution/X86/Inputs/mixed_lto.ll index c1c3f8e0655..2393deb3241 100644 --- a/test/LTO/Resolution/X86/Inputs/mixed_lto.ll +++ b/test/LTO/Resolution/X86/Inputs/mixed_lto.ll @@ -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() { diff --git a/test/LTO/Resolution/X86/comdat.ll b/test/LTO/Resolution/X86/comdat.ll index 32cada5161e..5124b951bed 100644 --- a/test/LTO/Resolution/X86/comdat.ll +++ b/test/LTO/Resolution/X86/comdat.ll @@ -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 diff --git a/test/LTO/Resolution/X86/common2.ll b/test/LTO/Resolution/X86/common2.ll index 520ccf27112..3328d7c5ec3 100644 --- a/test/LTO/Resolution/X86/common2.ll +++ b/test/LTO/Resolution/X86/common2.ll @@ -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 diff --git a/test/LTO/Resolution/X86/lowertypetests.ll b/test/LTO/Resolution/X86/lowertypetests.ll index 7c2230738f0..3753689a699 100644 --- a/test/LTO/Resolution/X86/lowertypetests.ll +++ b/test/LTO/Resolution/X86/lowertypetests.ll @@ -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 diff --git a/test/LTO/Resolution/X86/mixed_lto.ll b/test/LTO/Resolution/X86/mixed_lto.ll index 25f7c59620e..02b15c61154 100644 --- a/test/LTO/Resolution/X86/mixed_lto.ll +++ b/test/LTO/Resolution/X86/mixed_lto.ll @@ -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 diff --git a/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll b/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll index 9e4e303f64b..7e80c4d7c44 100644 --- a/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll +++ b/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll @@ -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 diff --git a/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll b/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll index f2ca7e9935b..66847f50b15 100644 --- a/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll +++ b/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll @@ -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 { diff --git a/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll b/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll index 744aa5dc2b1..59434a81986 100644 --- a/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll +++ b/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll @@ -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 diff --git a/test/ThinLTO/X86/Inputs/module_asm.ll b/test/ThinLTO/X86/Inputs/module_asm.ll index e212788bb1c..337e8613c6e 100644 --- a/test/ThinLTO/X86/Inputs/module_asm.ll +++ b/test/ThinLTO/X86/Inputs/module_asm.ll @@ -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 { diff --git a/test/ThinLTO/X86/Inputs/module_asm2.ll b/test/ThinLTO/X86/Inputs/module_asm2.ll index 69a4732215c..a8081cccaf3 100644 --- a/test/ThinLTO/X86/Inputs/module_asm2.ll +++ b/test/ThinLTO/X86/Inputs/module_asm2.ll @@ -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 { diff --git a/test/ThinLTO/X86/cache-config.ll b/test/ThinLTO/X86/cache-config.ll index 4953b30983d..a947969f669 100644 --- a/test/ThinLTO/X86/cache-config.ll +++ b/test/ThinLTO/X86/cache-config.ll @@ -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() { diff --git a/test/ThinLTO/X86/debuginfo-compositetype-import.ll b/test/ThinLTO/X86/debuginfo-compositetype-import.ll index 758ec8b371d..0b3a7a45224 100644 --- a/test/ThinLTO/X86/debuginfo-compositetype-import.ll +++ b/test/ThinLTO/X86/debuginfo-compositetype-import.ll @@ -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 diff --git a/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll b/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll index ee5737baa41..9b8cc7f7228 100644 --- a/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll +++ b/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll @@ -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 diff --git a/test/ThinLTO/X86/linkonce_resolution_comdat.ll b/test/ThinLTO/X86/linkonce_resolution_comdat.ll index 43ff8654791..c1ffdf176e5 100644 --- a/test/ThinLTO/X86/linkonce_resolution_comdat.ll +++ b/test/ThinLTO/X86/linkonce_resolution_comdat.ll @@ -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 diff --git a/test/ThinLTO/X86/module_asm2.ll b/test/ThinLTO/X86/module_asm2.ll index 90f4fb3f860..02404062163 100644 --- a/test/ThinLTO/X86/module_asm2.ll +++ b/test/ThinLTO/X86/module_asm2.ll @@ -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 diff --git a/test/ThinLTO/X86/module_asm_glob.ll b/test/ThinLTO/X86/module_asm_glob.ll index 4973ed0c0cf..bcc44c58c9f 100644 --- a/test/ThinLTO/X86/module_asm_glob.ll +++ b/test/ThinLTO/X86/module_asm_glob.ll @@ -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" diff --git a/test/tools/llvm-lto2/X86/pipeline.ll b/test/tools/llvm-lto2/X86/pipeline.ll index fba09f6c632..e0d03bd932f 100644 --- a/test/tools/llvm-lto2/X86/pipeline.ll +++ b/test/tools/llvm-lto2/X86/pipeline.ll @@ -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() { -- 2.50.1