diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h index bdce233ce8b8c1..52c34dc9603c0c 100644 --- a/clang/include/clang-c/Index.h +++ b/clang/include/clang-c/Index.h @@ -1361,7 +1361,7 @@ enum CXTranslationUnit_Flags { /** * Tells the preprocessor not to skip excluded conditional blocks. */ - CXTranslationUnit_RetainExcludedConditionalBlocks = 0x8000, + CXTranslationUnit_RetainExcludedConditionalBlocks = 0x8000 }; /** diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index cc72a0a39f30fb..da22e6508c6012 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -775,11 +775,9 @@ class LLVM_LIBRARY_VISIBILITY NaClTargetInfo : public OSTargetInfo { if (Triple.getArch() == llvm::Triple::arm) { // Handled in ARM's setABI(). } else if (Triple.getArch() == llvm::Triple::x86) { - this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-" - "i64:64-n8:16:32-S128"); + this->resetDataLayout("e-m:e-p:32:32-i64:64-n8:16:32-S128"); } else if (Triple.getArch() == llvm::Triple::x86_64) { - this->resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-" - "i64:64-n8:16:32:64-S128"); + this->resetDataLayout("e-m:e-p:32:32-i64:64-n8:16:32:64-S128"); } else if (Triple.getArch() == llvm::Triple::mipsel) { // Handled on mips' setDataLayout. } else { diff --git a/clang/lib/Basic/Targets/X86.h b/clang/lib/Basic/Targets/X86.h index dee342c0d0ee99..dd1e7db6c81e53 100644 --- a/clang/lib/Basic/Targets/X86.h +++ b/clang/lib/Basic/Targets/X86.h @@ -340,8 +340,7 @@ class LLVM_LIBRARY_VISIBILITY X86_32TargetInfo : public X86TargetInfo { LongDoubleWidth = 96; LongDoubleAlign = 32; SuitableAlign = 128; - resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-" - "f80:32-n8:16:32-S128"); + resetDataLayout("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128"); SizeType = UnsignedInt; PtrDiffType = SignedInt; IntPtrType = SignedInt; @@ -441,8 +440,7 @@ class LLVM_LIBRARY_VISIBILITY DarwinI386TargetInfo UseSignedCharForObjCBool = false; SizeType = UnsignedLong; IntPtrType = SignedLong; - resetDataLayout("e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-" - "f80:128-n8:16:32-S128"); + resetDataLayout("e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128"); HasAlignMac68kSupport = true; } @@ -467,10 +465,9 @@ class LLVM_LIBRARY_VISIBILITY WindowsX86_32TargetInfo DoubleAlign = LongLongAlign = 64; bool IsWinCOFF = getTriple().isOSWindows() && getTriple().isOSBinFormatCOFF(); - resetDataLayout(IsWinCOFF ? "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:" - "64-i64:64-f80:32-n8:16:32-a:0:32-S32" - : "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:" - "64-i64:64-f80:32-n8:16:32-a:0:32-S32"); + resetDataLayout(IsWinCOFF + ? "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" + : "e-m:e-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"); } }; @@ -518,8 +515,7 @@ class LLVM_LIBRARY_VISIBILITY CygwinX86_32TargetInfo : public X86_32TargetInfo { : X86_32TargetInfo(Triple, Opts) { this->WCharType = TargetInfo::UnsignedShort; DoubleAlign = LongLongAlign = 64; - resetDataLayout("e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:" - "32-n8:16:32-a:0:32-S32"); + resetDataLayout("e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"); } void getTargetDefines(const LangOptions &Opts, @@ -556,8 +552,7 @@ class LLVM_LIBRARY_VISIBILITY MCUX86_32TargetInfo : public X86_32TargetInfo { : X86_32TargetInfo(Triple, Opts) { LongDoubleWidth = 64; LongDoubleFormat = &llvm::APFloat::IEEEdouble(); - resetDataLayout("e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:32-f64:" - "32-f128:32-n8:16:32-a:0:32-S32"); + resetDataLayout("e-m:e-p:32:32-i64:32-f64:32-f128:32-n8:16:32-a:0:32-S32"); WIntType = UnsignedInt; } @@ -616,12 +611,10 @@ class LLVM_LIBRARY_VISIBILITY X86_64TargetInfo : public X86TargetInfo { RegParmMax = 6; // Pointers are 32-bit in x32. - resetDataLayout(IsX32 ? "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-" - "i64:64-f80:128-n8:16:32:64-S128" - : IsWinCOFF ? "e-m:w-p270:32:32-p271:32:32-p272:64:" - "64-i64:64-f80:128-n8:16:32:64-S128" - : "e-m:e-p270:32:32-p271:32:32-p272:64:" - "64-i64:64-f80:128-n8:16:32:64-S128"); + resetDataLayout(IsX32 + ? "e-m:e-p:32:32-i64:64-f80:128-n8:16:32:64-S128" + : IsWinCOFF ? "e-m:w-i64:64-f80:128-n8:16:32:64-S128" + : "e-m:e-i64:64-f80:128-n8:16:32:64-S128"); // Use fpret only for long double. RealTypeUsesObjCFPRet = (1 << TargetInfo::LongDouble); @@ -811,8 +804,7 @@ class LLVM_LIBRARY_VISIBILITY DarwinX86_64TargetInfo llvm::Triple T = llvm::Triple(Triple); if (T.isiOS()) UseSignedCharForObjCBool = false; - resetDataLayout("e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:" - "16:32:64-S128"); + resetDataLayout("e-m:o-i64:64-f80:128-n8:16:32:64-S128"); } bool handleTargetFeatures(std::vector &Features, diff --git a/clang/test/CodeGen/Inputs/thinlto-multi-module.ll b/clang/test/CodeGen/Inputs/thinlto-multi-module.ll index e6fe92084ad81d..e8dc16a8f572aa 100644 --- a/clang/test/CodeGen/Inputs/thinlto-multi-module.ll +++ b/clang/test/CodeGen/Inputs/thinlto-multi-module.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f2() { diff --git a/clang/test/CodeGen/Inputs/thinlto_backend.ll b/clang/test/CodeGen/Inputs/thinlto_backend.ll index 86c410efb5d113..78678c0c5add2a 100644 --- a/clang/test/CodeGen/Inputs/thinlto_backend.ll +++ b/clang/test/CodeGen/Inputs/thinlto_backend.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f2() { diff --git a/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict1.ll b/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict1.ll index bec5f67f594dfe..fb5306fc337ff6 100644 --- a/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict1.ll +++ b/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict1.ll @@ -1,6 +1,6 @@ ; ModuleID = 'local_name_conflict_var.o' source_filename = "local_name_conflict_var.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @baz = internal global i32 10, align 4 diff --git a/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict2.ll b/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict2.ll index 51cd0bef0955f9..bf3c262f180bff 100644 --- a/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict2.ll +++ b/clang/test/CodeGen/Inputs/thinlto_backend_local_name_conflict2.ll @@ -1,6 +1,6 @@ ; ModuleID = 'local_name_conflict_var.o' source_filename = "local_name_conflict_var.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @baz = internal global i32 10, align 4 diff --git a/clang/test/CodeGen/iamcu-abi.c b/clang/test/CodeGen/iamcu-abi.c index 6bb73d20315c16..897d475d49723a 100644 --- a/clang/test/CodeGen/iamcu-abi.c +++ b/clang/test/CodeGen/iamcu-abi.c @@ -1,8 +1,9 @@ // RUN: %clang_cc1 -triple i386-pc-elfiamcu -emit-llvm -o - %s | FileCheck %s -// CHECK: target datalayout = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:32-f64:32-f128:32-n8:16:32-a:0:32-S32" +// CHECK: target datalayout = "e-m:e-p:32:32-i64:32-f64:32-f128:32-n8:16:32-a:0:32-S32" // CHECK: target triple = "i386-pc-elfiamcu" + void food(double *d); void fooll(long long *ll); void fooull(unsigned long long *ull); diff --git a/clang/test/CodeGen/target-data.c b/clang/test/CodeGen/target-data.c index 3e4d05436327d6..d9efe9f0a8879c 100644 --- a/clang/test/CodeGen/target-data.c +++ b/clang/test/CodeGen/target-data.c @@ -1,22 +1,22 @@ // RUN: %clang_cc1 -triple i686-unknown-unknown -emit-llvm -o - %s | \ // RUN: FileCheck --check-prefix=I686-UNKNOWN %s -// I686-UNKNOWN: target datalayout = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128" +// I686-UNKNOWN: target datalayout = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128" // RUN: %clang_cc1 -triple i686-apple-darwin9 -emit-llvm -o - %s | \ // RUN: FileCheck --check-prefix=I686-DARWIN %s -// I686-DARWIN: target datalayout = "e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:128-n8:16:32-S128" +// I686-DARWIN: target datalayout = "e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128" // RUN: %clang_cc1 -triple i686-unknown-win32 -emit-llvm -o - %s | \ // RUN: FileCheck --check-prefix=I686-WIN32 %s -// I686-WIN32: target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +// I686-WIN32: target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" // RUN: %clang_cc1 -triple i686-unknown-cygwin -emit-llvm -o - %s | \ // RUN: FileCheck --check-prefix=I686-CYGWIN %s -// I686-CYGWIN: target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +// I686-CYGWIN: target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" // RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | \ // RUN: FileCheck --check-prefix=X86_64 %s -// X86_64: target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +// X86_64: target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" // RUN: %clang_cc1 -triple xcore-unknown-unknown -emit-llvm -o - %s | \ // RUN: FileCheck --check-prefix=XCORE %s @@ -88,11 +88,11 @@ // RUN: %clang_cc1 -triple i686-nacl -o - -emit-llvm %s | \ // RUN: FileCheck %s -check-prefix=I686-NACL -// I686-NACL: target datalayout = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-n8:16:32-S128" +// I686-NACL: target datalayout = "e-m:e-p:32:32-i64:64-n8:16:32-S128" // RUN: %clang_cc1 -triple x86_64-nacl -o - -emit-llvm %s | \ // RUN: FileCheck %s -check-prefix=X86_64-NACL -// X86_64-NACL: target datalayout = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-n8:16:32:64-S128" +// X86_64-NACL: target datalayout = "e-m:e-p:32:32-i64:64-n8:16:32:64-S128" // RUN: %clang_cc1 -triple arm-nacl -o - -emit-llvm %s | \ // RUN: FileCheck %s -check-prefix=ARM-NACL diff --git a/clang/test/CodeGen/thinlto-diagnostic-handler-remarks-with-hotness.ll b/clang/test/CodeGen/thinlto-diagnostic-handler-remarks-with-hotness.ll index 0362786ecdbfca..2d25930e508ba9 100644 --- a/clang/test/CodeGen/thinlto-diagnostic-handler-remarks-with-hotness.ll +++ b/clang/test/CodeGen/thinlto-diagnostic-handler-remarks-with-hotness.ll @@ -32,7 +32,7 @@ ; CHECK: tinkywinky inlined into main with (cost=0, threshold=337) (hotness: 300) -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" declare i32 @patatino() diff --git a/clang/test/CodeGen/thinlto-distributed-backend-skip.ll b/clang/test/CodeGen/thinlto-distributed-backend-skip.ll index d7b8225ee2693d..d9fa47d23dfc8a 100644 --- a/clang/test/CodeGen/thinlto-distributed-backend-skip.ll +++ b/clang/test/CodeGen/thinlto-distributed-backend-skip.ll @@ -9,7 +9,7 @@ ; RUN: -fthinlto-index=%S/Inputs/thinlto-distributed-backend-skip.bc \ ; RUN: -emit-llvm -o - -x ir %t.o | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: "empty" diff --git a/clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll b/clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll index 2920cf19c81a94..d69b77bbc01067 100644 --- a/clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll +++ b/clang/test/CodeGen/thinlto-distributed-cfi-devirt.ll @@ -47,7 +47,7 @@ ; RUN: -emit-obj -fthinlto-index=%t.o.thinlto.bc -O2 \ ; RUN: -o %t.native.o -x ir %t.o -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.A = type { i32 (...)** } diff --git a/clang/test/CodeGen/thinlto-distributed-cfi.ll b/clang/test/CodeGen/thinlto-distributed-cfi.ll index 65808fdc015883..ccd5c241eb81f6 100644 --- a/clang/test/CodeGen/thinlto-distributed-cfi.ll +++ b/clang/test/CodeGen/thinlto-distributed-cfi.ll @@ -36,7 +36,7 @@ ; RUN: -emit-obj -fthinlto-index=%t.o.thinlto.bc \ ; RUN: -o %t.native.o -x ir %t.o -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.B = type { %struct.A } diff --git a/clang/test/CodeGen/thinlto-distributed.ll b/clang/test/CodeGen/thinlto-distributed.ll index a578aae7e05ff0..ae21d7b3e9a3e1 100644 --- a/clang/test/CodeGen/thinlto-distributed.ll +++ b/clang/test/CodeGen/thinlto-distributed.ll @@ -12,7 +12,7 @@ ; RUN: -emit-obj -fthinlto-index=%t.o.thinlto.bc \ ; RUN: -o %t.native.o -x ir %t.o -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() { diff --git a/clang/test/CodeGen/thinlto-multi-module.ll b/clang/test/CodeGen/thinlto-multi-module.ll index 186b34d2d7e1ba..385d98c74d944a 100644 --- a/clang/test/CodeGen/thinlto-multi-module.ll +++ b/clang/test/CodeGen/thinlto-multi-module.ll @@ -11,7 +11,7 @@ ; CHECK-OBJ: T f1 ; CHECK-OBJ: U f2 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @f2() diff --git a/clang/test/CodeGen/thinlto_backend.ll b/clang/test/CodeGen/thinlto_backend.ll index 3546b74b1341d0..2dd919d5f7de4f 100644 --- a/clang/test/CodeGen/thinlto_backend.ll +++ b/clang/test/CodeGen/thinlto_backend.ll @@ -47,7 +47,7 @@ ; RUN: %clang -target x86_64-unknown-linux-gnu -O2 -o %t3.o -x ir %t1.o -c -fthinlto-index=%t.thinlto.bc 2>&1 | FileCheck %s -check-prefix=CHECK-ERROR2 ; CHECK-ERROR2: Error loading imported file '{{.*}}': Could not find module summary -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @f2() diff --git a/clang/test/CodeGen/thinlto_backend_local_name_conflict.ll b/clang/test/CodeGen/thinlto_backend_local_name_conflict.ll index 2e3fe9b504f4a4..cefbc51bf05c74 100644 --- a/clang/test/CodeGen/thinlto_backend_local_name_conflict.ll +++ b/clang/test/CodeGen/thinlto_backend_local_name_conflict.ll @@ -21,7 +21,7 @@ ; ModuleID = 'local_name_conflict_var_main.o' source_filename = "local_name_conflict_var_main.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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: noinline nounwind uwtable diff --git a/clang/test/Driver/clang-offload-bundler.c b/clang/test/Driver/clang-offload-bundler.c index f551090dc431ef..44366920fe2529 100644 --- a/clang/test/Driver/clang-offload-bundler.c +++ b/clang/test/Driver/clang-offload-bundler.c @@ -156,14 +156,20 @@ // RUN: diff %t.i %t.res.i // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=i -targets=openmp-powerpc64le-ibm-linux-gnu -outputs=%t.res.tgt1 -inputs=%t.bundle3.i -unbundle +// RUN: diff %t.tgt1 %t.res.tgt1 // RUN: clang-offload-bundler -type=ii -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.ii,%t.res.tgt1,%t.res.tgt2 -inputs=%t.bundle3.ii -unbundle // RUN: diff %t.ii %t.res.ii // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=ii -targets=openmp-x86_64-pc-linux-gnu -outputs=%t.res.tgt2 -inputs=%t.bundle3.ii -unbundle +// RUN: diff %t.tgt2 %t.res.tgt2 // RUN: clang-offload-bundler -type=ll -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.ll,%t.res.tgt1,%t.res.tgt2 -inputs=%t.bundle3.ll -unbundle // RUN: diff %t.ll %t.res.ll // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=ll -targets=openmp-powerpc64le-ibm-linux-gnu -outputs=%t.res.tgt1 -inputs=%t.bundle3.ll -unbundle +// RUN: diff %t.tgt1 %t.res.tgt1 // RUN: clang-offload-bundler -type=s -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.s,%t.res.tgt1,%t.res.tgt2 -inputs=%t.bundle3.s -unbundle // RUN: diff %t.s %t.res.s // RUN: diff %t.tgt1 %t.res.tgt1 @@ -172,6 +178,8 @@ // RUN: diff %t.s %t.res.s // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=s -targets=openmp-x86_64-pc-linux-gnu -outputs=%t.res.tgt2 -inputs=%t.bundle3.s -unbundle +// RUN: diff %t.tgt2 %t.res.tgt2 // Check if we can unbundle a file with no magic strings. // RUN: clang-offload-bundler -type=s -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.s,%t.res.tgt1,%t.res.tgt2 -inputs=%t.s -unbundle @@ -183,6 +191,10 @@ // RUN: diff %t.empty %t.res.tgt1 // RUN: diff %t.empty %t.res.tgt2 +// Check that bindler prints an error if given host bundle does not exist in the fat binary. +// RUN: not clang-offload-bundler -type=s -targets=host-x86_64-xxx-linux-gnu,openmp-powerpc64le-ibm-linux-gnu -outputs=%t.res.s,%t.res.tgt1 -inputs=%t.bundle3.s -unbundle 2>&1 | FileCheck %s --check-prefix CK-NO-HOST-BUNDLE +// CK-NO-HOST-BUNDLE: error: Can't find bundle for the host target + // // Check binary bundle/unbundle. The content that we have before bundling must be the same we have after unbundling. // @@ -194,10 +206,14 @@ // RUN: diff %t.bc %t.res.bc // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=bc -targets=openmp-powerpc64le-ibm-linux-gnu -outputs=%t.res.tgt1 -inputs=%t.bundle3.bc -unbundle +// RUN: diff %t.tgt1 %t.res.tgt1 // RUN: clang-offload-bundler -type=gch -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.gch,%t.res.tgt1,%t.res.tgt2 -inputs=%t.bundle3.gch -unbundle // RUN: diff %t.ast %t.res.gch // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=gch -targets=openmp-x86_64-pc-linux-gnu -outputs=%t.res.tgt2 -inputs=%t.bundle3.gch -unbundle +// RUN: diff %t.tgt2 %t.res.tgt2 // RUN: clang-offload-bundler -type=ast -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.ast,%t.res.tgt1,%t.res.tgt2 -inputs=%t.bundle3.ast -unbundle // RUN: diff %t.ast %t.res.ast // RUN: diff %t.tgt1 %t.res.tgt1 @@ -210,6 +226,8 @@ // RUN: diff %t.ast %t.res.ast // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=ast -targets=openmp-powerpc64le-ibm-linux-gnu -outputs=%t.res.tgt1 -inputs=%t.bundle3.ast -unbundle +// RUN: diff %t.tgt1 %t.res.tgt1 // Check if we can unbundle a file with no magic strings. // RUN: clang-offload-bundler -type=bc -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.bc,%t.res.tgt1,%t.res.tgt2 -inputs=%t.bc -unbundle @@ -247,6 +265,8 @@ // RUN: diff %t.o %t.res.o // RUN: diff %t.tgt1 %t.res.tgt1 // RUN: diff %t.tgt2 %t.res.tgt2 +// RUN: clang-offload-bundler -type=o -targets=openmp-powerpc64le-ibm-linux-gnu -outputs=%t.res.tgt1 -inputs=%t.bundle3.o -unbundle +// RUN: diff %t.tgt1 %t.res.tgt1 // Check if we can unbundle a file with no magic strings. // RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.res.o,%t.res.tgt1,%t.res.tgt2 -inputs=%t.o -unbundle diff --git a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp index a1c7418e26ad98..fcc6a9898526dd 100644 --- a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp +++ b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp @@ -791,8 +791,9 @@ static bool UnbundleFiles() { return false; } - // If we found elements, we emit an error if none of those were for the host. - if (!FoundHostBundle) { + // If we found elements, we emit an error if none of those were for the host + // in case host bundle name was provided in command line. + if (!FoundHostBundle && HostInputIndex != ~0u) { errs() << "error: Can't find bundle for the host target\n"; return true; } @@ -895,7 +896,9 @@ int main(int argc, const char **argv) { ++Index; } - if (HostTargetNum != 1) { + // Host triple is not really needed for unbundling operation, so do not + // treat missing host triple as error if we do unbundling. + if ((Unbundle && HostTargetNum > 1) || (!Unbundle && HostTargetNum != 1)) { Error = true; errs() << "error: expecting exactly one host target but got " << HostTargetNum << ".\n"; diff --git a/lld/test/COFF/Inputs/bar.ll b/lld/test/COFF/Inputs/bar.ll index 4cb7fb0e85ffbc..4aed5d22a9e0e2 100644 --- a/lld/test/COFF/Inputs/bar.ll +++ b/lld/test/COFF/Inputs/bar.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @bar() { diff --git a/lld/test/COFF/Inputs/conflict.ll b/lld/test/COFF/Inputs/conflict.ll index 0b2772a095f12c..8cd7d706e5fb5f 100644 --- a/lld/test/COFF/Inputs/conflict.ll +++ b/lld/test/COFF/Inputs/conflict.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @foo() { diff --git a/lld/test/COFF/Inputs/constant-export.ll b/lld/test/COFF/Inputs/constant-export.ll index f0fa136dd5ed3e..666c18f1303d3c 100644 --- a/lld/test/COFF/Inputs/constant-export.ll +++ b/lld/test/COFF/Inputs/constant-export.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-unknown-windows-msvc18.0.0" @__CFConstantStringClassReference = common global [32 x i32] zeroinitializer, align 4 diff --git a/lld/test/COFF/Inputs/entry-mangled.ll b/lld/test/COFF/Inputs/entry-mangled.ll index a4702d7770d93b..b6fac214dfc160 100644 --- a/lld/test/COFF/Inputs/entry-mangled.ll +++ b/lld/test/COFF/Inputs/entry-mangled.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc18.0.0" define void @"\01?main@@YAHXZ"() { diff --git a/lld/test/COFF/Inputs/export.ll b/lld/test/COFF/Inputs/export.ll index 96f99d780980f1..d254683cdd6f94 100644 --- a/lld/test/COFF/Inputs/export.ll +++ b/lld/test/COFF/Inputs/export.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @_DllMainCRTStartup() { diff --git a/lld/test/COFF/Inputs/libcall-archive.ll b/lld/test/COFF/Inputs/libcall-archive.ll index 6ff9a6e7471f92..3f8a24df4c37c2 100644 --- a/lld/test/COFF/Inputs/libcall-archive.ll +++ b/lld/test/COFF/Inputs/libcall-archive.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-unknown-windows" define void @memcpy() { diff --git a/lld/test/COFF/Inputs/lto-cache.ll b/lld/test/COFF/Inputs/lto-cache.ll index f51bd56f6e3d3c..acbee7be0144c7 100644 --- a/lld/test/COFF/Inputs/lto-cache.ll +++ b/lld/test/COFF/Inputs/lto-cache.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/Inputs/lto-comdat1.ll b/lld/test/COFF/Inputs/lto-comdat1.ll index 6e214815046935..7a9f50c0f9db21 100644 --- a/lld/test/COFF/Inputs/lto-comdat1.ll +++ b/lld/test/COFF/Inputs/lto-comdat1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" $comdat = comdat any diff --git a/lld/test/COFF/Inputs/lto-comdat2.ll b/lld/test/COFF/Inputs/lto-comdat2.ll index a6a332d719fd2a..c2af2a4de597b1 100644 --- a/lld/test/COFF/Inputs/lto-comdat2.ll +++ b/lld/test/COFF/Inputs/lto-comdat2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" $comdat = comdat any diff --git a/lld/test/COFF/Inputs/lto-dep.ll b/lld/test/COFF/Inputs/lto-dep.ll index 71ae8c52733fbc..d6d47f2349172a 100644 --- a/lld/test/COFF/Inputs/lto-dep.ll +++ b/lld/test/COFF/Inputs/lto-dep.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @foo() { diff --git a/lld/test/COFF/Inputs/lto-lazy-reference-dummy.ll b/lld/test/COFF/Inputs/lto-lazy-reference-dummy.ll index 3c39f0f4c4f2fe..0309f89c38f41b 100644 --- a/lld/test/COFF/Inputs/lto-lazy-reference-dummy.ll +++ b/lld/test/COFF/Inputs/lto-lazy-reference-dummy.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc18.0.0" define void @dummy() { diff --git a/lld/test/COFF/Inputs/lto-lazy-reference-quadruple.ll b/lld/test/COFF/Inputs/lto-lazy-reference-quadruple.ll index cc2faf6bfdfad5..99c1d2bdbc5e40 100644 --- a/lld/test/COFF/Inputs/lto-lazy-reference-quadruple.ll +++ b/lld/test/COFF/Inputs/lto-lazy-reference-quadruple.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc18.0.0" define double @quadruple(double %x) { diff --git a/lld/test/COFF/Inputs/msvclto-order-a.ll b/lld/test/COFF/Inputs/msvclto-order-a.ll index 9f7633caa92066..804e201ff99acb 100644 --- a/lld/test/COFF/Inputs/msvclto-order-a.ll +++ b/lld/test/COFF/Inputs/msvclto-order-a.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @foo() { diff --git a/lld/test/COFF/Inputs/msvclto-order-b.ll b/lld/test/COFF/Inputs/msvclto-order-b.ll index b4a3ce0515a9f0..57f23898e6aa82 100644 --- a/lld/test/COFF/Inputs/msvclto-order-b.ll +++ b/lld/test/COFF/Inputs/msvclto-order-b.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" declare void @doesntexist() diff --git a/lld/test/COFF/Inputs/thinlto-empty.ll b/lld/test/COFF/Inputs/thinlto-empty.ll index 0b4067bfbf20be..b3c546a434eb44 100644 --- a/lld/test/COFF/Inputs/thinlto-empty.ll +++ b/lld/test/COFF/Inputs/thinlto-empty.ll @@ -1,2 +1,2 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" diff --git a/lld/test/COFF/Inputs/thinlto-mangled-qux.ll b/lld/test/COFF/Inputs/thinlto-mangled-qux.ll index a9e89249674b7d..4c9cc8e9e742b4 100644 --- a/lld/test/COFF/Inputs/thinlto-mangled-qux.ll +++ b/lld/test/COFF/Inputs/thinlto-mangled-qux.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" %class.baz = type { %class.bar } diff --git a/lld/test/COFF/Inputs/thinlto.ll b/lld/test/COFF/Inputs/thinlto.ll index e5e2a714f0410a..44ff9a0f1f1d8b 100644 --- a/lld/test/COFF/Inputs/thinlto.ll +++ b/lld/test/COFF/Inputs/thinlto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" define void @g() { diff --git a/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll b/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll index 62632ec65b41b1..6793ec718e806d 100644 --- a/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll +++ b/lld/test/COFF/Inputs/undefined-symbol-lto-a.ll @@ -1,6 +1,6 @@ ; ModuleID = 't.obj' source_filename = "t.cpp" -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.21.27702" %struct.Init = type { %struct.S } diff --git a/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll b/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll index a030094f2b2956..ff73e7c6ba6802 100644 --- a/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll +++ b/lld/test/COFF/Inputs/undefined-symbol-lto-b.ll @@ -1,6 +1,6 @@ ; ModuleID = 'b.obj' source_filename = "b.cpp" -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.21.27702" %struct.S = type { i32 (...)** } diff --git a/lld/test/COFF/Inputs/weak-external.ll b/lld/test/COFF/Inputs/weak-external.ll index 72f5901893d4d8..4775d50456c990 100644 --- a/lld/test/COFF/Inputs/weak-external.ll +++ b/lld/test/COFF/Inputs/weak-external.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @g() { diff --git a/lld/test/COFF/Inputs/weak-external2.ll b/lld/test/COFF/Inputs/weak-external2.ll index 378fda4138a7c0..2102c3b6a526bb 100644 --- a/lld/test/COFF/Inputs/weak-external2.ll +++ b/lld/test/COFF/Inputs/weak-external2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @f() { diff --git a/lld/test/COFF/Inputs/weak-external3.ll b/lld/test/COFF/Inputs/weak-external3.ll index d229e496635630..f9a51360a89d24 100644 --- a/lld/test/COFF/Inputs/weak-external3.ll +++ b/lld/test/COFF/Inputs/weak-external3.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" @f = weak alias void(), void()* @g diff --git a/lld/test/COFF/entrylib.ll b/lld/test/COFF/entrylib.ll index e9707a47f170a1..602b4ff63336da 100644 --- a/lld/test/COFF/entrylib.ll +++ b/lld/test/COFF/entrylib.ll @@ -4,7 +4,7 @@ ; RUN: llvm-ar cru %t.lib %t.obj ; RUN: lld-link /out:%t.exe /entry:main %t.lib -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/guardcf-lto.ll b/lld/test/COFF/guardcf-lto.ll index a7f4568968cb67..6658b60815da26 100644 --- a/lld/test/COFF/guardcf-lto.ll +++ b/lld/test/COFF/guardcf-lto.ll @@ -23,7 +23,7 @@ ; CHECK-NEXT: 0x180{{.*}} ; CHECK-NEXT: ] -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.12.25835" declare dllimport void @do_indirect_call(void ()*) diff --git a/lld/test/COFF/include-lto.ll b/lld/test/COFF/include-lto.ll index c0cb8d1011794f..d5ae546ab71902 100644 --- a/lld/test/COFF/include-lto.ll +++ b/lld/test/COFF/include-lto.ll @@ -7,7 +7,7 @@ ; CHECK: xorl %eax, %eax ; CHECK-NEXT: retq -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @_DllMainCRTStartup() { diff --git a/lld/test/COFF/lib-module-asm.ll b/lld/test/COFF/lib-module-asm.ll index 42c6797838c172..0431af9b0f9d64 100644 --- a/lld/test/COFF/lib-module-asm.ll +++ b/lld/test/COFF/lib-module-asm.ll @@ -5,7 +5,7 @@ ; RUN: lld-link /lib /out:%t.lib %t.obj ; RUN: llvm-nm -M %t.lib | FileCheck %s -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i386-pc-windows-msvc19.11.0" module asm ".global global_asm_sym" diff --git a/lld/test/COFF/libcall-archive.ll b/lld/test/COFF/libcall-archive.ll index c78c1d41fde8fc..631503d0dd9a54 100644 --- a/lld/test/COFF/libcall-archive.ll +++ b/lld/test/COFF/libcall-archive.ll @@ -10,7 +10,7 @@ ; CHECK: _start ; CHECK: _memcpy -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-unknown-windows" define void @start(i8* %a, i8* %b) { diff --git a/lld/test/COFF/loadcfg.ll b/lld/test/COFF/loadcfg.ll index 46f613472c2035..96b4b8e5966265 100644 --- a/lld/test/COFF/loadcfg.ll +++ b/lld/test/COFF/loadcfg.ll @@ -6,7 +6,7 @@ ; CHECK: LoadConfigTableRVA: 0x2000 ; CHECK: LoadConfigTableSize: 0x70 -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" @_load_config_used = constant [28 x i32] [i32 112, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0] diff --git a/lld/test/COFF/lto-cache.ll b/lld/test/COFF/lto-cache.ll index ced0c5251d1324..828f5e5a97c1c1 100644 --- a/lld/test/COFF/lto-cache.ll +++ b/lld/test/COFF/lto-cache.ll @@ -14,7 +14,7 @@ ; Two cached objects, plus a timestamp file and "foo", minus the file we removed. ; RUN: ls %t.cache | count 4 -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @globalfunc() #0 { diff --git a/lld/test/COFF/lto-chkstk.ll b/lld/test/COFF/lto-chkstk.ll index c2a15180b764e2..1df93c6b95451e 100644 --- a/lld/test/COFF/lto-chkstk.ll +++ b/lld/test/COFF/lto-chkstk.ll @@ -6,7 +6,7 @@ ; RUN: llvm-ar cru %t.lib %T/lto-chkstk-chkstk.obj ; RUN: lld-link /out:%t.exe /entry:main /subsystem:console %t.obj %T/lto-chkstk-foo.obj %t.lib -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @main() { diff --git a/lld/test/COFF/lto-comdat.ll b/lld/test/COFF/lto-comdat.ll index cf5a137ff5083f..fbb7104bf11d9b 100644 --- a/lld/test/COFF/lto-comdat.ll +++ b/lld/test/COFF/lto-comdat.ll @@ -91,7 +91,7 @@ ; TEXT-10: retq ; TEXT-10-NOT: {{.}} -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" $comdat = comdat any diff --git a/lld/test/COFF/lto-cpu-string.ll b/lld/test/COFF/lto-cpu-string.ll index be52bfb53c526a..840adcebf46d43 100644 --- a/lld/test/COFF/lto-cpu-string.ll +++ b/lld/test/COFF/lto-cpu-string.ll @@ -9,7 +9,7 @@ ; RUN: llvm-objdump -d -section=".text" -no-leading-addr -no-show-raw-insn %t.znver1.dll | FileCheck -check-prefix=ZNVER1 %s ; ZNVER1: nopw -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.14.26433" define dllexport void @foo() #0 { diff --git a/lld/test/COFF/lto-debug-pass-arguments.ll b/lld/test/COFF/lto-debug-pass-arguments.ll index 6ecc8645d29a00..4381590ff13066 100644 --- a/lld/test/COFF/lto-debug-pass-arguments.ll +++ b/lld/test/COFF/lto-debug-pass-arguments.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as %s -o %t.obj ; RUN: lld-link /dll /out:%t.dll %t.obj /mllvm:-debug-pass=Arguments 2>&1 | FileCheck %s -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define void @dummy() { diff --git a/lld/test/COFF/lto-icf.ll b/lld/test/COFF/lto-icf.ll index 0b0c26eb2ad89c..ef98d7b06044cf 100644 --- a/lld/test/COFF/lto-icf.ll +++ b/lld/test/COFF/lto-icf.ll @@ -13,7 +13,7 @@ ; CHECK: RVA: 0x[[RVA]] ; CHECK-NOT: Export -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.12.25835" define dllexport i8* @icf_ptr() { diff --git a/lld/test/COFF/lto-lazy-reference.ll b/lld/test/COFF/lto-lazy-reference.ll index a6f4010eddd5db..428a7b845d145a 100644 --- a/lld/test/COFF/lto-lazy-reference.ll +++ b/lld/test/COFF/lto-lazy-reference.ll @@ -6,7 +6,7 @@ ; RUN: llvm-as -o %t.obj %s ; RUN: lld-link /out:%t.exe /entry:main /subsystem:console %t.obj %t.lib -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc18.0.0" ; Define fltused, since we don't link against the MS C runtime but are diff --git a/lld/test/COFF/lto-linker-opts.ll b/lld/test/COFF/lto-linker-opts.ll index bbe67ae41da7d4..1fc4f5eb048440 100644 --- a/lld/test/COFF/lto-linker-opts.ll +++ b/lld/test/COFF/lto-linker-opts.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as -o %T/lto-linker-opts.obj %s ; RUN: env LIB=%S/Inputs lld-link /out:%T/lto-linker-opts.exe /entry:main /subsystem:console %T/lto-linker-opts.obj -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" !llvm.linker.options = !{!0} diff --git a/lld/test/COFF/lto-new-symbol.ll b/lld/test/COFF/lto-new-symbol.ll index 7f5a328466e234..dadd49537cf908 100644 --- a/lld/test/COFF/lto-new-symbol.ll +++ b/lld/test/COFF/lto-new-symbol.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as -o %t.obj %s ; RUN: lld-link /out:%t.exe /entry:foo /subsystem:console %t.obj -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" ; Define fltused, since we don't link against the MS C runtime but are diff --git a/lld/test/COFF/lto-obj-path.ll b/lld/test/COFF/lto-obj-path.ll index 987e2bd7789615..db61ba97046a5e 100644 --- a/lld/test/COFF/lto-obj-path.ll +++ b/lld/test/COFF/lto-obj-path.ll @@ -14,7 +14,7 @@ ; CHECK: Format: COFF-x86-64 ; SYMBOLS: @feat.00 -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" declare void @g(...) diff --git a/lld/test/COFF/lto-opt-level.ll b/lld/test/COFF/lto-opt-level.ll index 0e0e8667889450..92f88ea9e98d0d 100644 --- a/lld/test/COFF/lto-opt-level.ll +++ b/lld/test/COFF/lto-opt-level.ll @@ -7,7 +7,7 @@ ; RUN: lld-link /out:%t2a.exe /entry:main /subsystem:console /lldmap:%t2a.map %t.obj ; RUN: FileCheck --check-prefix=CHECK-O2 %s < %t2a.map -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" ; CHECK-O0: foo diff --git a/lld/test/COFF/lto-parallel.ll b/lld/test/COFF/lto-parallel.ll index 8e1f44a8ebb01a..7a38a39d77d9fa 100644 --- a/lld/test/COFF/lto-parallel.ll +++ b/lld/test/COFF/lto-parallel.ll @@ -3,7 +3,7 @@ ; RUN: lld-link -opt:noicf /out:%t.exe /entry:foo /include:bar /opt:lldltopartitions=2 /subsystem:console /lldmap:%t.map %t.obj ; RUN: FileCheck %s < %t.map -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" ; CHECK: lto.tmp diff --git a/lld/test/COFF/lto-reloc-model.ll b/lld/test/COFF/lto-reloc-model.ll index 2b7e3a85191b0e..9ac32ae3677f62 100644 --- a/lld/test/COFF/lto-reloc-model.ll +++ b/lld/test/COFF/lto-reloc-model.ll @@ -3,7 +3,7 @@ ; RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t ; RUN: llvm-objdump -d %t.exe | FileCheck %s -target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32" +target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc" @foo = thread_local global i8 0 diff --git a/lld/test/COFF/lto.ll b/lld/test/COFF/lto.ll index 7c61f1cf5bfc6a..54624906c32532 100644 --- a/lld/test/COFF/lto.ll +++ b/lld/test/COFF/lto.ll @@ -123,7 +123,7 @@ ; TEXT-10-NEXT: addq $40, %rsp ; TEXT-10-NEXT: retq -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/savetemps.ll b/lld/test/COFF/savetemps.ll index e755ba9920d389..7f2e11c1771534 100644 --- a/lld/test/COFF/savetemps.ll +++ b/lld/test/COFF/savetemps.ll @@ -21,7 +21,7 @@ ; CHECK: define i32 @main() ; CHECK-OBJDUMP: file format COFF -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/thinlto-archivecollision.ll b/lld/test/COFF/thinlto-archivecollision.ll index b865402fdc0982..8b8865d03d3fac 100644 --- a/lld/test/COFF/thinlto-archivecollision.ll +++ b/lld/test/COFF/thinlto-archivecollision.ll @@ -16,7 +16,7 @@ ; CHECK-NEXT: {{/|\\\\thinlto-archivecollision.ll.tmp/libbar.libbar.obj[0-9]+$}} ; CHECK-NEXT: {{^-r=.*/|\\\\thinlto-archivecollision.ll.tmp/libbar.libbar.obj[0-9]+,bar,p$}} -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" declare void @bar() diff --git a/lld/test/COFF/thinlto-archives.ll b/lld/test/COFF/thinlto-archives.ll index 9194db8f65289d..a3de6c9e557e06 100644 --- a/lld/test/COFF/thinlto-archives.ll +++ b/lld/test/COFF/thinlto-archives.ll @@ -18,7 +18,7 @@ ; CHECK-NEXT: {{/thinlto-archives/b.libbar.obj[0-9]+$}} ; CHECK-NEXT: {{^-r=.*/thinlto-archives/b.libbar.obj[0-9]+,bar,p$}} -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" declare void @bar() diff --git a/lld/test/COFF/thinlto-emit-imports.ll b/lld/test/COFF/thinlto-emit-imports.ll index 9ffe3b267701f0..b2ecd46c9e129c 100644 --- a/lld/test/COFF/thinlto-emit-imports.ll +++ b/lld/test/COFF/thinlto-emit-imports.ll @@ -47,7 +47,7 @@ ; RUN: not ls %t2.obj.imports ; RUN: not ls %t3.obj.imports -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" declare void @g(...) diff --git a/lld/test/COFF/thinlto-index-only.ll b/lld/test/COFF/thinlto-index-only.ll index db41309d83d807..f1f2412b87b281 100644 --- a/lld/test/COFF/thinlto-index-only.ll +++ b/lld/test/COFF/thinlto-index-only.ll @@ -41,7 +41,7 @@ ; BACKEND2-NEXT: &1 | FileCheck --check-prefix=ERR %s ; ERR: -thinlto-prefix-replace: expects 'old;new' format, but got abc:def -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" define void @main() { diff --git a/lld/test/COFF/thinlto.ll b/lld/test/COFF/thinlto.ll index f24f362cdf1c17..77ba9b91de70c8 100644 --- a/lld/test/COFF/thinlto.ll +++ b/lld/test/COFF/thinlto.ll @@ -8,7 +8,7 @@ ; CHECK-NOT: U foo -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/unresolved-lto-bitcode.ll b/lld/test/COFF/unresolved-lto-bitcode.ll index 5ace81b1938081..6147dd1005e708 100644 --- a/lld/test/COFF/unresolved-lto-bitcode.ll +++ b/lld/test/COFF/unresolved-lto-bitcode.ll @@ -17,7 +17,7 @@ ; FILE: foo.obj ; FILE: main.obj -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/unresolved-lto.ll b/lld/test/COFF/unresolved-lto.ll index a1e52294273fec..e3071cc88a8a46 100644 --- a/lld/test/COFF/unresolved-lto.ll +++ b/lld/test/COFF/unresolved-lto.ll @@ -16,7 +16,7 @@ ; FILE: foo.obj ; FILE: main.obj -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" define i32 @main() { diff --git a/lld/test/COFF/used-lto.ll b/lld/test/COFF/used-lto.ll index d1c87c16a5daab..c269fbac85d720 100644 --- a/lld/test/COFF/used-lto.ll +++ b/lld/test/COFF/used-lto.ll @@ -5,7 +5,7 @@ ; CHECK: S_PUB32 {{.*}} `foo` -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" @llvm.used = appending global [1 x i8*] [i8* bitcast (void ()* @foo to i8*)], section "llvm.metadata" diff --git a/lld/test/ELF/lto/Inputs/archive-2.ll b/lld/test/ELF/lto/Inputs/archive-2.ll index 648dccbb069711..8236cfe5cd8408 100644 --- a/lld/test/ELF/lto/Inputs/archive-2.ll +++ b/lld/test/ELF/lto/Inputs/archive-2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_start() { diff --git a/lld/test/ELF/lto/Inputs/archive-3.ll b/lld/test/ELF/lto/Inputs/archive-3.ll index af86e09d9bde79..37442469aa7ee7 100644 --- a/lld/test/ELF/lto/Inputs/archive-3.ll +++ b/lld/test/ELF/lto/Inputs/archive-3.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/lld/test/ELF/lto/Inputs/archive.ll b/lld/test/ELF/lto/Inputs/archive.ll index 478f6ee182b48d..71c1e4f3560092 100644 --- a/lld/test/ELF/lto/Inputs/archive.ll +++ b/lld/test/ELF/lto/Inputs/archive.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f() { diff --git a/lld/test/ELF/lto/Inputs/asmundef.ll b/lld/test/ELF/lto/Inputs/asmundef.ll index 4197fafc4ad4b6..0992f79c9af8cf 100644 --- a/lld/test/ELF/lto/Inputs/asmundef.ll +++ b/lld/test/ELF/lto/Inputs/asmundef.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @patatino() diff --git a/lld/test/ELF/lto/Inputs/available-externally.ll b/lld/test/ELF/lto/Inputs/available-externally.ll index ec4590019869e9..b8583eab829d1e 100644 --- a/lld/test/ELF/lto/Inputs/available-externally.ll +++ b/lld/test/ELF/lto/Inputs/available-externally.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @zed() { diff --git a/lld/test/ELF/lto/Inputs/cache.ll b/lld/test/ELF/lto/Inputs/cache.ll index 1b827cd69883f7..09289029917712 100644 --- a/lld/test/ELF/lto/Inputs/cache.ll +++ b/lld/test/ELF/lto/Inputs/cache.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_start() { diff --git a/lld/test/ELF/lto/Inputs/common3.ll b/lld/test/ELF/lto/Inputs/common3.ll index bbd6c347ff374c..8f20a1e8ac2dab 100644 --- a/lld/test/ELF/lto/Inputs/common3.ll +++ b/lld/test/ELF/lto/Inputs/common3.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = common hidden global i64 0, align 4 diff --git a/lld/test/ELF/lto/Inputs/data-ordering-lto.ll b/lld/test/ELF/lto/Inputs/data-ordering-lto.ll index 8e872762e64ec8..a95fa6d5a58acb 100644 --- a/lld/test/ELF/lto/Inputs/data-ordering-lto.ll +++ b/lld/test/ELF/lto/Inputs/data-ordering-lto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" @pat = global i32 33, align 4 diff --git a/lld/test/ELF/lto/Inputs/defsym-bar.ll b/lld/test/ELF/lto/Inputs/defsym-bar.ll index 840fecd1bed966..748c7b23f6a8b6 100644 --- a/lld/test/ELF/lto/Inputs/defsym-bar.ll +++ b/lld/test/ELF/lto/Inputs/defsym-bar.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @this_is_bar1() diff --git a/lld/test/ELF/lto/Inputs/drop-linkage.ll b/lld/test/ELF/lto/Inputs/drop-linkage.ll index d86055794d9830..0e3dc7a4142151 100644 --- a/lld/test/ELF/lto/Inputs/drop-linkage.ll +++ b/lld/test/ELF/lto/Inputs/drop-linkage.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" $foo = comdat any define linkonce void @foo() comdat { diff --git a/lld/test/ELF/lto/Inputs/duplicated-name.ll b/lld/test/ELF/lto/Inputs/duplicated-name.ll index 86c410efb5d113..78678c0c5add2a 100644 --- a/lld/test/ELF/lto/Inputs/duplicated-name.ll +++ b/lld/test/ELF/lto/Inputs/duplicated-name.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f2() { diff --git a/lld/test/ELF/lto/Inputs/i386-empty.ll b/lld/test/ELF/lto/Inputs/i386-empty.ll index 6ff84a75c101ac..6029cb6d090051 100644 --- a/lld/test/ELF/lto/Inputs/i386-empty.ll +++ b/lld/test/ELF/lto/Inputs/i386-empty.ll @@ -1,2 +1,2 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "i686-linux-gnu" diff --git a/lld/test/ELF/lto/Inputs/internalize-exportdyn.ll b/lld/test/ELF/lto/Inputs/internalize-exportdyn.ll index 585b99ae5a513a..21ac3580762c15 100644 --- a/lld/test/ELF/lto/Inputs/internalize-exportdyn.ll +++ b/lld/test/ELF/lto/Inputs/internalize-exportdyn.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define weak_odr void @bah() { ret void diff --git a/lld/test/ELF/lto/Inputs/internalize-undef.ll b/lld/test/ELF/lto/Inputs/internalize-undef.ll index 478f6ee182b48d..71c1e4f3560092 100644 --- a/lld/test/ELF/lto/Inputs/internalize-undef.ll +++ b/lld/test/ELF/lto/Inputs/internalize-undef.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f() { diff --git a/lld/test/ELF/lto/Inputs/irmover-error.ll b/lld/test/ELF/lto/Inputs/irmover-error.ll index de2e9f03ccca56..86ed259b2a0092 100644 --- a/lld/test/ELF/lto/Inputs/irmover-error.ll +++ b/lld/test/ELF/lto/Inputs/irmover-error.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" !0 = !{ i32 1, !"foo", i32 2 } diff --git a/lld/test/ELF/lto/Inputs/irmover-warning.ll b/lld/test/ELF/lto/Inputs/irmover-warning.ll index 2948654b944b5a..72d437fb62c9bd 100644 --- a/lld/test/ELF/lto/Inputs/irmover-warning.ll +++ b/lld/test/ELF/lto/Inputs/irmover-warning.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @f() { ret void diff --git a/lld/test/ELF/lto/Inputs/lazy-internal.ll b/lld/test/ELF/lto/Inputs/lazy-internal.ll index 3b79ff6fbbb14d..918791c5d20f20 100644 --- a/lld/test/ELF/lto/Inputs/lazy-internal.ll +++ b/lld/test/ELF/lto/Inputs/lazy-internal.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 hidden void @bar() { diff --git a/lld/test/ELF/lto/Inputs/libcall-archive.ll b/lld/test/ELF/lto/Inputs/libcall-archive.ll index 11eaefc6ac5253..4e6421c3020f6f 100644 --- a/lld/test/ELF/lto/Inputs/libcall-archive.ll +++ b/lld/test/ELF/lto/Inputs/libcall-archive.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @memcpy() { diff --git a/lld/test/ELF/lto/Inputs/linker-script-symbols-ipo.ll b/lld/test/ELF/lto/Inputs/linker-script-symbols-ipo.ll index 3031557c3e5ab3..c872f9e1dd52aa 100644 --- a/lld/test/ELF/lto/Inputs/linker-script-symbols-ipo.ll +++ b/lld/test/ELF/lto/Inputs/linker-script-symbols-ipo.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() diff --git a/lld/test/ELF/lto/Inputs/linkonce-odr.ll b/lld/test/ELF/lto/Inputs/linkonce-odr.ll index b465a4bc6558b2..0b3828846eb54d 100644 --- a/lld/test/ELF/lto/Inputs/linkonce-odr.ll +++ b/lld/test/ELF/lto/Inputs/linkonce-odr.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 linkonce_odr void @f() { diff --git a/lld/test/ELF/lto/Inputs/linkonce.ll b/lld/test/ELF/lto/Inputs/linkonce.ll index cb6f99a76d07d8..a6738b3ad71ecc 100644 --- a/lld/test/ELF/lto/Inputs/linkonce.ll +++ b/lld/test/ELF/lto/Inputs/linkonce.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 linkonce void @f() { diff --git a/lld/test/ELF/lto/Inputs/obj-path.ll b/lld/test/ELF/lto/Inputs/obj-path.ll index 7cf01bc86c3748..31c72ec4653a64 100644 --- a/lld/test/ELF/lto/Inputs/obj-path.ll +++ b/lld/test/ELF/lto/Inputs/obj-path.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @g() { diff --git a/lld/test/ELF/lto/Inputs/relocation-model-pic.ll b/lld/test/ELF/lto/Inputs/relocation-model-pic.ll index d5c69a5e3dbb8c..e76605435e8753 100644 --- a/lld/test/ELF/lto/Inputs/relocation-model-pic.ll +++ b/lld/test/ELF/lto/Inputs/relocation-model-pic.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = external global i32 diff --git a/lld/test/ELF/lto/Inputs/save-temps.ll b/lld/test/ELF/lto/Inputs/save-temps.ll index 67cdbaf2215b65..d6e6eb661f33c0 100644 --- a/lld/test/ELF/lto/Inputs/save-temps.ll +++ b/lld/test/ELF/lto/Inputs/save-temps.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @bar() { ret void diff --git a/lld/test/ELF/lto/Inputs/start-lib1.ll b/lld/test/ELF/lto/Inputs/start-lib1.ll index 8e09f4adc8ad72..9f42e6afff0f33 100644 --- a/lld/test/ELF/lto/Inputs/start-lib1.ll +++ b/lld/test/ELF/lto/Inputs/start-lib1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @bar() diff --git a/lld/test/ELF/lto/Inputs/start-lib2.ll b/lld/test/ELF/lto/Inputs/start-lib2.ll index 7986919be341c7..68b3c8362808e7 100644 --- a/lld/test/ELF/lto/Inputs/start-lib2.ll +++ b/lld/test/ELF/lto/Inputs/start-lib2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() { diff --git a/lld/test/ELF/lto/Inputs/symbol-ordering-lto.ll b/lld/test/ELF/lto/Inputs/symbol-ordering-lto.ll index 9bb2c7d58b2076..164659ce27ba8a 100644 --- a/lld/test/ELF/lto/Inputs/symbol-ordering-lto.ll +++ b/lld/test/ELF/lto/Inputs/symbol-ordering-lto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" define i32 @tin() { diff --git a/lld/test/ELF/lto/Inputs/thin1.ll b/lld/test/ELF/lto/Inputs/thin1.ll index 011eee616e33e7..93029837714b7f 100644 --- a/lld/test/ELF/lto/Inputs/thin1.ll +++ b/lld/test/ELF/lto/Inputs/thin1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" define i32 @foo(i32 %goo) { diff --git a/lld/test/ELF/lto/Inputs/thin2.ll b/lld/test/ELF/lto/Inputs/thin2.ll index 7c3e61ee4ac2a7..6cffbdcc53f262 100644 --- a/lld/test/ELF/lto/Inputs/thin2.ll +++ b/lld/test/ELF/lto/Inputs/thin2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" define i32 @blah(i32 %meh) #0 { diff --git a/lld/test/ELF/lto/Inputs/thinlto.ll b/lld/test/ELF/lto/Inputs/thinlto.ll index 7cf01bc86c3748..31c72ec4653a64 100644 --- a/lld/test/ELF/lto/Inputs/thinlto.ll +++ b/lld/test/ELF/lto/Inputs/thinlto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @g() { diff --git a/lld/test/ELF/lto/Inputs/thinlto_empty.ll b/lld/test/ELF/lto/Inputs/thinlto_empty.ll index a4e3140422e6ee..a3c99cdfe7721e 100644 --- a/lld/test/ELF/lto/Inputs/thinlto_empty.ll +++ b/lld/test/ELF/lto/Inputs/thinlto_empty.ll @@ -1,2 +1,2 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/lld/test/ELF/lto/Inputs/type-merge.ll b/lld/test/ELF/lto/Inputs/type-merge.ll index aceacd4b3265f4..c31642105f3aae 100644 --- a/lld/test/ELF/lto/Inputs/type-merge.ll +++ b/lld/test/ELF/lto/Inputs/type-merge.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @zed() { diff --git a/lld/test/ELF/lto/Inputs/type-merge2.ll b/lld/test/ELF/lto/Inputs/type-merge2.ll index de92d2cfea1d3e..79fd1f886306e6 100644 --- a/lld/test/ELF/lto/Inputs/type-merge2.ll +++ b/lld/test/ELF/lto/Inputs/type-merge2.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" %zed = type { i16 } define void @bar(%zed* %this) { diff --git a/lld/test/ELF/lto/Inputs/unnamed-addr-drop.ll b/lld/test/ELF/lto/Inputs/unnamed-addr-drop.ll index fa16353a1e0603..b91bc8e5a891cf 100644 --- a/lld/test/ELF/lto/Inputs/unnamed-addr-drop.ll +++ b/lld/test/ELF/lto/Inputs/unnamed-addr-drop.ll @@ -1,4 +1,4 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @foo = unnamed_addr constant i32 42 diff --git a/lld/test/ELF/lto/Inputs/weakodr-visibility.ll b/lld/test/ELF/lto/Inputs/weakodr-visibility.ll index 00c68fe5813b64..1bd956059d24fe 100644 --- a/lld/test/ELF/lto/Inputs/weakodr-visibility.ll +++ b/lld/test/ELF/lto/Inputs/weakodr-visibility.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 weak_odr protected i32 @foo(i8* %this) { diff --git a/lld/test/ELF/lto/Inputs/wrap-bar.ll b/lld/test/ELF/lto/Inputs/wrap-bar.ll index 7a4f2e02d2e7b4..407ebfbf6ec352 100644 --- a/lld/test/ELF/lto/Inputs/wrap-bar.ll +++ b/lld/test/ELF/lto/Inputs/wrap-bar.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 hidden void @bar() { diff --git a/lld/test/ELF/lto/abs-resol.ll b/lld/test/ELF/lto/abs-resol.ll index 01de6adce13a7f..4b0fb47a9e21ec 100644 --- a/lld/test/ELF/lto/abs-resol.ll +++ b/lld/test/ELF/lto/abs-resol.ll @@ -7,7 +7,7 @@ ; RUN: echo "blah = 0xdeadfeef;" > %t.script ; RUN: ld.lld %t.o -T%t.script -o %t4.out -pie -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @blah = external global i8, align 1 diff --git a/lld/test/ELF/lto/archive-2.ll b/lld/test/ELF/lto/archive-2.ll index 72350590a9a236..40d1aba36f1b0c 100644 --- a/lld/test/ELF/lto/archive-2.ll +++ b/lld/test/ELF/lto/archive-2.ll @@ -16,7 +16,7 @@ ; CHECK-NEXT: Other: 0 ; CHECK-NEXT: Section: .text -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @g() { diff --git a/lld/test/ELF/lto/archive-3.ll b/lld/test/ELF/lto/archive-3.ll index a5270b8fc55e4f..fec1b6155238cc 100644 --- a/lld/test/ELF/lto/archive-3.ll +++ b/lld/test/ELF/lto/archive-3.ll @@ -12,7 +12,7 @@ ; CHECK: define internal void @foo() { -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_start() { ret void diff --git a/lld/test/ELF/lto/archive-no-index.ll b/lld/test/ELF/lto/archive-no-index.ll index 79052db38cceed..f7a2cf81c4f1cb 100644 --- a/lld/test/ELF/lto/archive-no-index.ll +++ b/lld/test/ELF/lto/archive-no-index.ll @@ -12,7 +12,7 @@ ; RUN: ld.lld -o %t -emain %t1.o %t1.a ; RUN: ld.lld -o %t -emain %t1.o %t2.a -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @f() diff --git a/lld/test/ELF/lto/archive.ll b/lld/test/ELF/lto/archive.ll index e6a42849a6113c..655c48ece03881 100644 --- a/lld/test/ELF/lto/archive.ll +++ b/lld/test/ELF/lto/archive.ll @@ -24,7 +24,7 @@ ; CHECK-NEXT: Other: 0 ; CHECK-NEXT: Section: .text -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @g() { diff --git a/lld/test/ELF/lto/asmundef.ll b/lld/test/ELF/lto/asmundef.ll index 697fddfbf99e76..604af8f9380b5d 100644 --- a/lld/test/ELF/lto/asmundef.ll +++ b/lld/test/ELF/lto/asmundef.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t.o %t2.o -o %t -save-temps ; RUN: llvm-dis %t.0.4.opt.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ".weak patatino" diff --git a/lld/test/ELF/lto/available-externally.ll b/lld/test/ELF/lto/available-externally.ll index b06971d0f5676d..516bec8c8a4e73 100644 --- a/lld/test/ELF/lto/available-externally.ll +++ b/lld/test/ELF/lto/available-externally.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared -save-temps ; RUN: llvm-dis < %t.so.0.2.internalize.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/lld/test/ELF/lto/cache.ll b/lld/test/ELF/lto/cache.ll index c17dee028479cb..fe123989f22d8f 100644 --- a/lld/test/ELF/lto/cache.ll +++ b/lld/test/ELF/lto/cache.ll @@ -51,7 +51,7 @@ ; CHECK: llvmcache-newer ; CHECK-NOT: llvmcache-old -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() #0 { diff --git a/lld/test/ELF/lto/codemodel.ll b/lld/test/ELF/lto/codemodel.ll index 15d32caafd52f2..995575a9a0ab8f 100644 --- a/lld/test/ELF/lto/codemodel.ll +++ b/lld/test/ELF/lto/codemodel.ll @@ -6,7 +6,7 @@ ; RUN: llvm-objdump -d %tl | FileCheck %s --check-prefix=CHECK-LARGE target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @data = internal constant [0 x i32] [] diff --git a/lld/test/ELF/lto/combined-lto-object-name.ll b/lld/test/ELF/lto/combined-lto-object-name.ll index 6f2d30d5bd37ef..e0b98740e0f0a6 100644 --- a/lld/test/ELF/lto/combined-lto-object-name.ll +++ b/lld/test/ELF/lto/combined-lto-object-name.ll @@ -3,7 +3,7 @@ ; RUN: not ld.lld %t.o -o %t2 2>&1 | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare void @foo() define void @_start() { diff --git a/lld/test/ELF/lto/comdat.ll b/lld/test/ELF/lto/comdat.ll index 9895e083ae61ac..d61058f2e6715d 100644 --- a/lld/test/ELF/lto/comdat.ll +++ b/lld/test/ELF/lto/comdat.ll @@ -12,7 +12,7 @@ ; CHECK-NEXT: Section: .text target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" $foo = comdat any define void @foo() comdat { diff --git a/lld/test/ELF/lto/comdat2.ll b/lld/test/ELF/lto/comdat2.ll index d87b8f005dd19d..3a23198de2cfae 100644 --- a/lld/test/ELF/lto/comdat2.ll +++ b/lld/test/ELF/lto/comdat2.ll @@ -7,7 +7,7 @@ ; RUN: llvm-readobj --symbols %t2.so | FileCheck %s --check-prefix=OTHER -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $c = comdat any diff --git a/lld/test/ELF/lto/common.ll b/lld/test/ELF/lto/common.ll index e76ca7f9e37500..82f00bc42218b3 100644 --- a/lld/test/ELF/lto/common.ll +++ b/lld/test/ELF/lto/common.ll @@ -25,7 +25,7 @@ ; CHECK-NEXT: Other: 0 ; CHECK-NEXT: Section: .bss -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = common global i32 0, align 8 diff --git a/lld/test/ELF/lto/common2.ll b/lld/test/ELF/lto/common2.ll index 1e886b81b83879..a7463cb1e26b65 100644 --- a/lld/test/ELF/lto/common2.ll +++ b/lld/test/ELF/lto/common2.ll @@ -4,7 +4,7 @@ ; RUN: llvm-dis < %t.0.2.internalize.bc | FileCheck %s ; RUN: llvm-readobj --symbols %t | FileCheck %s --check-prefix=SHARED -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = common global i8 0, align 8 diff --git a/lld/test/ELF/lto/common3.ll b/lld/test/ELF/lto/common3.ll index 66cf9189779473..de52615e24f448 100644 --- a/lld/test/ELF/lto/common3.ll +++ b/lld/test/ELF/lto/common3.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t1.o %t2.o -o %t -shared -save-temps ; RUN: llvm-dis < %t.0.2.internalize.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = common hidden global i32 0, align 8 define i32 @f() { diff --git a/lld/test/ELF/lto/common4.ll b/lld/test/ELF/lto/common4.ll index 7a40e4be32fa44..1d2f2d9e0a434b 100644 --- a/lld/test/ELF/lto/common4.ll +++ b/lld/test/ELF/lto/common4.ll @@ -14,7 +14,7 @@ ; RUN: ld.lld -pie -o %t.exe -save-temps %t.o ; RUN: llvm-dis < %t.exe.0.2.internalize.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = common dso_local local_unnamed_addr global i32 0, align 4 diff --git a/lld/test/ELF/lto/cpu-string.ll b/lld/test/ELF/lto/cpu-string.ll index df881015a1c493..ff80dbb9a7b3b9 100644 --- a/lld/test/ELF/lto/cpu-string.ll +++ b/lld/test/ELF/lto/cpu-string.ll @@ -13,7 +13,7 @@ ; RUN: ld.lld -plugin-opt=mcpu=znver1 %t.o -o %t.znver1.so -shared ; RUN: llvm-objdump -d -section=".text" -no-leading-addr -no-show-raw-insn %t.znver1.so | FileCheck -check-prefix=ZNVER1 %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() #0 { diff --git a/lld/test/ELF/lto/ctors.ll b/lld/test/ELF/lto/ctors.ll index 0d14725f6f69bc..a17e5b78500a25 100644 --- a/lld/test/ELF/lto/ctors.ll +++ b/lld/test/ELF/lto/ctors.ll @@ -3,7 +3,7 @@ ; RUN: ld.lld %t.o -o %t.so -shared ; RUN: llvm-readobj --sections %t.so | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @ctor, i8* null }] diff --git a/lld/test/ELF/lto/debugger-tune.ll b/lld/test/ELF/lto/debugger-tune.ll index 193bc632aae054..b7457756bcb121 100644 --- a/lld/test/ELF/lto/debugger-tune.ll +++ b/lld/test/ELF/lto/debugger-tune.ll @@ -13,7 +13,7 @@ ; RUN: llvm-dwarfdump %t.exe | FileCheck --check-prefix=SCE %s ; SCE-NOT: name_of_foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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, align 4, !dbg !0 diff --git a/lld/test/ELF/lto/defsym.ll b/lld/test/ELF/lto/defsym.ll index 1c5c743ea3d11a..1073ab8820f43f 100644 --- a/lld/test/ELF/lto/defsym.ll +++ b/lld/test/ELF/lto/defsym.ll @@ -25,7 +25,7 @@ ; CHECK-NEXT: popq %rax ; CHECK-NEXT: jmp -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @bar1() diff --git a/lld/test/ELF/lto/discard-value-names.ll b/lld/test/ELF/lto/discard-value-names.ll index d3f10ddaa352bf..485014e94d9b01 100644 --- a/lld/test/ELF/lto/discard-value-names.ll +++ b/lld/test/ELF/lto/discard-value-names.ll @@ -11,7 +11,7 @@ ; CHECK: %add = add i32 %in, %GV ; CHECK: ret i32 %add -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @GlobalValueName = global i32 0 diff --git a/lld/test/ELF/lto/drop-linkage.ll b/lld/test/ELF/lto/drop-linkage.ll index de305914e967c9..f02fa02bc4fdca 100644 --- a/lld/test/ELF/lto/drop-linkage.ll +++ b/lld/test/ELF/lto/drop-linkage.ll @@ -5,7 +5,7 @@ ; RUN: llvm-dis %t.so.0.4.opt.bc -o - | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @foo() { ret void diff --git a/lld/test/ELF/lto/duplicated-name.ll b/lld/test/ELF/lto/duplicated-name.ll index 0a6dce55bca7ca..b9e6c54564bcd6 100644 --- a/lld/test/ELF/lto/duplicated-name.ll +++ b/lld/test/ELF/lto/duplicated-name.ll @@ -7,7 +7,7 @@ ; RUN: llvm-ar rcS %t2.a %t.o ; RUN: ld.lld -m elf_x86_64 -shared -o %t.so -uf1 -uf2 %t1.a %t2.a -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f1() { diff --git a/lld/test/ELF/lto/duplicated.ll b/lld/test/ELF/lto/duplicated.ll index f278c45272b137..fc60fbab23c9da 100644 --- a/lld/test/ELF/lto/duplicated.ll +++ b/lld/test/ELF/lto/duplicated.ll @@ -7,7 +7,7 @@ ; CHECK-NEXT: >>> defined in {{.*}}.o target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @f() { ret void diff --git a/lld/test/ELF/lto/dynamic-list.ll b/lld/test/ELF/lto/dynamic-list.ll index 8e8738f18bd438..05a5f39a6b80c9 100644 --- a/lld/test/ELF/lto/dynamic-list.ll +++ b/lld/test/ELF/lto/dynamic-list.ll @@ -14,7 +14,7 @@ ; CHECK-NEXT: } target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/dynsym.ll b/lld/test/ELF/lto/dynsym.ll index 7eab9e473b8f76..392ac561e27e79 100644 --- a/lld/test/ELF/lto/dynsym.ll +++ b/lld/test/ELF/lto/dynsym.ll @@ -10,7 +10,7 @@ ; RUN: -o %t ; RUN: llvm-readobj --dyn-syms %t | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_start() { diff --git a/lld/test/ELF/lto/emit-llvm.ll b/lld/test/ELF/lto/emit-llvm.ll index a2020b46069c01..bf38c982f02e68 100644 --- a/lld/test/ELF/lto/emit-llvm.ll +++ b/lld/test/ELF/lto/emit-llvm.ll @@ -6,7 +6,7 @@ ; CHECK: define internal void @main() -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @main() { diff --git a/lld/test/ELF/lto/inline-asm.ll b/lld/test/ELF/lto/inline-asm.ll index 1f543bcc7a6ef8..e0732e6def5420 100644 --- a/lld/test/ELF/lto/inline-asm.ll +++ b/lld/test/ELF/lto/inline-asm.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as %s -o %t.o ; RUN: ld.lld %t.o -o %t.so -shared -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/lld/test/ELF/lto/internalize-basic.ll b/lld/test/ELF/lto/internalize-basic.ll index 704ea011f7d4bc..5197654d588058 100644 --- a/lld/test/ELF/lto/internalize-basic.ll +++ b/lld/test/ELF/lto/internalize-basic.ll @@ -4,7 +4,7 @@ ; RUN: llvm-dis < %t2.0.2.internalize.bc | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/internalize-exportdyn.ll b/lld/test/ELF/lto/internalize-exportdyn.ll index 5e0ec78addcbdd..7c996e19f35421 100644 --- a/lld/test/ELF/lto/internalize-exportdyn.ll +++ b/lld/test/ELF/lto/internalize-exportdyn.ll @@ -5,7 +5,7 @@ ; RUN: llvm-dis < %t2.0.2.internalize.bc | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/internalize-llvmused.ll b/lld/test/ELF/lto/internalize-llvmused.ll index 064a8c817b5087..7e3d867da5961e 100644 --- a/lld/test/ELF/lto/internalize-llvmused.ll +++ b/lld/test/ELF/lto/internalize-llvmused.ll @@ -4,7 +4,7 @@ ; RUN: llvm-dis < %t2.0.2.internalize.bc | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/internalize-undef.ll b/lld/test/ELF/lto/internalize-undef.ll index 1133f1d6345d4d..c0860d8943bdee 100644 --- a/lld/test/ELF/lto/internalize-undef.ll +++ b/lld/test/ELF/lto/internalize-undef.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t.o %t2.o -o %t -save-temps ; RUN: llvm-dis < %t.0.2.internalize.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @f() diff --git a/lld/test/ELF/lto/internalize-version-script.ll b/lld/test/ELF/lto/internalize-version-script.ll index 8ab62c85e4e5d4..7e242e1a7efffb 100644 --- a/lld/test/ELF/lto/internalize-version-script.ll +++ b/lld/test/ELF/lto/internalize-version-script.ll @@ -5,7 +5,7 @@ ; RUN: llvm-dis < %t2.0.2.internalize.bc | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @foo() { ret void diff --git a/lld/test/ELF/lto/irmover-error.ll b/lld/test/ELF/lto/irmover-error.ll index 6e1a61d541a4e7..d1c962ff725007 100644 --- a/lld/test/ELF/lto/irmover-error.ll +++ b/lld/test/ELF/lto/irmover-error.ll @@ -5,7 +5,7 @@ ; CHECK: linking module flags 'foo': IDs have conflicting values target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" !0 = !{ i32 1, !"foo", i32 1 } diff --git a/lld/test/ELF/lto/irmover-warning.ll b/lld/test/ELF/lto/irmover-warning.ll index 5896ed6fe39939..7b0db782cca695 100644 --- a/lld/test/ELF/lto/irmover-warning.ll +++ b/lld/test/ELF/lto/irmover-warning.ll @@ -9,7 +9,7 @@ ; CHECK-SAME: irmover-warning.ll.tmp.a(irmover-warning.ll.tmp2.bc at {{[0-9]+}}) target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare void @f() diff --git a/lld/test/ELF/lto/keep-undefined.ll b/lld/test/ELF/lto/keep-undefined.ll index 4e265123c8f73f..55d2a05b48f9ce 100644 --- a/lld/test/ELF/lto/keep-undefined.ll +++ b/lld/test/ELF/lto/keep-undefined.ll @@ -8,7 +8,7 @@ ; CHECK: T foo target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @foo() { ret void diff --git a/lld/test/ELF/lto/lazy-internal.ll b/lld/test/ELF/lto/lazy-internal.ll index dc1ba45c0d71ce..1bb2bac3d59ec9 100644 --- a/lld/test/ELF/lto/lazy-internal.ll +++ b/lld/test/ELF/lto/lazy-internal.ll @@ -9,7 +9,7 @@ ; CHECK: define internal void @foo() ; CHECK: define internal void @bar() -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 hidden void @foo() { diff --git a/lld/test/ELF/lto/libcall-archive.ll b/lld/test/ELF/lto/libcall-archive.ll index 28c65fe656fa6e..7e8ac183317d0a 100644 --- a/lld/test/ELF/lto/libcall-archive.ll +++ b/lld/test/ELF/lto/libcall-archive.ll @@ -13,7 +13,7 @@ ; CHECK: T _start ; CHECK: T memcpy -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_start(i8* %a, i8* %b) { diff --git a/lld/test/ELF/lto/linkage.ll b/lld/test/ELF/lto/linkage.ll index 89a833900c8b1a..9b9390002c7a70 100644 --- a/lld/test/ELF/lto/linkage.ll +++ b/lld/test/ELF/lto/linkage.ll @@ -3,7 +3,7 @@ ; RUN: ld.lld %t1.o %t1.o -o %t.so -shared ; RUN: llvm-nm %t.so | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; Should not encounter a duplicate symbol error for @.str diff --git a/lld/test/ELF/lto/linker-script-symbols-assign.ll b/lld/test/ELF/lto/linker-script-symbols-assign.ll index e5e267507cc3f4..30a69f8ace1e6e 100644 --- a/lld/test/ELF/lto/linker-script-symbols-assign.ll +++ b/lld/test/ELF/lto/linker-script-symbols-assign.ll @@ -33,7 +33,7 @@ ; ABS-NEXT: } target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @foo = global i32 0 @bar = global i32 0 diff --git a/lld/test/ELF/lto/linker-script-symbols-ipo.ll b/lld/test/ELF/lto/linker-script-symbols-ipo.ll index 5b5a34293dccd7..4cc95c6cacafd7 100644 --- a/lld/test/ELF/lto/linker-script-symbols-ipo.ll +++ b/lld/test/ELF/lto/linker-script-symbols-ipo.ll @@ -20,7 +20,7 @@ ; NOIPO: _start: ; NOIPO-NEXT: {{.*}} jmp -21 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() { diff --git a/lld/test/ELF/lto/linker-script-symbols.ll b/lld/test/ELF/lto/linker-script-symbols.ll index 155cd20a60b247..1fdafefe4e7cb0 100644 --- a/lld/test/ELF/lto/linker-script-symbols.ll +++ b/lld/test/ELF/lto/linker-script-symbols.ll @@ -19,7 +19,7 @@ ; CHECK-NOT: zed target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @bar() { ret void diff --git a/lld/test/ELF/lto/linkonce-odr.ll b/lld/test/ELF/lto/linkonce-odr.ll index cb801a5558c515..44233513d1fb84 100644 --- a/lld/test/ELF/lto/linkonce-odr.ll +++ b/lld/test/ELF/lto/linkonce-odr.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared -save-temps ; RUN: llvm-dis %t.so.0.4.opt.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @f() diff --git a/lld/test/ELF/lto/linkonce.ll b/lld/test/ELF/lto/linkonce.ll index 172c034d993cc1..6dba6a3fded7c1 100644 --- a/lld/test/ELF/lto/linkonce.ll +++ b/lld/test/ELF/lto/linkonce.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared -save-temps ; RUN: llvm-dis %t.so.0.4.opt.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @f() diff --git a/lld/test/ELF/lto/lto-start.ll b/lld/test/ELF/lto/lto-start.ll index e39c35f17e0720..d50b488e9c2750 100644 --- a/lld/test/ELF/lto/lto-start.ll +++ b/lld/test/ELF/lto/lto-start.ll @@ -16,7 +16,7 @@ ; CHECK-NEXT: Section: .text target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/ltopasses-basic.ll b/lld/test/ELF/lto/ltopasses-basic.ll index 8489e70e18dc60..6789bdc95fe156 100644 --- a/lld/test/ELF/lto/ltopasses-basic.ll +++ b/lld/test/ELF/lto/ltopasses-basic.ll @@ -3,7 +3,7 @@ ; RUN: ld.lld %t.o -o %t.so -save-temps -mllvm -debug-pass=Arguments -shared 2>&1 | FileCheck %s --check-prefix=MLLVM ; RUN: llvm-dis %t.so.0.4.opt.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @ctor, i8* null }] diff --git a/lld/test/ELF/lto/ltopasses-custom.ll b/lld/test/ELF/lto/ltopasses-custom.ll index f0322f8e41755e..23f15642682a33 100644 --- a/lld/test/ELF/lto/ltopasses-custom.ll +++ b/lld/test/ELF/lto/ltopasses-custom.ll @@ -6,7 +6,7 @@ ; RUN: llvm-dis %t.so.0.4.opt.bc -o - | FileCheck %s ; RUN: llvm-dis %t2.so.0.4.opt.bc -o - | FileCheck %s --check-prefix=ATOMIC -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @barrier() { diff --git a/lld/test/ELF/lto/metadata.ll b/lld/test/ELF/lto/metadata.ll index c35eecab70fa2e..238b5bd43b707d 100644 --- a/lld/test/ELF/lto/metadata.ll +++ b/lld/test/ELF/lto/metadata.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as %s -o %t1.o ; RUN: ld.lld %t1.o %t1.o -o %t.so -shared -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 weak void @foo(i32* %p) { diff --git a/lld/test/ELF/lto/mix-platforms.ll b/lld/test/ELF/lto/mix-platforms.ll index 4625f87b5e2310..3478caa5cff637 100644 --- a/lld/test/ELF/lto/mix-platforms.ll +++ b/lld/test/ELF/lto/mix-platforms.ll @@ -4,7 +4,7 @@ ; RUN: llvm-as %s -o %tx64.o ; RUN: not ld.lld %ti386.so %tx64.o -o %t 2>&1 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: {{.*}}x64.o is incompatible with {{.*}}i386.so diff --git a/lld/test/ELF/lto/mix-platforms2.ll b/lld/test/ELF/lto/mix-platforms2.ll index 7b5c95655bfa50..1bd989e867466f 100644 --- a/lld/test/ELF/lto/mix-platforms2.ll +++ b/lld/test/ELF/lto/mix-platforms2.ll @@ -5,5 +5,5 @@ ; CHECK: {{.*}}x64.o is incompatible with {{.*}}i386.o -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/lld/test/ELF/lto/module-asm.ll b/lld/test/ELF/lto/module-asm.ll index f3644f4f7b1b8c..eaf27621422116 100644 --- a/lld/test/ELF/lto/module-asm.ll +++ b/lld/test/ELF/lto/module-asm.ll @@ -3,7 +3,7 @@ ; RUN: ld.lld %t.o -o %t ; RUN: llvm-nm %t | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ".text" diff --git a/lld/test/ELF/lto/new-pass-manager.ll b/lld/test/ELF/lto/new-pass-manager.ll index 84f4ad1856e4b2..918b5050016662 100644 --- a/lld/test/ELF/lto/new-pass-manager.ll +++ b/lld/test/ELF/lto/new-pass-manager.ll @@ -10,5 +10,5 @@ ; CHECK: Starting llvm::Module pass manager run ; CHECK: Finished llvm::Module pass manager run -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/lld/test/ELF/lto/obj-path.ll b/lld/test/ELF/lto/obj-path.ll index fb0a51a73f340e..808e17b242770b 100644 --- a/lld/test/ELF/lto/obj-path.ll +++ b/lld/test/ELF/lto/obj-path.ll @@ -23,7 +23,7 @@ ; NM2: T g ; ELF2: Format: ELF64-x86-64 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/lld/test/ELF/lto/opt-level.ll b/lld/test/ELF/lto/opt-level.ll index 94c96c7d42340f..5c4ec43a21a5e6 100644 --- a/lld/test/ELF/lto/opt-level.ll +++ b/lld/test/ELF/lto/opt-level.ll @@ -28,7 +28,7 @@ ; RUN: FileCheck --check-prefix=INVALIDNEGATIVE2 %s ; INVALIDNEGATIVE2: invalid optimization level for LTO: 4294967295 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK-O0: foo diff --git a/lld/test/ELF/lto/opt-remarks.ll b/lld/test/ELF/lto/opt-remarks.ll index 8132b75e217002..013e28e79bf461 100644 --- a/lld/test/ELF/lto/opt-remarks.ll +++ b/lld/test/ELF/lto/opt-remarks.ll @@ -56,7 +56,7 @@ ; YAML-PASSES: Pass: inline -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" declare i32 @patatino() diff --git a/lld/test/ELF/lto/parallel-internalize.ll b/lld/test/ELF/lto/parallel-internalize.ll index cd505fb7ee35b5..907ba478d87b22 100644 --- a/lld/test/ELF/lto/parallel-internalize.ll +++ b/lld/test/ELF/lto/parallel-internalize.ll @@ -59,7 +59,7 @@ ; CHECK-NEXT: DynamicSymbols [ ; CHECK-NEXT: ] -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK0: U bar diff --git a/lld/test/ELF/lto/parallel.ll b/lld/test/ELF/lto/parallel.ll index f400e4342534c0..4ba3fd69d527bd 100644 --- a/lld/test/ELF/lto/parallel.ll +++ b/lld/test/ELF/lto/parallel.ll @@ -5,7 +5,7 @@ ; RUN: llvm-nm %t.lto.o | FileCheck --check-prefix=CHECK0 %s ; RUN: llvm-nm %t1.lto.o | FileCheck --check-prefix=CHECK1 %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK0-NOT: bar diff --git a/lld/test/ELF/lto/pic.ll b/lld/test/ELF/lto/pic.ll index bedbb1c512ab4b..abc514d7ca3dea 100644 --- a/lld/test/ELF/lto/pic.ll +++ b/lld/test/ELF/lto/pic.ll @@ -10,7 +10,7 @@ ; CHECK-NEXT: } ; CHECK-NEXT: ] -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @bar() diff --git a/lld/test/ELF/lto/relax-relocs.ll b/lld/test/ELF/lto/relax-relocs.ll index a375d253310094..80e5dac77d83a9 100644 --- a/lld/test/ELF/lto/relax-relocs.ll +++ b/lld/test/ELF/lto/relax-relocs.ll @@ -6,7 +6,7 @@ ; Test that we produce R_X86_64_REX_GOTPCRELX instead of R_X86_64_GOTPCREL ; CHECK: R_X86_64_REX_GOTPCRELX foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = external global i32 diff --git a/lld/test/ELF/lto/relocatable.ll b/lld/test/ELF/lto/relocatable.ll index a67eb12e160578..9c7a0c280da24a 100644 --- a/lld/test/ELF/lto/relocatable.ll +++ b/lld/test/ELF/lto/relocatable.ll @@ -60,7 +60,7 @@ ; CHECK-NEXT: } ; CHECK-NEXT: ] -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/lld/test/ELF/lto/relocation-model.ll b/lld/test/ELF/lto/relocation-model.ll index beb693ebeab506..825e9fe40a7d1c 100644 --- a/lld/test/ELF/lto/relocation-model.ll +++ b/lld/test/ELF/lto/relocation-model.ll @@ -45,7 +45,7 @@ ; PIC: R_X86_64_REX_GOTPCRELX foo ; STATIC: R_X86_64_PC32 foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = external global i32 diff --git a/lld/test/ELF/lto/resolution.ll b/lld/test/ELF/lto/resolution.ll index ce6f4d0b3b5916..d4ab1bf1c67108 100644 --- a/lld/test/ELF/lto/resolution.ll +++ b/lld/test/ELF/lto/resolution.ll @@ -21,7 +21,7 @@ ; CHECK-NEXT: 0000: 09000000 |{{.*}}| ; CHECK-NEXT: ) -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = weak global i32 8 diff --git a/lld/test/ELF/lto/sample-profile.ll b/lld/test/ELF/lto/sample-profile.ll index 989ed0591555c0..a8b110444425d2 100644 --- a/lld/test/ELF/lto/sample-profile.ll +++ b/lld/test/ELF/lto/sample-profile.ll @@ -10,7 +10,7 @@ ; RUN: ld.lld --plugin-opt=sample-profile=%p/Inputs/sample-profile.prof %t1.o %t2.o -o %t3 ; RUN opt -S %t3.lto.o | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: ProfileSummary diff --git a/lld/test/ELF/lto/save-temps.ll b/lld/test/ELF/lto/save-temps.ll index b71cd1e92d6db1..b34134cc5d7fc6 100644 --- a/lld/test/ELF/lto/save-temps.ll +++ b/lld/test/ELF/lto/save-temps.ll @@ -17,7 +17,7 @@ ; RUN: llvm-dis a.out.0.0.preopt.bc target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @foo() { ret void diff --git a/lld/test/ELF/lto/section-name.ll b/lld/test/ELF/lto/section-name.ll index ac744926db6c5d..0ecc3778aef710 100644 --- a/lld/test/ELF/lto/section-name.ll +++ b/lld/test/ELF/lto/section-name.ll @@ -5,7 +5,7 @@ ; RUN: ld.lld %t.o -o %t.so -shared --gc-sections ; RUN: llvm-readelf -S %t.so | FileCheck --check-prefix=GC %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = hidden global i32 42, section "foo_section" diff --git a/lld/test/ELF/lto/setting-dso-local.ll b/lld/test/ELF/lto/setting-dso-local.ll index 542db409bb6b4a..d2d9c29fc4634f 100644 --- a/lld/test/ELF/lto/setting-dso-local.ll +++ b/lld/test/ELF/lto/setting-dso-local.ll @@ -6,7 +6,7 @@ ; We used to crash setting foobar to non-dso_local -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @foobar = external hidden global i32 diff --git a/lld/test/ELF/lto/shlib-undefined.ll b/lld/test/ELF/lto/shlib-undefined.ll index b35f87e5f0d348..01fe915d6b031d 100644 --- a/lld/test/ELF/lto/shlib-undefined.ll +++ b/lld/test/ELF/lto/shlib-undefined.ll @@ -16,7 +16,7 @@ ; CHECK-NEXT: } target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/start-lib.ll b/lld/test/ELF/lto/start-lib.ll index d46e5d5cdd8534..024d887a7d0a30 100644 --- a/lld/test/ELF/lto/start-lib.ll +++ b/lld/test/ELF/lto/start-lib.ll @@ -19,7 +19,7 @@ ; TEST3-NOT: Name: bar ; TEST3-NOT: Name: foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_start() { diff --git a/lld/test/ELF/lto/thin-archivecollision.ll b/lld/test/ELF/lto/thin-archivecollision.ll index 47a0beef7a2702..554c2b02fc40c5 100644 --- a/lld/test/ELF/lto/thin-archivecollision.ll +++ b/lld/test/ELF/lto/thin-archivecollision.ll @@ -23,7 +23,7 @@ ; CHECK: T blah ; CHECK: T foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" define i32 @_start() { diff --git a/lld/test/ELF/lto/thinlto-cant-write-index.ll b/lld/test/ELF/lto/thinlto-cant-write-index.ll index d071406e336765..784fbafd2a4872 100644 --- a/lld/test/ELF/lto/thinlto-cant-write-index.ll +++ b/lld/test/ELF/lto/thinlto-cant-write-index.ll @@ -12,7 +12,7 @@ ; RUN: chmod u+w %t2.o.thinlto.bc ; CHECK: cannot open {{.*}}2.o.thinlto.bc: {{P|p}}ermission denied -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/lld/test/ELF/lto/thinlto-debug-fission.ll b/lld/test/ELF/lto/thinlto-debug-fission.ll index 8855d100b4d32a..b779ad4a45f64f 100644 --- a/lld/test/ELF/lto/thinlto-debug-fission.ll +++ b/lld/test/ELF/lto/thinlto-debug-fission.ll @@ -9,7 +9,7 @@ ; CHECK: Format: ELF64-x86-64 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/lld/test/ELF/lto/thinlto-emit-imports.ll b/lld/test/ELF/lto/thinlto-emit-imports.ll index f85f409a26a1c1..cae7922682bc56 100644 --- a/lld/test/ELF/lto/thinlto-emit-imports.ll +++ b/lld/test/ELF/lto/thinlto-emit-imports.ll @@ -43,7 +43,7 @@ ; RUN: not ls %t2.o.imports ; RUN: not ls %t3.o.imports -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/lld/test/ELF/lto/thinlto-index-file.ll b/lld/test/ELF/lto/thinlto-index-file.ll index 18f4350b3a4b83..91f0b298ca35cd 100644 --- a/lld/test/ELF/lto/thinlto-index-file.ll +++ b/lld/test/ELF/lto/thinlto-index-file.ll @@ -12,7 +12,7 @@ ; CHECK: {{.*}}thinlto-index-file.ll.tmp2.o ; CHECK: {{.*}}thinlto-index-file.ll.tmp3.o -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/lld/test/ELF/lto/thinlto-index-only.ll b/lld/test/ELF/lto/thinlto-index-only.ll index 86510f6cd3dd7f..594b4bcf767798 100644 --- a/lld/test/ELF/lto/thinlto-index-only.ll +++ b/lld/test/ELF/lto/thinlto-index-only.ll @@ -73,7 +73,7 @@ ; BACKEND2-NEXT: &1 | FileCheck %s --check-prefix=ERR ; ERR: --plugin-opt=thinlto-prefix-replace= expects 'old;new' format, but got abc:def -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f() { diff --git a/lld/test/ELF/lto/thinlto.ll b/lld/test/ELF/lto/thinlto.ll index 63761151ba542e..51c82ece5876f7 100644 --- a/lld/test/ELF/lto/thinlto.ll +++ b/lld/test/ELF/lto/thinlto.ll @@ -24,7 +24,7 @@ ; NM1: T f ; NM2: T g -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/lld/test/ELF/lto/timepasses.ll b/lld/test/ELF/lto/timepasses.ll index 97eda05b2f6d1d..86c9b8ed795106 100644 --- a/lld/test/ELF/lto/timepasses.ll +++ b/lld/test/ELF/lto/timepasses.ll @@ -3,7 +3,7 @@ ; RUN: env LLD_IN_TEST=0 ld.lld %t.o -o %t.so -shared -mllvm \ ; RUN: -time-passes 2>&1 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() { diff --git a/lld/test/ELF/lto/tls-mixed.ll b/lld/test/ELF/lto/tls-mixed.ll index 2016e239cb9503..9d5a69303728ee 100644 --- a/lld/test/ELF/lto/tls-mixed.ll +++ b/lld/test/ELF/lto/tls-mixed.ll @@ -3,7 +3,7 @@ ; RUN: llvm-mc %p/Inputs/tls-mixed.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux ; RUN: ld.lld %t1.o %t2.o -o %t.so -shared -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; Should not encounter TLS-ness mismatch for @foo diff --git a/lld/test/ELF/lto/tls-preserve.ll b/lld/test/ELF/lto/tls-preserve.ll index f99a1ae93b0553..a3d767c0dadb8b 100644 --- a/lld/test/ELF/lto/tls-preserve.ll +++ b/lld/test/ELF/lto/tls-preserve.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld -shared %t1.o -o %t1 ; RUN: llvm-readobj --symbols %t1 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @tsp_int = thread_local global i32 1 diff --git a/lld/test/ELF/lto/type-merge.ll b/lld/test/ELF/lto/type-merge.ll index c020703373546e..985c44b796e19c 100644 --- a/lld/test/ELF/lto/type-merge.ll +++ b/lld/test/ELF/lto/type-merge.ll @@ -4,7 +4,7 @@ ; RUN: ld.lld %t.o %t2.o -o %t -shared -save-temps ; RUN: llvm-dis < %t.0.0.preopt.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/lld/test/ELF/lto/type-merge2.ll b/lld/test/ELF/lto/type-merge2.ll index 95fed45db9a51e..5944be7e6c09cd 100644 --- a/lld/test/ELF/lto/type-merge2.ll +++ b/lld/test/ELF/lto/type-merge2.ll @@ -5,7 +5,7 @@ ; RUN: llvm-dis %t.so.0.0.preopt.bc -o - | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" %zed = type { i8 } define void @foo() { diff --git a/lld/test/ELF/lto/undef-mixed.ll b/lld/test/ELF/lto/undef-mixed.ll index 0d4827a3ffac90..defda599f40d1a 100644 --- a/lld/test/ELF/lto/undef-mixed.ll +++ b/lld/test/ELF/lto/undef-mixed.ll @@ -12,7 +12,7 @@ ; CHECK-NEXT: Other: 0 ; CHECK-NEXT: Section: .text -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @bar() diff --git a/lld/test/ELF/lto/undef-weak.ll b/lld/test/ELF/lto/undef-weak.ll index e3b623ca14f9bc..a84adb42441391 100644 --- a/lld/test/ELF/lto/undef-weak.ll +++ b/lld/test/ELF/lto/undef-weak.ll @@ -8,7 +8,7 @@ ; RUN: llvm-readobj --symbols %t2.so | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare extern_weak void @f() define void @foo() { diff --git a/lld/test/ELF/lto/undef.ll b/lld/test/ELF/lto/undef.ll index 2ccebb6fc7849e..74127db2e051e4 100644 --- a/lld/test/ELF/lto/undef.ll +++ b/lld/test/ELF/lto/undef.ll @@ -3,7 +3,7 @@ ; RUN: ld.lld %t.o -o %t.so -shared ; RUN: llvm-readobj --symbols %t.so | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare void @bar() define void @foo() { diff --git a/lld/test/ELF/lto/undefined-puts.ll b/lld/test/ELF/lto/undefined-puts.ll index 2cbe0c30321707..777ca56eae36b0 100644 --- a/lld/test/ELF/lto/undefined-puts.ll +++ b/lld/test/ELF/lto/undefined-puts.ll @@ -5,7 +5,7 @@ ; RUN: ld.lld %t1.so %t2.o -o %t ; RUN: llvm-readobj --dyn-syms --dyn-relocations %t | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @.str = private unnamed_addr constant [6 x i8] c"blah\0A\00", align 1 diff --git a/lld/test/ELF/lto/unnamed-addr-comdat.ll b/lld/test/ELF/lto/unnamed-addr-comdat.ll index 52abc214ca77c6..38b08ab23ee915 100644 --- a/lld/test/ELF/lto/unnamed-addr-comdat.ll +++ b/lld/test/ELF/lto/unnamed-addr-comdat.ll @@ -4,7 +4,7 @@ ; RUN: llvm-dis %t.so.0.2.internalize.bc -o - | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" $foo = comdat any @foo = linkonce_odr unnamed_addr constant i32 42, comdat diff --git a/lld/test/ELF/lto/unnamed-addr-drop.ll b/lld/test/ELF/lto/unnamed-addr-drop.ll index 2b658038b9d62f..ad662b7fe7b661 100644 --- a/lld/test/ELF/lto/unnamed-addr-drop.ll +++ b/lld/test/ELF/lto/unnamed-addr-drop.ll @@ -5,7 +5,7 @@ ; RUN: llvm-dis %t.so.0.2.internalize.bc -o - | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @foo = weak constant i32 41 diff --git a/lld/test/ELF/lto/unnamed-addr-lib.ll b/lld/test/ELF/lto/unnamed-addr-lib.ll index 7b9dd530c23fc2..0c47468e6b4ff2 100644 --- a/lld/test/ELF/lto/unnamed-addr-lib.ll +++ b/lld/test/ELF/lto/unnamed-addr-lib.ll @@ -14,7 +14,7 @@ ; CHECK: @foo = internal unnamed_addr constant i8 42 ; CHECK: @bar = weak_odr unnamed_addr constant i8 42 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = linkonce_odr unnamed_addr constant i8 42 diff --git a/lld/test/ELF/lto/unnamed-addr.ll b/lld/test/ELF/lto/unnamed-addr.ll index 5dcc7b0cb94d0e..7504fdf6733b30 100644 --- a/lld/test/ELF/lto/unnamed-addr.ll +++ b/lld/test/ELF/lto/unnamed-addr.ll @@ -4,7 +4,7 @@ ; RUN: llvm-dis %t.so.0.4.opt.bc -o - | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @a = internal unnamed_addr constant i8 42 diff --git a/lld/test/ELF/lto/verify-invalid.ll b/lld/test/ELF/lto/verify-invalid.ll index d44c483dbcbbb0..9fa0f9e0b5f901 100644 --- a/lld/test/ELF/lto/verify-invalid.ll +++ b/lld/test/ELF/lto/verify-invalid.ll @@ -8,7 +8,7 @@ ; RUN: --plugin-opt=disable-verify 2>&1 | FileCheck -check-prefix=DISABLE %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @_start() { ret void diff --git a/lld/test/ELF/lto/version-script.ll b/lld/test/ELF/lto/version-script.ll index 2da42efb449ef3..f12d7b6f6df726 100644 --- a/lld/test/ELF/lto/version-script.ll +++ b/lld/test/ELF/lto/version-script.ll @@ -6,7 +6,7 @@ ; RUN: llvm-readobj -V --dyn-syms %t2 | FileCheck --check-prefix=DSO %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define void @foo() { ret void diff --git a/lld/test/ELF/lto/version-script2.ll b/lld/test/ELF/lto/version-script2.ll index 34fe377fc63827..899a42b0e44394 100644 --- a/lld/test/ELF/lto/version-script2.ll +++ b/lld/test/ELF/lto/version-script2.ll @@ -7,7 +7,7 @@ ; test that we have the correct version. ; CHECK: Name: foo@@VER1 ( -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ".global foo" diff --git a/lld/test/ELF/lto/visibility.ll b/lld/test/ELF/lto/visibility.ll index 07b08515dbd57d..fdf579a51f13ca 100644 --- a/lld/test/ELF/lto/visibility.ll +++ b/lld/test/ELF/lto/visibility.ll @@ -25,7 +25,7 @@ ; CHECK-NEXT: ] ; CHECK-NEXT: Section: .data -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 hidden void @g() diff --git a/lld/test/ELF/lto/weak.ll b/lld/test/ELF/lto/weak.ll index 95b1dc5d0440e1..f716e3327766d1 100644 --- a/lld/test/ELF/lto/weak.ll +++ b/lld/test/ELF/lto/weak.ll @@ -4,7 +4,7 @@ ; RUN: llvm-readobj --symbols %t.so | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" define weak void @f() { ret void diff --git a/lld/test/ELF/lto/weakodr-visibility.ll b/lld/test/ELF/lto/weakodr-visibility.ll index b041d79a891417..496de3c60c7049 100644 --- a/lld/test/ELF/lto/weakodr-visibility.ll +++ b/lld/test/ELF/lto/weakodr-visibility.ll @@ -32,7 +32,7 @@ ; SECOND: foo: ; SECOND-NEXT: movl $42, %eax -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 weak_odr i32 @foo(i8* %this) { diff --git a/lld/test/ELF/lto/wrap-1.ll b/lld/test/ELF/lto/wrap-1.ll index 5ff46274d08791..310a7dab384a2b 100644 --- a/lld/test/ELF/lto/wrap-1.ll +++ b/lld/test/ELF/lto/wrap-1.ll @@ -23,7 +23,7 @@ ; RESOLS: ,__wrap_bar,plx ; RESOLS: ,__real_bar,plxr -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @bar() diff --git a/lld/test/ELF/lto/wrap-2.ll b/lld/test/ELF/lto/wrap-2.ll index 20505307194082..7a312f881b72dc 100644 --- a/lld/test/ELF/lto/wrap-2.ll +++ b/lld/test/ELF/lto/wrap-2.ll @@ -36,7 +36,7 @@ ; BIND-NEXT: Size: ; BIND-NEXT: Binding: Local -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @bar() diff --git a/lld/test/wasm/lto/incompatible.ll b/lld/test/wasm/lto/incompatible.ll index 6f7c154e959c44..ee98cb4b4e63c0 100644 --- a/lld/test/wasm/lto/incompatible.ll +++ b/lld/test/wasm/lto/incompatible.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as %s -o %t.bc ; RUN: not wasm-ld %t.bc -o out.wasm 2>&1 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: {{.*}}incompatible.ll.tmp.bc: machine type must be wasm32 diff --git a/lldb/lit/Suite/lit.cfg b/lldb/lit/Suite/lit.cfg index a0d4dc4ff31f0b..80117eb6708061 100644 --- a/lldb/lit/Suite/lit.cfg +++ b/lldb/lit/Suite/lit.cfg @@ -39,7 +39,7 @@ def find_shlibpath_var(): elif platform.system() == 'Windows': yield 'PATH' -if not config.environment['DYLD_INSERT_LIBRARIES']: +if 'DYLD_INSERT_LIBRARIES' in os.environ: # Shared library build of LLVM may require LD_LIBRARY_PATH or equivalent. # This clashes with DYLD_INSERT_LIBRARIES which is needed on Darwin. for shlibpath_var in find_shlibpath_var(): diff --git a/llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp index 0fc7981f381e95..87d4e995270ba0 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp @@ -499,11 +499,9 @@ AMDGPULegalizerInfo::AMDGPULegalizerInfo(const GCNSubtarget &ST_, return std::make_pair(0, LLT::scalar(Query.Types[1].getSizeInBits())); }); - if (ST.hasFlatAddressSpace()) { - getActionDefinitionsBuilder(G_ADDRSPACE_CAST) - .scalarize(0) - .custom(); - } + getActionDefinitionsBuilder(G_ADDRSPACE_CAST) + .scalarize(0) + .custom(); // TODO: Should load to s16 be legal? Most loads extend to 32-bits, but we // handle some operations by just promoting the register during @@ -903,6 +901,7 @@ bool AMDGPULegalizerInfo::legalizeAddrSpaceCast( MIRBuilder.setInstr(MI); + const LLT S32 = LLT::scalar(32); Register Dst = MI.getOperand(0).getReg(); Register Src = MI.getOperand(1).getReg(); @@ -924,6 +923,27 @@ bool AMDGPULegalizerInfo::legalizeAddrSpaceCast( return true; } + if (DestAS == AMDGPUAS::CONSTANT_ADDRESS_32BIT) { + // Truncate. + MIRBuilder.buildExtract(Dst, Src, 0); + MI.eraseFromParent(); + return true; + } + + if (SrcAS == AMDGPUAS::CONSTANT_ADDRESS_32BIT) { + const SIMachineFunctionInfo *Info = MF.getInfo(); + uint32_t AddrHiVal = Info->get32BitAddressHighBits(); + + // FIXME: This is a bit ugly due to creating a merge of 2 pointers to + // another. Merge operands are required to be the same type, but creating an + // extra ptrtoint would be kind of pointless. + auto HighAddr = MIRBuilder.buildConstant( + LLT::pointer(AMDGPUAS::CONSTANT_ADDRESS_32BIT, 32), AddrHiVal); + MIRBuilder.buildMerge(Dst, {Src, HighAddr.getReg(0)}); + MI.eraseFromParent(); + return true; + } + if (SrcAS == AMDGPUAS::FLAT_ADDRESS) { assert(DestAS == AMDGPUAS::LOCAL_ADDRESS || DestAS == AMDGPUAS::PRIVATE_ADDRESS); @@ -945,8 +965,11 @@ bool AMDGPULegalizerInfo::legalizeAddrSpaceCast( return true; } - assert(SrcAS == AMDGPUAS::LOCAL_ADDRESS || - SrcAS == AMDGPUAS::PRIVATE_ADDRESS); + if (SrcAS != AMDGPUAS::LOCAL_ADDRESS && SrcAS != AMDGPUAS::PRIVATE_ADDRESS) + return false; + + if (!ST.hasFlatAddressSpace()) + return false; auto SegmentNull = MIRBuilder.buildConstant(SrcTy, TM.getNullPointerValue(SrcAS)); @@ -961,7 +984,7 @@ bool AMDGPULegalizerInfo::legalizeAddrSpaceCast( Register BuildPtr = MRI.createGenericVirtualRegister(DstTy); // Coerce the type of the low half of the result so we can use merge_values. - Register SrcAsInt = MRI.createGenericVirtualRegister(LLT::scalar(32)); + Register SrcAsInt = MRI.createGenericVirtualRegister(S32); MIRBuilder.buildInstr(TargetOpcode::G_PTRTOINT) .addDef(SrcAsInt) .addUse(Src); diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 9c1ba17510ec45..d33a7a0b96309e 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -117,9 +117,6 @@ static std::string computeDataLayout(const Triple &TT) { !TT.isArch64Bit()) Ret += "-p:32:32"; - // Address spaces for 32 bit signed, 32 bit unsigned, and 64 bit pointers. - Ret += "-p270:32:32-p271:32:32-p272:64:64"; - // Some ABIs align 64 bit integers and doubles to 64 bits, others to 32. if (TT.isArch64Bit() || TT.isOSWindows() || TT.isOSNaCl()) Ret += "-i64:64"; diff --git a/llvm/test/CodeGen/AMDGPU/GlobalISel/legalize-addrspacecast.mir b/llvm/test/CodeGen/AMDGPU/GlobalISel/legalize-addrspacecast.mir index 113319e59b2f4a..c295878b75bfeb 100644 --- a/llvm/test/CodeGen/AMDGPU/GlobalISel/legalize-addrspacecast.mir +++ b/llvm/test/CodeGen/AMDGPU/GlobalISel/legalize-addrspacecast.mir @@ -1,6 +1,7 @@ # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py # RUN: llc -march=amdgcn -mcpu=fiji -O0 -run-pass=legalizer -global-isel-abort=0 -o - %s | FileCheck -check-prefix=VI %s # RUN: llc -march=amdgcn -mcpu=gfx900 -O0 -run-pass=legalizer -global-isel-abort=0 -o - %s | FileCheck -check-prefix=GFX9 %s +# RUN: llc -march=amdgcn -mcpu=tahiti -O0 -run-pass=legalizer -global-isel-abort=0 -o - %s | FileCheck -check-prefix=SI %s --- name: test_addrspacecast_p0_to_p1 @@ -16,6 +17,10 @@ body: | ; GFX9: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 ; GFX9: [[BITCAST:%[0-9]+]]:_(p1) = G_BITCAST [[COPY]](p0) ; GFX9: $vgpr0_vgpr1 = COPY [[BITCAST]](p1) + ; SI-LABEL: name: test_addrspacecast_p0_to_p1 + ; SI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; SI: [[BITCAST:%[0-9]+]]:_(p1) = G_BITCAST [[COPY]](p0) + ; SI: $vgpr0_vgpr1 = COPY [[BITCAST]](p1) %0:_(p0) = COPY $vgpr0_vgpr1 %1:_(p1) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -35,6 +40,10 @@ body: | ; GFX9: [[COPY:%[0-9]+]]:_(p1) = COPY $vgpr0_vgpr1 ; GFX9: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[COPY]](p1) ; GFX9: $vgpr0_vgpr1 = COPY [[BITCAST]](p0) + ; SI-LABEL: name: test_addrspacecast_p1_to_p0 + ; SI: [[COPY:%[0-9]+]]:_(p1) = COPY $vgpr0_vgpr1 + ; SI: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[COPY]](p1) + ; SI: $vgpr0_vgpr1 = COPY [[BITCAST]](p0) %0:_(p1) = COPY $vgpr0_vgpr1 %1:_(p0) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -54,6 +63,10 @@ body: | ; GFX9: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 ; GFX9: [[BITCAST:%[0-9]+]]:_(p4) = G_BITCAST [[COPY]](p0) ; GFX9: $vgpr0_vgpr1 = COPY [[BITCAST]](p4) + ; SI-LABEL: name: test_addrspacecast_p0_to_p4 + ; SI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; SI: [[BITCAST:%[0-9]+]]:_(p4) = G_BITCAST [[COPY]](p0) + ; SI: $vgpr0_vgpr1 = COPY [[BITCAST]](p4) %0:_(p0) = COPY $vgpr0_vgpr1 %1:_(p4) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -73,6 +86,10 @@ body: | ; GFX9: [[COPY:%[0-9]+]]:_(p4) = COPY $vgpr0_vgpr1 ; GFX9: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[COPY]](p4) ; GFX9: $vgpr0_vgpr1 = COPY [[BITCAST]](p0) + ; SI-LABEL: name: test_addrspacecast_p4_to_p0 + ; SI: [[COPY:%[0-9]+]]:_(p4) = COPY $vgpr0_vgpr1 + ; SI: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[COPY]](p4) + ; SI: $vgpr0_vgpr1 = COPY [[BITCAST]](p0) %0:_(p4) = COPY $vgpr0_vgpr1 %1:_(p0) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -92,6 +109,10 @@ body: | ; GFX9: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 ; GFX9: [[BITCAST:%[0-9]+]]:_(p999) = G_BITCAST [[COPY]](p0) ; GFX9: $vgpr0_vgpr1 = COPY [[BITCAST]](p999) + ; SI-LABEL: name: test_addrspacecast_p0_to_p999 + ; SI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; SI: [[BITCAST:%[0-9]+]]:_(p999) = G_BITCAST [[COPY]](p0) + ; SI: $vgpr0_vgpr1 = COPY [[BITCAST]](p999) %0:_(p0) = COPY $vgpr0_vgpr1 %1:_(p999) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -111,6 +132,10 @@ body: | ; GFX9: [[COPY:%[0-9]+]]:_(p999) = COPY $vgpr0_vgpr1 ; GFX9: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[COPY]](p999) ; GFX9: $vgpr0_vgpr1 = COPY [[BITCAST]](p0) + ; SI-LABEL: name: test_addrspacecast_p999_to_p0 + ; SI: [[COPY:%[0-9]+]]:_(p999) = COPY $vgpr0_vgpr1 + ; SI: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[COPY]](p999) + ; SI: $vgpr0_vgpr1 = COPY [[BITCAST]](p0) %0:_(p999) = COPY $vgpr0_vgpr1 %1:_(p0) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -147,6 +172,10 @@ body: | ; GFX9: [[MV:%[0-9]+]]:_(p0) = G_MERGE_VALUES [[PTRTOINT]](s32), [[SHL]](s32) ; GFX9: [[SELECT:%[0-9]+]]:_(p0) = G_SELECT [[ICMP]](s1), [[MV]], [[C1]] ; GFX9: $vgpr0_vgpr1 = COPY [[SELECT]](p0) + ; SI-LABEL: name: test_addrspacecast_p5_to_p0 + ; SI: [[COPY:%[0-9]+]]:_(p5) = COPY $vgpr0 + ; SI: [[ADDRSPACE_CAST:%[0-9]+]]:_(p0) = G_ADDRSPACE_CAST [[COPY]](p5) + ; SI: $vgpr0_vgpr1 = COPY [[ADDRSPACE_CAST]](p0) %0:_(p5) = COPY $vgpr0 %1:_(p0) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -174,6 +203,14 @@ body: | ; GFX9: [[ICMP:%[0-9]+]]:_(s1) = G_ICMP intpred(ne), [[COPY]](p0), [[C1]] ; GFX9: [[SELECT:%[0-9]+]]:_(p5) = G_SELECT [[ICMP]](s1), [[EXTRACT]], [[C]] ; GFX9: $vgpr0 = COPY [[SELECT]](p5) + ; SI-LABEL: name: test_addrspacecast_p0_to_p5 + ; SI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; SI: [[C:%[0-9]+]]:_(p5) = G_CONSTANT i32 0 + ; SI: [[C1:%[0-9]+]]:_(p0) = G_CONSTANT i64 0 + ; SI: [[EXTRACT:%[0-9]+]]:_(p5) = G_EXTRACT [[COPY]](p0), 0 + ; SI: [[ICMP:%[0-9]+]]:_(s1) = G_ICMP intpred(ne), [[COPY]](p0), [[C1]] + ; SI: [[SELECT:%[0-9]+]]:_(p5) = G_SELECT [[ICMP]](s1), [[EXTRACT]], [[C]] + ; SI: $vgpr0 = COPY [[SELECT]](p5) %0:_(p0) = COPY $vgpr0_vgpr1 %1:_(p5) = G_ADDRSPACE_CAST %0 $vgpr0 = COPY %1 @@ -210,6 +247,10 @@ body: | ; GFX9: [[MV:%[0-9]+]]:_(p0) = G_MERGE_VALUES [[PTRTOINT]](s32), [[SHL]](s32) ; GFX9: [[SELECT:%[0-9]+]]:_(p0) = G_SELECT [[ICMP]](s1), [[MV]], [[C1]] ; GFX9: $vgpr0_vgpr1 = COPY [[SELECT]](p0) + ; SI-LABEL: name: test_addrspacecast_p3_to_p0 + ; SI: [[COPY:%[0-9]+]]:_(p3) = COPY $vgpr0 + ; SI: [[ADDRSPACE_CAST:%[0-9]+]]:_(p0) = G_ADDRSPACE_CAST [[COPY]](p3) + ; SI: $vgpr0_vgpr1 = COPY [[ADDRSPACE_CAST]](p0) %0:_(p3) = COPY $vgpr0 %1:_(p0) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -237,6 +278,14 @@ body: | ; GFX9: [[ICMP:%[0-9]+]]:_(s1) = G_ICMP intpred(ne), [[COPY]](p0), [[C1]] ; GFX9: [[SELECT:%[0-9]+]]:_(p3) = G_SELECT [[ICMP]](s1), [[EXTRACT]], [[C]] ; GFX9: $vgpr0 = COPY [[SELECT]](p3) + ; SI-LABEL: name: test_addrspacecast_p0_to_p3 + ; SI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; SI: [[C:%[0-9]+]]:_(p3) = G_CONSTANT i32 -1 + ; SI: [[C1:%[0-9]+]]:_(p0) = G_CONSTANT i64 0 + ; SI: [[EXTRACT:%[0-9]+]]:_(p3) = G_EXTRACT [[COPY]](p0), 0 + ; SI: [[ICMP:%[0-9]+]]:_(s1) = G_ICMP intpred(ne), [[COPY]](p0), [[C1]] + ; SI: [[SELECT:%[0-9]+]]:_(p3) = G_SELECT [[ICMP]](s1), [[EXTRACT]], [[C]] + ; SI: $vgpr0 = COPY [[SELECT]](p3) %0:_(p0) = COPY $vgpr0_vgpr1 %1:_(p3) = G_ADDRSPACE_CAST %0 $vgpr0 = COPY %1 @@ -262,6 +311,13 @@ body: | ; GFX9: [[BITCAST1:%[0-9]+]]:_(p1) = G_BITCAST [[UV1]](p0) ; GFX9: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p1>) = G_BUILD_VECTOR [[BITCAST]](p1), [[BITCAST1]](p1) ; GFX9: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY [[BUILD_VECTOR]](<2 x p1>) + ; SI-LABEL: name: test_addrspacecast_v2p0_to_v2p1 + ; SI: [[COPY:%[0-9]+]]:_(<2 x p0>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3 + ; SI: [[UV:%[0-9]+]]:_(p0), [[UV1:%[0-9]+]]:_(p0) = G_UNMERGE_VALUES [[COPY]](<2 x p0>) + ; SI: [[BITCAST:%[0-9]+]]:_(p1) = G_BITCAST [[UV]](p0) + ; SI: [[BITCAST1:%[0-9]+]]:_(p1) = G_BITCAST [[UV1]](p0) + ; SI: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p1>) = G_BUILD_VECTOR [[BITCAST]](p1), [[BITCAST1]](p1) + ; SI: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY [[BUILD_VECTOR]](<2 x p1>) %0:_(<2 x p0>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3 %1:_(<2 x p1>) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1_vgpr2_vgpr3 = COPY %1 @@ -287,6 +343,13 @@ body: | ; GFX9: [[BITCAST1:%[0-9]+]]:_(p0) = G_BITCAST [[UV1]](p1) ; GFX9: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p0>) = G_BUILD_VECTOR [[BITCAST]](p0), [[BITCAST1]](p0) ; GFX9: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY [[BUILD_VECTOR]](<2 x p0>) + ; SI-LABEL: name: test_addrspacecast_v2p1_to_v2p0 + ; SI: [[COPY:%[0-9]+]]:_(<2 x p1>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3 + ; SI: [[UV:%[0-9]+]]:_(p1), [[UV1:%[0-9]+]]:_(p1) = G_UNMERGE_VALUES [[COPY]](<2 x p1>) + ; SI: [[BITCAST:%[0-9]+]]:_(p0) = G_BITCAST [[UV]](p1) + ; SI: [[BITCAST1:%[0-9]+]]:_(p0) = G_BITCAST [[UV1]](p1) + ; SI: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p0>) = G_BUILD_VECTOR [[BITCAST]](p0), [[BITCAST1]](p0) + ; SI: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY [[BUILD_VECTOR]](<2 x p0>) %0:_(<2 x p1>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3 %1:_(<2 x p0>) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1_vgpr2_vgpr3 = COPY %1 @@ -324,6 +387,19 @@ body: | ; GFX9: [[SELECT1:%[0-9]+]]:_(p3) = G_SELECT [[ICMP1]](s1), [[EXTRACT1]], [[C]] ; GFX9: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p3>) = G_BUILD_VECTOR [[SELECT]](p3), [[SELECT1]](p3) ; GFX9: $vgpr0_vgpr1 = COPY [[BUILD_VECTOR]](<2 x p3>) + ; SI-LABEL: name: test_addrspacecast_v2p0_to_v2p3 + ; SI: [[COPY:%[0-9]+]]:_(<2 x p0>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3 + ; SI: [[UV:%[0-9]+]]:_(p0), [[UV1:%[0-9]+]]:_(p0) = G_UNMERGE_VALUES [[COPY]](<2 x p0>) + ; SI: [[C:%[0-9]+]]:_(p3) = G_CONSTANT i32 -1 + ; SI: [[C1:%[0-9]+]]:_(p0) = G_CONSTANT i64 0 + ; SI: [[EXTRACT:%[0-9]+]]:_(p3) = G_EXTRACT [[UV]](p0), 0 + ; SI: [[ICMP:%[0-9]+]]:_(s1) = G_ICMP intpred(ne), [[UV]](p0), [[C1]] + ; SI: [[SELECT:%[0-9]+]]:_(p3) = G_SELECT [[ICMP]](s1), [[EXTRACT]], [[C]] + ; SI: [[EXTRACT1:%[0-9]+]]:_(p3) = G_EXTRACT [[UV1]](p0), 0 + ; SI: [[ICMP1:%[0-9]+]]:_(s1) = G_ICMP intpred(ne), [[UV1]](p0), [[C1]] + ; SI: [[SELECT1:%[0-9]+]]:_(p3) = G_SELECT [[ICMP1]](s1), [[EXTRACT1]], [[C]] + ; SI: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p3>) = G_BUILD_VECTOR [[SELECT]](p3), [[SELECT1]](p3) + ; SI: $vgpr0_vgpr1 = COPY [[BUILD_VECTOR]](<2 x p3>) %0:_(<2 x p0>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3 %1:_(<2 x p3>) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1 = COPY %1 @@ -377,7 +453,140 @@ body: | ; GFX9: [[SELECT1:%[0-9]+]]:_(p0) = G_SELECT [[ICMP1]](s1), [[MV1]], [[C1]] ; GFX9: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p0>) = G_BUILD_VECTOR [[SELECT]](p0), [[SELECT1]](p0) ; GFX9: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY [[BUILD_VECTOR]](<2 x p0>) + ; SI-LABEL: name: test_addrspacecast_v2p3_to_v2p0 + ; SI: [[COPY:%[0-9]+]]:_(<2 x p3>) = COPY $vgpr0_vgpr1 + ; SI: [[UV:%[0-9]+]]:_(p3), [[UV1:%[0-9]+]]:_(p3) = G_UNMERGE_VALUES [[COPY]](<2 x p3>) + ; SI: [[ADDRSPACE_CAST:%[0-9]+]]:_(p0) = G_ADDRSPACE_CAST [[UV]](p3) + ; SI: [[ADDRSPACE_CAST1:%[0-9]+]]:_(p0) = G_ADDRSPACE_CAST [[UV1]](p3) + ; SI: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x p0>) = G_BUILD_VECTOR [[ADDRSPACE_CAST]](p0), [[ADDRSPACE_CAST1]](p0) + ; SI: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY [[BUILD_VECTOR]](<2 x p0>) %0:_(<2 x p3>) = COPY $vgpr0_vgpr1 %1:_(<2 x p0>) = G_ADDRSPACE_CAST %0 $vgpr0_vgpr1_vgpr2_vgpr3 = COPY %1 ... + +--- +name: test_addrspacecast_p4_to_p6 +body: | + bb.0: + liveins: $vgpr0_vgpr1 + + ; VI-LABEL: name: test_addrspacecast_p4_to_p6 + ; VI: [[COPY:%[0-9]+]]:_(p4) = COPY $vgpr0_vgpr1 + ; VI: [[EXTRACT:%[0-9]+]]:_(p6) = G_EXTRACT [[COPY]](p4), 0 + ; VI: $vgpr0 = COPY [[EXTRACT]](p6) + ; GFX9-LABEL: name: test_addrspacecast_p4_to_p6 + ; GFX9: [[COPY:%[0-9]+]]:_(p4) = COPY $vgpr0_vgpr1 + ; GFX9: [[EXTRACT:%[0-9]+]]:_(p6) = G_EXTRACT [[COPY]](p4), 0 + ; GFX9: $vgpr0 = COPY [[EXTRACT]](p6) + ; SI-LABEL: name: test_addrspacecast_p4_to_p6 + ; SI: [[COPY:%[0-9]+]]:_(p4) = COPY $vgpr0_vgpr1 + ; SI: [[EXTRACT:%[0-9]+]]:_(p6) = G_EXTRACT [[COPY]](p4), 0 + ; SI: $vgpr0 = COPY [[EXTRACT]](p6) + %0:_(p4) = COPY $vgpr0_vgpr1 + %1:_(p6) = G_ADDRSPACE_CAST %0 + $vgpr0 = COPY %1 +... + +--- +name: test_addrspacecast_p6_to_p4_0 +body: | + bb.0: + liveins: $vgpr0 + + ; VI-LABEL: name: test_addrspacecast_p6_to_p4_0 + ; VI: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; VI: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 0 + ; VI: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; VI: $vgpr0_vgpr1 = COPY [[MV]](p4) + ; GFX9-LABEL: name: test_addrspacecast_p6_to_p4_0 + ; GFX9: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; GFX9: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 0 + ; GFX9: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; GFX9: $vgpr0_vgpr1 = COPY [[MV]](p4) + ; SI-LABEL: name: test_addrspacecast_p6_to_p4_0 + ; SI: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; SI: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 0 + ; SI: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; SI: $vgpr0_vgpr1 = COPY [[MV]](p4) + %0:_(p6) = COPY $vgpr0 + %1:_(p4) = G_ADDRSPACE_CAST %0 + $vgpr0_vgpr1 = COPY %1 +... + +--- +name: test_addrspacecast_p6_to_p4_0xdeadbeef +machineFunctionInfo: + highBitsOf32BitAddress: 0xdeadbeef +body: | + bb.0: + liveins: $vgpr0 + + ; VI-LABEL: name: test_addrspacecast_p6_to_p4_0xdeadbeef + ; VI: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; VI: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 -559038737 + ; VI: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; VI: $vgpr0_vgpr1 = COPY [[MV]](p4) + ; GFX9-LABEL: name: test_addrspacecast_p6_to_p4_0xdeadbeef + ; GFX9: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; GFX9: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 -559038737 + ; GFX9: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; GFX9: $vgpr0_vgpr1 = COPY [[MV]](p4) + ; SI-LABEL: name: test_addrspacecast_p6_to_p4_0xdeadbeef + ; SI: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; SI: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 -559038737 + ; SI: [[MV:%[0-9]+]]:_(p4) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; SI: $vgpr0_vgpr1 = COPY [[MV]](p4) + %0:_(p6) = COPY $vgpr0 + %1:_(p4) = G_ADDRSPACE_CAST %0 + $vgpr0_vgpr1 = COPY %1 +... + +--- +name: test_addrspacecast_p0_to_p6 +body: | + bb.0: + liveins: $vgpr0_vgpr1 + + ; VI-LABEL: name: test_addrspacecast_p0_to_p6 + ; VI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; VI: [[EXTRACT:%[0-9]+]]:_(p6) = G_EXTRACT [[COPY]](p0), 0 + ; VI: $vgpr0 = COPY [[EXTRACT]](p6) + ; GFX9-LABEL: name: test_addrspacecast_p0_to_p6 + ; GFX9: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; GFX9: [[EXTRACT:%[0-9]+]]:_(p6) = G_EXTRACT [[COPY]](p0), 0 + ; GFX9: $vgpr0 = COPY [[EXTRACT]](p6) + ; SI-LABEL: name: test_addrspacecast_p0_to_p6 + ; SI: [[COPY:%[0-9]+]]:_(p0) = COPY $vgpr0_vgpr1 + ; SI: [[EXTRACT:%[0-9]+]]:_(p6) = G_EXTRACT [[COPY]](p0), 0 + ; SI: $vgpr0 = COPY [[EXTRACT]](p6) + %0:_(p0) = COPY $vgpr0_vgpr1 + %1:_(p6) = G_ADDRSPACE_CAST %0 + $vgpr0 = COPY %1 +... + +--- +name: test_addrspacecast_p6_to_p0 +body: | + bb.0: + liveins: $vgpr0 + + ; VI-LABEL: name: test_addrspacecast_p6_to_p0 + ; VI: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; VI: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 0 + ; VI: [[MV:%[0-9]+]]:_(p0) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; VI: $vgpr0_vgpr1 = COPY [[MV]](p0) + ; GFX9-LABEL: name: test_addrspacecast_p6_to_p0 + ; GFX9: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; GFX9: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 0 + ; GFX9: [[MV:%[0-9]+]]:_(p0) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; GFX9: $vgpr0_vgpr1 = COPY [[MV]](p0) + ; SI-LABEL: name: test_addrspacecast_p6_to_p0 + ; SI: [[COPY:%[0-9]+]]:_(p6) = COPY $vgpr0 + ; SI: [[C:%[0-9]+]]:_(p6) = G_CONSTANT i32 0 + ; SI: [[MV:%[0-9]+]]:_(p0) = G_MERGE_VALUES [[COPY]](p6), [[C]](p6) + ; SI: $vgpr0_vgpr1 = COPY [[MV]](p0) + %0:_(p6) = COPY $vgpr0 + %1:_(p0) = G_ADDRSPACE_CAST %0 + $vgpr0_vgpr1 = COPY %1 +... diff --git a/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir b/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir index 06d513edfeb012..2cb3bd446ee13e 100644 --- a/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir +++ b/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir @@ -1,4 +1,4 @@ -# RUN: llc -debug-entry-values -mtriple=x86_64-apple-darwin -o %t %s -filetype=obj +# RUN: llc -debug-entry-values -start-before=livedebugvalues -mtriple=x86_64-apple-darwin -o %t %s -filetype=obj # RUN: llvm-dwarfdump %t | FileCheck %s # # int global; diff --git a/llvm/test/LTO/Resolution/X86/Inputs/alias-1.ll b/llvm/test/LTO/Resolution/X86/Inputs/alias-1.ll index bc54680fa1918b..01c9987fd3f9d8 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/alias-1.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/alias-1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = global i32 42 diff --git a/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll b/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll index 4ee753e403f400..956deabcfc88de 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/alias-alias-1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = external global i32 diff --git a/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll b/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll index 1cd01d789d3baf..29bc8433d3e481 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/appending-var-2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" = type { i8 } diff --git a/llvm/test/LTO/Resolution/X86/Inputs/comdat-mixed-lto.ll b/llvm/test/LTO/Resolution/X86/Inputs/comdat-mixed-lto.ll index b2f901cb0a1e95..0112b89f98dbe0 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/comdat-mixed-lto.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/comdat-mixed-lto.ll @@ -1,6 +1,6 @@ ; ModuleID = 'comdat-mixed-lto1.o' source_filename = "comdat-mixed-lto1.cpp" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %"class.Test::ptr" = type { i32 } diff --git a/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll b/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll index 52cadf39a318f0..ca4bbb4bf81efd 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/comdat.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/Inputs/common2.ll b/llvm/test/LTO/Resolution/X86/Inputs/common2.ll index 3a4c631ad65571..c3a7f753684dd1 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/common2.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/common2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/Inputs/commons.ll b/llvm/test/LTO/Resolution/X86/Inputs/commons.ll index 9ff7de26ab9048..9372600d03de3e 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/commons.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/commons.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @x = global i32 42, align 4 diff --git a/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-alias.ll b/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-alias.ll index b32d5b0f236124..16154d2c45b39b 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-alias.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-alias.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @external = global i8 42 diff --git a/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll b/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll index cfe1544a6b9aad..cc508924c6735d 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/dead-strip-fulllto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @live1() { diff --git a/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll b/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll index 82a7c2e31451b5..52ee296b18bb01 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/intrinsic.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = type { } declare <4 x %foo*> @llvm.masked.load.v4p0foo.p0v4p0foo(<4 x %foo*>*, i32, <4 x i1>, <4 x %foo*>) diff --git a/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-ae.ll b/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-ae.ll index 1b8064a8d0387c..f2d180afc82dec 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-ae.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-ae.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 available_externally i32 @f() { diff --git a/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-odr.ll b/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-odr.ll index 312b3ad1e0caf6..76e745a444fedc 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-odr.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/link-odr-availextern-odr.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 linkonce_odr i32 @f() { diff --git a/llvm/test/LTO/Resolution/X86/Inputs/mixed_lto.ll b/llvm/test/LTO/Resolution/X86/Inputs/mixed_lto.ll index ec561362ade3b6..2393deb3241450 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/mixed_lto.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/mixed_lto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/Inputs/mod-asm-used.ll b/llvm/test/LTO/Resolution/X86/Inputs/mod-asm-used.ll index c3b08ed605bbb7..3b1988bb54d0e2 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/mod-asm-used.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/mod-asm-used.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 1, align 4 diff --git a/llvm/test/LTO/Resolution/X86/Inputs/not-prevailing.ll b/llvm/test/LTO/Resolution/X86/Inputs/not-prevailing.ll index 7986919be341c7..68b3c8362808e7 100644 --- a/llvm/test/LTO/Resolution/X86/Inputs/not-prevailing.ll +++ b/llvm/test/LTO/Resolution/X86/Inputs/not-prevailing.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() { diff --git a/llvm/test/LTO/Resolution/X86/alias-alias.ll b/llvm/test/LTO/Resolution/X86/alias-alias.ll index a8489112ae99e2..eaf2615b0a01ac 100644 --- a/llvm/test/LTO/Resolution/X86/alias-alias.ll +++ b/llvm/test/LTO/Resolution/X86/alias-alias.ll @@ -19,7 +19,7 @@ ; RES-NEXT: {{^}}-r={{.*}}2.o,a,{{$}} ; RES-NEXT: {{^}}-r={{.*}}2.o,d,px{{$}} -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = weak alias i32, i32* @b diff --git a/llvm/test/LTO/Resolution/X86/alias.ll b/llvm/test/LTO/Resolution/X86/alias.ll index f565e4d234cd93..886eadcfc82e28 100644 --- a/llvm/test/LTO/Resolution/X86/alias.ll +++ b/llvm/test/LTO/Resolution/X86/alias.ll @@ -15,7 +15,7 @@ ; RES: {{^}}-r={{.*}}1.o,b,px{{$}} ; RES: {{^}}-r={{.*}}1.o,a,{{$}} -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = weak alias i32, i32* @b diff --git a/llvm/test/LTO/Resolution/X86/appending-var.ll b/llvm/test/LTO/Resolution/X86/appending-var.ll index 684e64129d65f4..4d259d7f8db7e9 100644 --- a/llvm/test/LTO/Resolution/X86/appending-var.ll +++ b/llvm/test/LTO/Resolution/X86/appending-var.ll @@ -7,7 +7,7 @@ ; RUN: llvm-lto2 run -o %t3.o %t1.o %t2.o -r %t1.o,bar, -r %t2.o,bar,px -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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.1" = type { i8, i8 } diff --git a/llvm/test/LTO/Resolution/X86/asm-output.ll b/llvm/test/LTO/Resolution/X86/asm-output.ll index 7f15cecc8d0440..41d293501dd10a 100644 --- a/llvm/test/LTO/Resolution/X86/asm-output.ll +++ b/llvm/test/LTO/Resolution/X86/asm-output.ll @@ -9,7 +9,7 @@ ; ; ASM: main: -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() { diff --git a/llvm/test/LTO/Resolution/X86/available-externally.ll b/llvm/test/LTO/Resolution/X86/available-externally.ll index ac35b15b3710e1..eb17693c0a9419 100644 --- a/llvm/test/LTO/Resolution/X86/available-externally.ll +++ b/llvm/test/LTO/Resolution/X86/available-externally.ll @@ -4,7 +4,7 @@ ; CHECK: U bar -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ()* @foo() { diff --git a/llvm/test/LTO/Resolution/X86/cache-dso-local.ll b/llvm/test/LTO/Resolution/X86/cache-dso-local.ll index 6ed8e056b2ccc3..5e5b94cc94b465 100644 --- a/llvm/test/LTO/Resolution/X86/cache-dso-local.ll +++ b/llvm/test/LTO/Resolution/X86/cache-dso-local.ll @@ -10,7 +10,7 @@ ; RUN: -r %t.bc,bar,px ; RUN: ls %t.cache | count 2 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 weak void @foo() { diff --git a/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll b/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll index 2316cbfdc5d9f5..3a6c15e52aa85c 100644 --- a/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll +++ b/llvm/test/LTO/Resolution/X86/cache-dso-local2.ll @@ -10,7 +10,7 @@ ; RUN: -r %t.bc,bar,px ; RUN: ls %t.cache | count 2 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 weak void @foo() { diff --git a/llvm/test/LTO/Resolution/X86/cache-prevailing.ll b/llvm/test/LTO/Resolution/X86/cache-prevailing.ll index 72a1d4e6f53104..57687492e1d160 100644 --- a/llvm/test/LTO/Resolution/X86/cache-prevailing.ll +++ b/llvm/test/LTO/Resolution/X86/cache-prevailing.ll @@ -7,7 +7,7 @@ ; RUN: -r %t.bc,foo, -r %t.bc,bar,px ; RUN: ls %t.cache | count 2 -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.11.0" @foo = linkonce constant i32 1, comdat diff --git a/llvm/test/LTO/Resolution/X86/comdat-mixed-lto.ll b/llvm/test/LTO/Resolution/X86/comdat-mixed-lto.ll index d3730f4e9bcda1..d6022c643519fd 100644 --- a/llvm/test/LTO/Resolution/X86/comdat-mixed-lto.ll +++ b/llvm/test/LTO/Resolution/X86/comdat-mixed-lto.ll @@ -21,7 +21,7 @@ ; ModuleID = 'comdat-mixed-lto.o' source_filename = "comdat-mixed-lto.cpp" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %"class.Test::ptr" = type { i32 } diff --git a/llvm/test/LTO/Resolution/X86/comdat.ll b/llvm/test/LTO/Resolution/X86/comdat.ll index 06b61b7edf8bcc..3a0c673c6a220d 100644 --- a/llvm/test/LTO/Resolution/X86/comdat.ll +++ b/llvm/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-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/common2.ll b/llvm/test/LTO/Resolution/X86/common2.ll index c0447b75b823a4..de702d0570018b 100644 --- a/llvm/test/LTO/Resolution/X86/common2.ll +++ b/llvm/test/LTO/Resolution/X86/common2.ll @@ -52,7 +52,7 @@ ; RUN: -r %t2.bc,bar,px ; RUN: llvm-dis < %t.o.0.0.preopt.bc | FileCheck %s --check-prefix=NONE-PREVAILED2 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/commons.ll b/llvm/test/LTO/Resolution/X86/commons.ll index 1ccb5ed57dedd0..8adfb87d6edf50 100644 --- a/llvm/test/LTO/Resolution/X86/commons.ll +++ b/llvm/test/LTO/Resolution/X86/commons.ll @@ -6,7 +6,7 @@ ; A strong definition should override the common ; CHECK: @x = dso_local global i32 42, align 4 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @x = common global i16 0, align 2 diff --git a/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll b/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll index d62621acc8e151..fc5554c34a81b8 100644 --- a/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll +++ b/llvm/test/LTO/Resolution/X86/dead-strip-alias.ll @@ -7,7 +7,7 @@ ; CHECK: D external -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @alias = alias i8*, i8** @internal diff --git a/llvm/test/LTO/Resolution/X86/dead-strip-fulllto.ll b/llvm/test/LTO/Resolution/X86/dead-strip-fulllto.ll index 9a5dd998380d06..11a8981aceb0a3 100644 --- a/llvm/test/LTO/Resolution/X86/dead-strip-fulllto.ll +++ b/llvm/test/LTO/Resolution/X86/dead-strip-fulllto.ll @@ -23,7 +23,7 @@ ; THIN: U live2 ; THIN-NOT: odr -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @main() { diff --git a/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll b/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll index 33e345f65a3155..9932f527dc602a 100644 --- a/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll +++ b/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks-with-hotness.ll @@ -35,7 +35,7 @@ ; CHECK: tinkywinky inlined into main with (cost=-15000, threshold=337) (hotness: 300) -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" declare i32 @patatino() diff --git a/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll b/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll index bc3227017f9b66..beb0f4fa49b866 100644 --- a/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll +++ b/llvm/test/LTO/Resolution/X86/diagnostic-handler-remarks.ll @@ -36,7 +36,7 @@ ; YAML-NEXT: - String: ')' ; YAML-NEXT: ... -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" declare i32 @patatino() diff --git a/llvm/test/LTO/Resolution/X86/export-jumptable.ll b/llvm/test/LTO/Resolution/X86/export-jumptable.ll index ec23d15591386c..8ced9d96292352 100644 --- a/llvm/test/LTO/Resolution/X86/export-jumptable.ll +++ b/llvm/test/LTO/Resolution/X86/export-jumptable.ll @@ -6,7 +6,7 @@ ; RUN: llvm-lto2 run -o %t2 -r %t,f1,p -r %t,f2,p -r %t,_start,px %t -save-temps ; RUN: llvm-dis %t2.1.2.internalize.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: define void @f1() diff --git a/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll b/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll index cc793f64d9d6ff..ab2cefebb42bf7 100644 --- a/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll +++ b/llvm/test/LTO/Resolution/X86/function-alias-non-prevailing.ll @@ -2,7 +2,7 @@ ; RUN: llvm-lto2 run %t -r %t,foo, -r %t,baz,p -o %t2 -save-temps ; RUN: llvm-dis -o - %t2.0.0.preopt.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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--fuchsia" ; CHECK: declare void @foo() diff --git a/llvm/test/LTO/Resolution/X86/ifunc.ll b/llvm/test/LTO/Resolution/X86/ifunc.ll index 5a437fddbcb48a..c77f1068241be0 100644 --- a/llvm/test/LTO/Resolution/X86/ifunc.ll +++ b/llvm/test/LTO/Resolution/X86/ifunc.ll @@ -4,7 +4,7 @@ ; CHECK: T foo ; CHECK: t foo_ifunc -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = ifunc i32 (i32), i64 ()* @foo_ifunc diff --git a/llvm/test/LTO/Resolution/X86/intrinsic.ll b/llvm/test/LTO/Resolution/X86/intrinsic.ll index 597953155fe5fd..dc287ace0f8791 100644 --- a/llvm/test/LTO/Resolution/X86/intrinsic.ll +++ b/llvm/test/LTO/Resolution/X86/intrinsic.ll @@ -2,7 +2,7 @@ ; RUN: llvm-as %p/Inputs/intrinsic.ll -o %t2.o ; RUN: llvm-lto2 run -o %t3.o %t1.o %t2.o -r %t1.o,foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = type { } declare void @foo( %foo* ) diff --git a/llvm/test/LTO/Resolution/X86/link-odr-availextern.ll b/llvm/test/LTO/Resolution/X86/link-odr-availextern.ll index cb522bfe7f90d4..cc360338d6d1d0 100644 --- a/llvm/test/LTO/Resolution/X86/link-odr-availextern.ll +++ b/llvm/test/LTO/Resolution/X86/link-odr-availextern.ll @@ -26,7 +26,7 @@ ; RUN: llvm-lto2 run -o %t3 %t2odr %t1 -r %t1,f, -r %t2odr,f, -save-temps ; RUN: llvm-dis < %t3.0.0.preopt.bc -o - | FileCheck --check-prefix=NONPREVAILING %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; PREVAILING: define weak_odr i32 @f() diff --git a/llvm/test/LTO/Resolution/X86/linker-redef-thin.ll b/llvm/test/LTO/Resolution/X86/linker-redef-thin.ll index d965452ba5725f..4625ce3fa0cdbc 100644 --- a/llvm/test/LTO/Resolution/X86/linker-redef-thin.ll +++ b/llvm/test/LTO/Resolution/X86/linker-redef-thin.ll @@ -8,7 +8,7 @@ ; CHECK-NEXT: Binding: Weak ; CHECK-NEXT: Type: Function -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() { diff --git a/llvm/test/LTO/Resolution/X86/linker-redef.ll b/llvm/test/LTO/Resolution/X86/linker-redef.ll index 73301e9e614927..b53f811e4cd8fa 100644 --- a/llvm/test/LTO/Resolution/X86/linker-redef.ll +++ b/llvm/test/LTO/Resolution/X86/linker-redef.ll @@ -8,7 +8,7 @@ ; CHECK-NEXT: Binding: Weak ; CHECK-NEXT: Type: Function -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() { diff --git a/llvm/test/LTO/Resolution/X86/linkonce.ll b/llvm/test/LTO/Resolution/X86/linkonce.ll index a52c4451a43b5a..fbbb458b92d082 100644 --- a/llvm/test/LTO/Resolution/X86/linkonce.ll +++ b/llvm/test/LTO/Resolution/X86/linkonce.ll @@ -2,7 +2,7 @@ ; RUN: llvm-lto2 run %t -O0 -r %t,foo,px -o %t2 ; RUN: llvm-nm %t2.1 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: W foo diff --git a/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll b/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll index 2c8549c388ea53..79f9c1e9b7641e 100644 --- a/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll +++ b/llvm/test/LTO/Resolution/X86/load-sample-prof-icp.ll @@ -11,7 +11,7 @@ ; RUN: -lto-sample-profile-file=%S/Inputs/load-sample-prof-icp.prof ; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK-LABEL: @test diff --git a/llvm/test/LTO/Resolution/X86/load-sample-prof-lto.ll b/llvm/test/LTO/Resolution/X86/load-sample-prof-lto.ll index 47287d16425e39..bdf4f08dba1781 100644 --- a/llvm/test/LTO/Resolution/X86/load-sample-prof-lto.ll +++ b/llvm/test/LTO/Resolution/X86/load-sample-prof-lto.ll @@ -17,7 +17,7 @@ ; Make sure profile information is attached. ; CHECK: !prof -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() local_unnamed_addr !dbg !7 { diff --git a/llvm/test/LTO/Resolution/X86/load-sample-prof.ll b/llvm/test/LTO/Resolution/X86/load-sample-prof.ll index 8d09cc7327fecc..2f9d66e6941db9 100644 --- a/llvm/test/LTO/Resolution/X86/load-sample-prof.ll +++ b/llvm/test/LTO/Resolution/X86/load-sample-prof.ll @@ -8,7 +8,7 @@ ; ; CHECK: !prof -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() local_unnamed_addr !dbg !7 { diff --git a/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll b/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll index 4c70e72803e699..c97e4b7e14c147 100644 --- a/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll +++ b/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll @@ -7,7 +7,7 @@ ; RUN: -save-temps -o %t1 %t0.bc ; RUN: llvm-dis %t1.1.3.import.bc -o - | FileCheck %s source_filename = "test.cpp" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $g = comdat any diff --git a/llvm/test/LTO/Resolution/X86/lowertypetests.ll b/llvm/test/LTO/Resolution/X86/lowertypetests.ll index 8016a66fb015dd..e5be4b98cbf4ed 100644 --- a/llvm/test/LTO/Resolution/X86/lowertypetests.ll +++ b/llvm/test/LTO/Resolution/X86/lowertypetests.ll @@ -8,7 +8,7 @@ ; CHECK: U __typeid_bar_global_addr ; CHECK: U __typeid_foo_global_addr -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/lto-unit-check.ll b/llvm/test/LTO/Resolution/X86/lto-unit-check.ll index de638c1ebb8fa8..1736a5b216aedd 100644 --- a/llvm/test/LTO/Resolution/X86/lto-unit-check.ll +++ b/llvm/test/LTO/Resolution/X86/lto-unit-check.ll @@ -51,5 +51,5 @@ ; ENABLESPLITFLAG: !{i32 1, !"EnableSplitLTOUnit", i32 1} ; NOENABLESPLITFLAG-NOT: !{i32 1, !"EnableSplitLTOUnit", i32 1} -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/llvm/test/LTO/Resolution/X86/mixed_lto.ll b/llvm/test/LTO/Resolution/X86/mixed_lto.ll index 8e5620b709df85..aa686a8114c960 100644 --- a/llvm/test/LTO/Resolution/X86/mixed_lto.ll +++ b/llvm/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-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/LTO/Resolution/X86/mod-asm-used.ll b/llvm/test/LTO/Resolution/X86/mod-asm-used.ll index 245ff429225c04..8e02b6a444ab73 100644 --- a/llvm/test/LTO/Resolution/X86/mod-asm-used.ll +++ b/llvm/test/LTO/Resolution/X86/mod-asm-used.ll @@ -7,7 +7,7 @@ ; INDEX: ^0 = module: (path: "{{.*}}mod-asm-used.ll.tmp.bc" ; INDEX: ^1 = module: (path: "{{.*}}mod-asm-used.ll.tmp2.bc" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; CHECK: D foo diff --git a/llvm/test/LTO/Resolution/X86/multi-thinlto.ll b/llvm/test/LTO/Resolution/X86/multi-thinlto.ll index e782b4fd8ad29d..06150e44a1670a 100644 --- a/llvm/test/LTO/Resolution/X86/multi-thinlto.ll +++ b/llvm/test/LTO/Resolution/X86/multi-thinlto.ll @@ -3,5 +3,5 @@ ; RUN: not llvm-lto2 run -o %t3.o %t2.o 2>&1 | FileCheck %s ; CHECK: Expected at most one ThinLTO module per bitcode file -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll b/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll index 9d116472559136..79770c5cf4cb41 100644 --- a/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll +++ b/llvm/test/LTO/Resolution/X86/not-prevailing-alias.ll @@ -25,7 +25,7 @@ ; SYMBOLS: NOTYPE GLOBAL DEFAULT UND varAlias ; SYMBOLS: FUNC GLOBAL DEFAULT 2 zed -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @barAlias = alias void(), void()* @bar diff --git a/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll b/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll index 9a7131b642d153..6d22baf351d750 100644 --- a/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll +++ b/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll @@ -19,7 +19,7 @@ ; RUN: llvm-readelf --symbols %t2.o.1 | FileCheck %s --check-prefix=UND ; UND: NOTYPE GLOBAL DEFAULT UND var2 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @var1 = global i32 10, align 4 diff --git a/llvm/test/LTO/Resolution/X86/not-prevailing.ll b/llvm/test/LTO/Resolution/X86/not-prevailing.ll index fb68b01698c579..58c7724724266b 100644 --- a/llvm/test/LTO/Resolution/X86/not-prevailing.ll +++ b/llvm/test/LTO/Resolution/X86/not-prevailing.ll @@ -21,7 +21,7 @@ ; SYMBOLS: NOTYPE GLOBAL DEFAULT UND foo ; SYMBOLS: FUNC GLOBAL DEFAULT 2 zed -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = comdat any diff --git a/llvm/test/LTO/Resolution/X86/setting-dso-local.ll b/llvm/test/LTO/Resolution/X86/setting-dso-local.ll index bd9351e915118d..817a8181ff6acd 100644 --- a/llvm/test/LTO/Resolution/X86/setting-dso-local.ll +++ b/llvm/test/LTO/Resolution/X86/setting-dso-local.ll @@ -6,7 +6,7 @@ ; CHECK: 0000000000000000 0 NOTYPE GLOBAL HIDDEN UND foobar -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @foobar = external hidden global i32 diff --git a/llvm/test/LTO/Resolution/X86/symtab-elf.ll b/llvm/test/LTO/Resolution/X86/symtab-elf.ll index 229151179923d6..40864a82dd0861 100644 --- a/llvm/test/LTO/Resolution/X86/symtab-elf.ll +++ b/llvm/test/LTO/Resolution/X86/symtab-elf.ll @@ -3,7 +3,7 @@ ; CHECK: target triple: x86_64-unknown-linux-gnu target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" ; CHECK-NOT: linker opts: !0 = !{!"/include:foo"} diff --git a/llvm/test/LTO/Resolution/X86/type-checked-load.ll b/llvm/test/LTO/Resolution/X86/type-checked-load.ll index 726dc970195f3f..3ec783bc56535c 100644 --- a/llvm/test/LTO/Resolution/X86/type-checked-load.ll +++ b/llvm/test/LTO/Resolution/X86/type-checked-load.ll @@ -5,7 +5,7 @@ ; It means that the wholeprogramdevirt pass must have run and lowered ; the llvm.type.checked.load call. -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 {i8*, i1} @foo(i8* %ptr) { diff --git a/llvm/test/LTO/X86/Inputs/codemodel-3.ll b/llvm/test/LTO/X86/Inputs/codemodel-3.ll index a5ec5728092727..7b264af6f48dc1 100644 --- a/llvm/test/LTO/X86/Inputs/codemodel-3.ll +++ b/llvm/test/LTO/X86/Inputs/codemodel-3.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" !llvm.module.flags = !{!0, !1} diff --git a/llvm/test/LTO/X86/Inputs/dllimport.ll b/llvm/test/LTO/X86/Inputs/dllimport.ll index f3daab1df09742..b1914bebf1559e 100644 --- a/llvm/test/LTO/X86/Inputs/dllimport.ll +++ b/llvm/test/LTO/X86/Inputs/dllimport.ll @@ -1,6 +1,6 @@ ; ModuleID = 'b.obj' source_filename = "b.cpp" -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.11.0" ; Function Attrs: norecurse nounwind readnone sspstrong uwtable diff --git a/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll b/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll index e213c2155c239a..b216ed04cef33b 100644 --- a/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll +++ b/llvm/test/LTO/X86/Inputs/remangle_intrinsics_tbaa.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" %some_named_struct = type { i8, i8 } diff --git a/llvm/test/LTO/X86/Inputs/strip-debug-info-bar.ll b/llvm/test/LTO/X86/Inputs/strip-debug-info-bar.ll index be4322caa77fc6..4269886676b3ed 100644 --- a/llvm/test/LTO/X86/Inputs/strip-debug-info-bar.ll +++ b/llvm/test/LTO/X86/Inputs/strip-debug-info-bar.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.12" define void @bar() !dbg !3 { diff --git a/llvm/test/LTO/X86/Inputs/type-mapping-bug2.ll b/llvm/test/LTO/X86/Inputs/type-mapping-bug2.ll index e866cb712279eb..b58a1e953fbf02 100644 --- a/llvm/test/LTO/X86/Inputs/type-mapping-bug2.ll +++ b/llvm/test/LTO/X86/Inputs/type-mapping-bug2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @c() !dbg !6 { diff --git a/llvm/test/LTO/X86/codemodel-1.ll b/llvm/test/LTO/X86/codemodel-1.ll index 2c54ac31c7a799..ca89c94337663b 100644 --- a/llvm/test/LTO/X86/codemodel-1.ll +++ b/llvm/test/LTO/X86/codemodel-1.ll @@ -3,7 +3,7 @@ ; RUN: llvm-objdump -d %t.s.0 | FileCheck %s --check-prefix=CHECK-SMALL target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" !llvm.module.flags = !{!0, !1} diff --git a/llvm/test/LTO/X86/codemodel-2.ll b/llvm/test/LTO/X86/codemodel-2.ll index 1b61747c283d73..408c02a9ecf5e8 100644 --- a/llvm/test/LTO/X86/codemodel-2.ll +++ b/llvm/test/LTO/X86/codemodel-2.ll @@ -3,7 +3,7 @@ ; RUN: llvm-objdump -d %t.s.0 | FileCheck %s --check-prefix=CHECK-LARGE target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" !llvm.module.flags = !{!0, !1} diff --git a/llvm/test/LTO/X86/codemodel-3.ll b/llvm/test/LTO/X86/codemodel-3.ll index 9e03f84b6a0f74..987d37d22c1c29 100644 --- a/llvm/test/LTO/X86/codemodel-3.ll +++ b/llvm/test/LTO/X86/codemodel-3.ll @@ -3,7 +3,7 @@ ; RUN: not llvm-lto2 run -r %t0.o,_start,px -r %t1.o,bar,px %t0.o %t1.o -o %t2.s 2>&1 | FileCheck %s target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" !llvm.module.flags = !{!0, !1} diff --git a/llvm/test/LTO/X86/current-section.ll b/llvm/test/LTO/X86/current-section.ll index a54f09d8512a94..69f8bfaac3b0c8 100644 --- a/llvm/test/LTO/X86/current-section.ll +++ b/llvm/test/LTO/X86/current-section.ll @@ -2,7 +2,7 @@ ; RUN: llvm-lto -o %t2 %t1 ; REQUIRES: default_triple -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ".align 4" diff --git a/llvm/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll b/llvm/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll index 56ed420ff00532..d1dddf1a71f017 100644 --- a/llvm/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll +++ b/llvm/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll @@ -25,7 +25,7 @@ ; YAML-NEXT: - String: ')' ; YAML-NEXT: ... -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-darwin" declare i32 @bar() diff --git a/llvm/test/LTO/X86/diagnostic-handler-remarks.ll b/llvm/test/LTO/X86/diagnostic-handler-remarks.ll index 6af6d8637c2ef9..94f88ec43c5c71 100644 --- a/llvm/test/LTO/X86/diagnostic-handler-remarks.ll +++ b/llvm/test/LTO/X86/diagnostic-handler-remarks.ll @@ -61,7 +61,7 @@ ; YAML-NEXT: - String: ')' ; YAML-NEXT: ... -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-darwin" declare i32 @bar() diff --git a/llvm/test/LTO/X86/disable-verify.ll b/llvm/test/LTO/X86/disable-verify.ll index 68c2c9dd212799..e66ebac05ce425 100644 --- a/llvm/test/LTO/X86/disable-verify.ll +++ b/llvm/test/LTO/X86/disable-verify.ll @@ -2,7 +2,7 @@ ; RUN: llvm-lto -debug-pass=Arguments -exported-symbol=_f -o /dev/null %t.bc 2>&1 -disable-verify | FileCheck %s ; RUN: llvm-lto -debug-pass=Arguments -exported-symbol=_f -o /dev/null %t.bc 2>&1 | FileCheck %s -check-prefix=VERIFY -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.10.0" ; -disable-verify should disable verification from the optimization pipeline. diff --git a/llvm/test/LTO/X86/dllimport.ll b/llvm/test/LTO/X86/dllimport.ll index eb9f7df5c8b30a..4e2666817c46ff 100644 --- a/llvm/test/LTO/X86/dllimport.ll +++ b/llvm/test/LTO/X86/dllimport.ll @@ -9,7 +9,7 @@ ; ModuleID = 'a.obj' source_filename = "a.cpp" -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.11.0" ; Function Attrs: norecurse nounwind sspstrong uwtable diff --git a/llvm/test/LTO/X86/internalize.ll b/llvm/test/LTO/X86/internalize.ll index aa6aa652cdca2a..6b18aa7ded0371 100644 --- a/llvm/test/LTO/X86/internalize.ll +++ b/llvm/test/LTO/X86/internalize.ll @@ -30,7 +30,7 @@ ; INTERNALIZE2-OPTION-DISABLE: define dso_local void @foo ; INTERNALIZE2-OPTION-DISABLE: define dso_local void @bar -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @foo() { diff --git a/llvm/test/LTO/X86/no-undefined-puts-when-implemented.ll b/llvm/test/LTO/X86/no-undefined-puts-when-implemented.ll index 34d2544db45289..51e5eabd03f5af 100644 --- a/llvm/test/LTO/X86/no-undefined-puts-when-implemented.ll +++ b/llvm/test/LTO/X86/no-undefined-puts-when-implemented.ll @@ -5,7 +5,7 @@ ; rdar://problem/16165191 ; runtime library implementations should not be renamed -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-darwin11" @str = private unnamed_addr constant [13 x i8] c"hello world\0A\00" diff --git a/llvm/test/LTO/X86/objc-detection.ll b/llvm/test/LTO/X86/objc-detection.ll index 05de9446881afe..cdae8ab38ffbd5 100644 --- a/llvm/test/LTO/X86/objc-detection.ll +++ b/llvm/test/LTO/X86/objc-detection.ll @@ -3,7 +3,7 @@ ; CHECK: contains ObjC -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.12.0" %0 = type opaque diff --git a/llvm/test/LTO/X86/pr38046.ll b/llvm/test/LTO/X86/pr38046.ll index be5b88c592a84c..6743121b71562a 100644 --- a/llvm/test/LTO/X86/pr38046.ll +++ b/llvm/test/LTO/X86/pr38046.ll @@ -7,7 +7,7 @@ ; CHECK-NOT: Global is external, but doesn't have external or weak linkage -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/llvm/test/LTO/X86/private-symbol.ll b/llvm/test/LTO/X86/private-symbol.ll index 3f705fc841e423..e13a393442d3af 100644 --- a/llvm/test/LTO/X86/private-symbol.ll +++ b/llvm/test/LTO/X86/private-symbol.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s >%t1 ; RUN: llvm-lto -o %t2 %t1 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @.str = private unnamed_addr constant [7 x i8] c"hello\0A\00", align 1 diff --git a/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll b/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll index 30c27dfd5ec5a4..cac72f4330b3af 100644 --- a/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll +++ b/llvm/test/LTO/X86/remangle_intrinsics_tbaa.ll @@ -5,7 +5,7 @@ ; Verify that we correctly rename the intrinsic and don't crash ; CHECK: @llvm.masked.store.v4p0s_some_named_struct.0s.p0v4p0s_some_named_struct.0s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" %some_named_struct = type { i8 } diff --git a/llvm/test/LTO/X86/set-merged.ll b/llvm/test/LTO/X86/set-merged.ll index 56cbb4b2dce314..e6cc51fcfcf112 100644 --- a/llvm/test/LTO/X86/set-merged.ll +++ b/llvm/test/LTO/X86/set-merged.ll @@ -2,7 +2,7 @@ ; RUN: llvm-lto -exported-symbol=_main -set-merged-module -o %t2 %t1 ; RUN: llvm-objdump --print-imm-hex=false -d %t2 | FileCheck %s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.10.0" ; CHECK: _main diff --git a/llvm/test/LTO/X86/strip-debug-info-no-call-loc.ll b/llvm/test/LTO/X86/strip-debug-info-no-call-loc.ll index 00508aeaf8a493..6ef46974403f80 100644 --- a/llvm/test/LTO/X86/strip-debug-info-no-call-loc.ll +++ b/llvm/test/LTO/X86/strip-debug-info-no-call-loc.ll @@ -9,7 +9,7 @@ ; CHECK-WARN: warning{{.*}} ignoring invalid debug info ; CHECK: {{f$}} -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx" define void @h() #0 !dbg !7 { diff --git a/llvm/test/LTO/X86/strip-debug-info.ll b/llvm/test/LTO/X86/strip-debug-info.ll index 32a721dbea7ffe..f8db5a15fe9afc 100644 --- a/llvm/test/LTO/X86/strip-debug-info.ll +++ b/llvm/test/LTO/X86/strip-debug-info.ll @@ -29,7 +29,7 @@ ; CHECK-WARN: warning{{.*}} ignoring invalid debug info ; CHECK-WARN-NOT: Broken module found ; CHECK: foo -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.12" declare void @bar() diff --git a/llvm/test/LTO/X86/symver-asm.ll b/llvm/test/LTO/X86/symver-asm.ll index 0cb3d661d03950..85d032ba1abc28 100644 --- a/llvm/test/LTO/X86/symver-asm.ll +++ b/llvm/test/LTO/X86/symver-asm.ll @@ -5,7 +5,7 @@ ; RUN: llvm-nm %t3.0 | FileCheck %s ; RUN: llvm-dis %t3.0.2.internalize.bc -o - | FileCheck %s --check-prefix=INTERN -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ".symver io_cancel_0_4,io_cancel@@LIBAIO_0.4" diff --git a/llvm/test/LTO/X86/symver-asm2.ll b/llvm/test/LTO/X86/symver-asm2.ll index 5eca39d6f3d536..42d6e54bd06ae8 100644 --- a/llvm/test/LTO/X86/symver-asm2.ll +++ b/llvm/test/LTO/X86/symver-asm2.ll @@ -9,7 +9,7 @@ ; RUN: llvm-lto2 run -r %t1,_start,plx -r %t1,_start3,plx -r %t1,foo@@SOME_VERSION -r %t1,foo@SOME_VERSION3 -o %t3 %t1 -save-temps ; RUN: llvm-nm %t3.0 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ".global _start" diff --git a/llvm/test/LTO/X86/symver-asm3.ll b/llvm/test/LTO/X86/symver-asm3.ll index c64a9beb870ab4..0ae8f88c48946f 100644 --- a/llvm/test/LTO/X86/symver-asm3.ll +++ b/llvm/test/LTO/X86/symver-asm3.ll @@ -3,7 +3,7 @@ ; RUN: llvm-as < %s >%t1 ; RUN: llvm-nm %t1 | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 "foo1:" diff --git a/llvm/test/LTO/X86/tailcallelim.ll b/llvm/test/LTO/X86/tailcallelim.ll index 794e6031ebd878..2c3a9b52fa9c31 100644 --- a/llvm/test/LTO/X86/tailcallelim.ll +++ b/llvm/test/LTO/X86/tailcallelim.ll @@ -10,7 +10,7 @@ ; RUN: llvm-lto2 run -r %t1,foo,plx -r %t1,bar,plx -o %t4 %t1 -save-temps -use-new-pm ; RUN: llvm-dis < %t4.0.4.opt.bc | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/llvm/test/LTO/X86/triple-init.ll b/llvm/test/LTO/X86/triple-init.ll index 397587380ca50a..4c45dd1e75576e 100644 --- a/llvm/test/LTO/X86/triple-init.ll +++ b/llvm/test/LTO/X86/triple-init.ll @@ -11,7 +11,7 @@ ; RUN: llvm-lto2 run -r %t1,_pow, -r %t1,_main,plx -o %t2 %t1 ; RUN: llvm-nm %t2.1 | FileCheck %s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.9" declare double @pow(double, double) diff --git a/llvm/test/LTO/X86/triple-init2.ll b/llvm/test/LTO/X86/triple-init2.ll index 9e91498478cbdc..a6ff12d11fd62a 100644 --- a/llvm/test/LTO/X86/triple-init2.ll +++ b/llvm/test/LTO/X86/triple-init2.ll @@ -15,7 +15,7 @@ ; transformation on Windows. ; CHECK: U exp2f -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.11.0" define dso_local i32 @main(i32 %argc, i8** nocapture readnone %argv) local_unnamed_addr { diff --git a/llvm/test/LTO/X86/type-mapping-bug2.ll b/llvm/test/LTO/X86/type-mapping-bug2.ll index 967b68fa3ebb82..f14183f506f78e 100644 --- a/llvm/test/LTO/X86/type-mapping-bug2.ll +++ b/llvm/test/LTO/X86/type-mapping-bug2.ll @@ -4,7 +4,7 @@ ; ; Test for the issue described in https://bugs.llvm.org/show_bug.cgi?id=37684 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; T1 will be linked against T2 because T2 was already loaded in %t0.o due to diff --git a/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll b/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll index 88bc8335f5eed0..e55e40b1d05267 100644 --- a/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll +++ b/llvm/test/ThinLTO/X86/Inputs/alias_internal.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 internal i32 @f(i8*) unnamed_addr { diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll b/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll index 489db0627d8f24..43608d5bf89086 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-icall.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f() !type !0 { diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll index f0ebfe29da0312..58bfb39f9ee18c 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f1() { diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll index 258a20be169f4b..899bbaea13d6f5 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-import-lists2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @f2() { diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll index 2cf9a2d8643390..95ecd1824351ea 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions-import.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 i1 @importf1(i8* %p) { diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll index 679b6b3c682b31..e53673bcd05e16 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @vt1 = constant i32 0, !type !0 diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll index 067804293b50b3..283badad3bbf08 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @vt2 = constant i1 (i8*)* @vf2, !type !0 diff --git a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll index c3de5205ede5aa..830622e9cd7626 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache-typeid-resolutions3.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @vt2a = constant i1 (i8*)* @vf2a, !type !0 diff --git a/llvm/test/ThinLTO/X86/Inputs/cache.ll b/llvm/test/ThinLTO/X86/Inputs/cache.ll index 62ddd68ef6a2fb..aab44cb80c76a6 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cache.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cache.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll b/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll index 7718347e3245c4..1e77b08863aa84 100644 --- a/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll +++ b/llvm/test/ThinLTO/X86/Inputs/callees-metadata.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = internal unnamed_addr global i32 (i32)* @f2, align 8 diff --git a/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll b/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll index 18554a009fc157..cc1c4fd7875379 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cfi-distributed.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.B2 = type { %struct.A2 } diff --git a/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll b/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll index 94186ae1621698..06fb015b222c3f 100644 --- a/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll +++ b/llvm/test/ThinLTO/X86/Inputs/cfi-icall-only-bazqux.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 !type !0 i8 @bar(i8*) diff --git a/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll b/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll index 70d3edd7efe62c..4880cd98d81ea0 100644 --- a/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll +++ b/llvm/test/ThinLTO/X86/Inputs/crash_debuginfo.ll @@ -1,6 +1,6 @@ ; ModuleID = 'test/ThinLTO/X86/Inputs/crash_debuginfo.ll' source_filename = "src.bc" -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.7.0" define void @bar(i32 %arg) { diff --git a/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll b/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll index 34211802a7718a..057305ae67e1a4 100644 --- a/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll +++ b/llvm/test/ThinLTO/X86/Inputs/deadstrip.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" declare void @dead_func() diff --git a/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll b/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll index 5b1e16b479dde0..7e80c4d7c44719 100644 --- a/llvm/test/ThinLTO/X86/Inputs/debuginfo-compositetype-import.ll +++ b/llvm/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-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll b/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll index 243707249085b7..6b824e94073b29 100644 --- a/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll +++ b/llvm/test/ThinLTO/X86/Inputs/debuginfo-cu-import.ll @@ -1,6 +1,6 @@ ; ModuleID = 'debuginfo-cu-import2.c' source_filename = "debuginfo-cu-import2.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/Inputs/devirt2.ll b/llvm/test/ThinLTO/X86/Inputs/devirt2.ll index a67e803161d58b..659c0afccde51f 100644 --- a/llvm/test/ThinLTO/X86/Inputs/devirt2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/devirt2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.A = type { i32 (...)** } diff --git a/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll b/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll index c6ef6d1c78e559..35154e67947c02 100644 --- a/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll +++ b/llvm/test/ThinLTO/X86/Inputs/diagnostic-handler-remarks.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll index ee1c272d39734c..8fa97d4f0adfd8 100644 --- a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll +++ b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique-alias.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" %struct.CFVS = type { %struct.Vec } diff --git a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll index 8d31eae6e813c1..e27a7b1623f1bb 100644 --- a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll +++ b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll index 1d2f584975ef6f..507fa13c6231c7 100644 --- a/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/dicompositetype-unique2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" %struct.CFVS = type { %struct.Vec } diff --git a/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll b/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll index 4e745a459facba..d149de2a96f944 100644 --- a/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll +++ b/llvm/test/ThinLTO/X86/Inputs/dot-dumper.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @A = local_unnamed_addr global i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll b/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll index 854c1e4a2de068..6d9783e92d00b8 100644 --- a/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/dot-dumper2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @A = local_unnamed_addr global i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll b/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll index ad9c48597b9a8d..cf3b295153a723 100644 --- a/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll +++ b/llvm/test/ThinLTO/X86/Inputs/drop-debug-info.ll @@ -1,7 +1,7 @@ ; This file is checked-in as a .bc file, because the debug info version is ; intentionally out-of-date and llvm-as will drop it before writing the bitcode -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll b/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll index 1dfb7c5b9622c0..5e08d9812db96f 100644 --- a/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll +++ b/llvm/test/ThinLTO/X86/Inputs/dsolocal_dllimport.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.11.0" define dso_local dllexport i32 @foo() { ret i32 42 diff --git a/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll b/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll index 7cf01bc86c3748..31c72ec4653a64 100644 --- a/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll +++ b/llvm/test/ThinLTO/X86/Inputs/emit_imports.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @g() { diff --git a/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll b/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll index 8776860d739533..2136ec3471d139 100644 --- a/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/emit_imports2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @h() { diff --git a/llvm/test/ThinLTO/X86/Inputs/empty.ll b/llvm/test/ThinLTO/X86/Inputs/empty.ll index a4e3140422e6ee..a3c99cdfe7721e 100644 --- a/llvm/test/ThinLTO/X86/Inputs/empty.ll +++ b/llvm/test/ThinLTO/X86/Inputs/empty.ll @@ -1,2 +1,2 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll b/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll index 276cf61d0429a1..1c55e078ea3907 100644 --- a/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll +++ b/llvm/test/ThinLTO/X86/Inputs/empty_module_with_cache.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/export.ll b/llvm/test/ThinLTO/X86/Inputs/export.ll index d99a76c3fce421..cab8591fd9fda8 100644 --- a/llvm/test/ThinLTO/X86/Inputs/export.ll +++ b/llvm/test/ThinLTO/X86/Inputs/export.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define i32 @main() #0 { diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll index 022d10641ebff8..b204afe3d4d95a 100644 --- a/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll +++ b/llvm/test/ThinLTO/X86/Inputs/funcimport-debug.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll index 4ecfa7886b5ac8..72aea1e5e2522b 100644 --- a/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll +++ b/llvm/test/ThinLTO/X86/Inputs/funcimport-tbaa.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport.ll index 1a79dbe14dc08d..e0df9e0e7c0d7a 100644 --- a/llvm/test/ThinLTO/X86/Inputs/funcimport.ll +++ b/llvm/test/ThinLTO/X86/Inputs/funcimport.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll b/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll index dcebd184883682..216ef0f1daa8c7 100644 --- a/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/funcimport2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll b/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll index 87418dd30e8f39..ea2c2eda8d5a0f 100644 --- a/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll +++ b/llvm/test/ThinLTO/X86/Inputs/function_entry_count.ll @@ -1,5 +1,5 @@ target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare void @h(); diff --git a/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll b/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll index 3349549f66fc25..fe1fa70ee83127 100644 --- a/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll +++ b/llvm/test/ThinLTO/X86/Inputs/globals-import-blockaddr.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @label_addr = internal constant [1 x i8*] [i8* blockaddress(@foo, %lb)], align 8 diff --git a/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll b/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll index 5a3e5001f6d861..e41163063b4fed 100644 --- a/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll +++ b/llvm/test/ThinLTO/X86/Inputs/globals-import-cf-baz.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" @baz = local_unnamed_addr constant i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/globals-import.ll b/llvm/test/ThinLTO/X86/Inputs/globals-import.ll index ec4ff6eb338457..b229f4a4bde0ff 100644 --- a/llvm/test/ThinLTO/X86/Inputs/globals-import.ll +++ b/llvm/test/ThinLTO/X86/Inputs/globals-import.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" @baz = internal constant i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll b/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll index 5c452d58e8c0b4..fe2b2934724b67 100644 --- a/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll +++ b/llvm/test/ThinLTO/X86/Inputs/import_opaque_type.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" %0 = type { i8 } diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll index 8d76b450c8a855..d5aa6ee0b616cd 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-alias.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = global i32 42, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll index a306b5a3491fd3..5f85f1e38c9ef1 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-foo.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @gFoo = internal unnamed_addr global i32 1, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll index a7a21f9337d109..6bcf3b32d0d661 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ssp uwtable diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll index 05a168fc8f0ee8..75a8f071f485f6 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-cache-test2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ssp uwtable diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll index 44c9b3e26f3175..819ba8caa324e8 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-comdat.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $comdat.any = comdat any diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll index 68947b4c3b142d..555f76f5930124 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-define-g.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = global i32 42, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll index df57a897b72cd5..e22f9198951ee8 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-full-lto.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = external global i32 diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll index 53020763dffcd2..ec0de9c91418e9 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-gvref.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = global i32* @a, align 8 diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll index 7f74ca67113f28..24c724743e08e1 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop-linkage.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g1 = common global i32 0, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll b/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll index 90e1763349cda4..eda62fb4e5bebe 100644 --- a/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll +++ b/llvm/test/ThinLTO/X86/Inputs/index-const-prop.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" @gBar = local_unnamed_addr global i32 2, align 4, !dbg !0 diff --git a/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll b/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll index 5ad8652b5d289f..f51a08a1a3fc4d 100644 --- a/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll +++ b/llvm/test/ThinLTO/X86/Inputs/lazyload_metadata.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" declare void @globalfunc1() diff --git a/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll b/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll index f832f843d45673..66847f50b15151 100644 --- a/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll +++ b/llvm/test/ThinLTO/X86/Inputs/linkonce_aliasee_ref_import.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll b/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll index e0bb06859e71af..6ec8d0048fd591 100644 --- a/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll +++ b/llvm/test/ThinLTO/X86/Inputs/linkonce_odr_unnamed_addr.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @linkonceodrunnamed = linkonce_odr unnamed_addr constant i32 0 diff --git a/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll b/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll index 92b5182315943e..59434a819869eb 100644 --- a/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll +++ b/llvm/test/ThinLTO/X86/Inputs/linkonce_resolution_comdat.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll b/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll index 8f13709524b823..35f5529c2b6f20 100644 --- a/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll +++ b/llvm/test/ThinLTO/X86/Inputs/llvm.used.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll index de43b7825b9d4a..d7b7ea61883021 100644 --- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll +++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict1.ll @@ -1,6 +1,6 @@ ; ModuleID = 'local_name_conflict.o' source_filename = "local_name_conflict.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @baz = internal constant i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll index 7e2412af20faa6..40a4e866599e8f 100644 --- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict2.ll @@ -1,6 +1,6 @@ ; ModuleID = 'local_name_conflict.o' source_filename = "local_name_conflict.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @baz = internal constant i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll index bec5f67f594dfe..fb5306fc337ff6 100644 --- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll +++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var1.ll @@ -1,6 +1,6 @@ ; ModuleID = 'local_name_conflict_var.o' source_filename = "local_name_conflict_var.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @baz = internal global i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll index 51cd0bef0955f9..bf3c262f180bff 100644 --- a/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/local_name_conflict_var2.ll @@ -1,6 +1,6 @@ ; ModuleID = 'local_name_conflict_var.o' source_filename = "local_name_conflict_var.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @baz = internal global i32 10, align 4 diff --git a/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll b/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll index 3be4b8f44425b6..6ee881573ce669 100644 --- a/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll +++ b/llvm/test/ThinLTO/X86/Inputs/merge-triple.ll @@ -1,2 +1,2 @@ target triple = "x86_64-apple-macosx10.11.0" -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/ThinLTO/X86/Inputs/module_asm.ll b/llvm/test/ThinLTO/X86/Inputs/module_asm.ll index f713310eaef8a9..337e8613c6e998 100644 --- a/llvm/test/ThinLTO/X86/Inputs/module_asm.ll +++ b/llvm/test/ThinLTO/X86/Inputs/module_asm.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll b/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll index f5ff45178d19e5..a8081cccaf3453 100644 --- a/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/module_asm2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/Inputs/noinline.ll b/llvm/test/ThinLTO/X86/Inputs/noinline.ll index f412b332c1c19f..73db2912cabc00 100644 --- a/llvm/test/ThinLTO/X86/Inputs/noinline.ll +++ b/llvm/test/ThinLTO/X86/Inputs/noinline.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" define i32 @foo(i32) local_unnamed_addr #0 { diff --git a/llvm/test/ThinLTO/X86/Inputs/personality-local.ll b/llvm/test/ThinLTO/X86/Inputs/personality-local.ll index c610a69746e3de..dc27a375e1a758 100644 --- a/llvm/test/ThinLTO/X86/Inputs/personality-local.ll +++ b/llvm/test/ThinLTO/X86/Inputs/personality-local.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" define void @foo() { diff --git a/llvm/test/ThinLTO/X86/Inputs/personality.ll b/llvm/test/ThinLTO/X86/Inputs/personality.ll index c97b5038639be1..37046b5c28d929 100644 --- a/llvm/test/ThinLTO/X86/Inputs/personality.ll +++ b/llvm/test/ThinLTO/X86/Inputs/personality.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" define void @bar() personality i32 (i32, i32, i64, i8*, i8*)* @personality_routine { diff --git a/llvm/test/ThinLTO/X86/Inputs/pr35472.ll b/llvm/test/ThinLTO/X86/Inputs/pr35472.ll index c330193d737cbb..b9c92b3e3fbfa8 100644 --- a/llvm/test/ThinLTO/X86/Inputs/pr35472.ll +++ b/llvm/test/ThinLTO/X86/Inputs/pr35472.ll @@ -1,6 +1,6 @@ ; ModuleID = 'b.cpp' source_filename = "b.cpp" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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: noinline optnone uwtable diff --git a/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll b/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll index 66289663a0dcca..dab18539ec6eb0 100644 --- a/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll +++ b/llvm/test/ThinLTO/X86/Inputs/reference_non_importable.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" declare i8 **@foo() diff --git a/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll b/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll index 205308ba234cb0..f5e7bc9d89a1bf 100644 --- a/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll +++ b/llvm/test/ThinLTO/X86/Inputs/referenced_by_constant.ll @@ -1,5 +1,5 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @referencedbyglobal() { diff --git a/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll b/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll index f2d74a03737e45..5473f817f13750 100644 --- a/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll +++ b/llvm/test/ThinLTO/X86/Inputs/strong_non_prevailing.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $__llvm_profile_filename = comdat any diff --git a/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll b/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll index de41676271c5a4..225685d931b0c6 100644 --- a/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll +++ b/llvm/test/ThinLTO/X86/Inputs/thinlto-internalize-used2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.15.0" define i32 @main() { diff --git a/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll b/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll index 9ef7cbb0986bce..fe9edc66d49555 100644 --- a/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll +++ b/llvm/test/ThinLTO/X86/Inputs/weak_resolution.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" ; Alias are not optimized diff --git a/llvm/test/ThinLTO/X86/alias_internal.ll b/llvm/test/ThinLTO/X86/alias_internal.ll index 18ee176b88c4ef..d6433f6981dafd 100644 --- a/llvm/test/ThinLTO/X86/alias_internal.ll +++ b/llvm/test/ThinLTO/X86/alias_internal.ll @@ -11,7 +11,7 @@ ; CHECK-DAG: M0_12511626713252727690 -> M0_{{.*}} // alias ; CHECK-DAG: M1_8129049334585965161 -> M1_{{.*}} // alias -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 internal i32 @f(i8*) unnamed_addr { diff --git a/llvm/test/ThinLTO/X86/autoupgrade.ll b/llvm/test/ThinLTO/X86/autoupgrade.ll index 3d31dd726a12ca..77f7eb0e0e0283 100644 --- a/llvm/test/ThinLTO/X86/autoupgrade.ll +++ b/llvm/test/ThinLTO/X86/autoupgrade.ll @@ -19,7 +19,7 @@ ; SUMMARYNAMES: ^2 = gv: (name: "globalfunc2", ; SUMMARYNAMES: ^3 = gv: (name: "globalfunc1" -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define i32 @main() #0 { diff --git a/llvm/test/ThinLTO/X86/builtin-nostrip.ll b/llvm/test/ThinLTO/X86/builtin-nostrip.ll index 690ae322a26192..7dc6504a7e01af 100644 --- a/llvm/test/ThinLTO/X86/builtin-nostrip.ll +++ b/llvm/test/ThinLTO/X86/builtin-nostrip.ll @@ -46,7 +46,7 @@ ; eliminated once the old lto interface is fixed. ; CHECK-NM2-DAG: t __stack_chk_fail -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() { diff --git a/llvm/test/ThinLTO/X86/cache-config.ll b/llvm/test/ThinLTO/X86/cache-config.ll index ccc730d35e5e1f..54328885f553ad 100644 --- a/llvm/test/ThinLTO/X86/cache-config.ll +++ b/llvm/test/ThinLTO/X86/cache-config.ll @@ -18,7 +18,7 @@ ; RUN: llvm-lto2 run -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-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/cache-icall.ll b/llvm/test/ThinLTO/X86/cache-icall.ll index e3a3c66c1ee055..83b740de4d54f3 100644 --- a/llvm/test/ThinLTO/X86/cache-icall.ll +++ b/llvm/test/ThinLTO/X86/cache-icall.ll @@ -29,7 +29,7 @@ ; SYMBOLS-YES-DAG: {{FUNC .* f.cfi$}} ; SYMBOLS-YES-DAG: {{NOTYPE .* UND f.cfi$}} -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 i8* @_start(void ()* %p) !type !0 { diff --git a/llvm/test/ThinLTO/X86/cache-import-lists.ll b/llvm/test/ThinLTO/X86/cache-import-lists.ll index 225f7d8bbe681b..ba7b437e8cad89 100644 --- a/llvm/test/ThinLTO/X86/cache-import-lists.ll +++ b/llvm/test/ThinLTO/X86/cache-import-lists.ll @@ -11,7 +11,7 @@ ; RUN: llvm-lto2 run -cache-dir %t.cache -o %t.o %t.bc %t2.bc %t1.bc -r=%t.bc,main,plx -r=%t.bc,f1,lx -r=%t.bc,f2,lx -r=%t2.bc,f2,plx -r=%t2.bc,linkonce_odr,plx -r=%t1.bc,f1,plx -r=%t1.bc,linkonce_odr,lx ; RUN: ls %t.cache | count 6 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @main() { diff --git a/llvm/test/ThinLTO/X86/cache-typeid-resolutions.ll b/llvm/test/ThinLTO/X86/cache-typeid-resolutions.ll index 6618a6f280fe62..e5092dd63ec06f 100644 --- a/llvm/test/ThinLTO/X86/cache-typeid-resolutions.ll +++ b/llvm/test/ThinLTO/X86/cache-typeid-resolutions.ll @@ -22,7 +22,7 @@ ; RUN: llvm-lto2 run -o %t.o %t.bc %t-import.bc %t3.bc -cache-dir %t.cache -r=%t.bc,f1,plx -r=%t.bc,f2,plx -r=%t.bc,f1_actual,plx -r=%t3.bc,vt2a,plx -r=%t3.bc,vt2b,plx -r=%t-import.bc,importf1,plx -r=%t-import.bc,f1,lx -r=%t-import.bc,importf2,plx -r=%t-import.bc,f2,lx ; RUN: ls %t.cache | count 6 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @f1 = alias i1(i8*), i1 (i8*)* @f1_actual diff --git a/llvm/test/ThinLTO/X86/cache.ll b/llvm/test/ThinLTO/X86/cache.ll index c9285f91b2557e..75e6b7fd6be76c 100644 --- a/llvm/test/ThinLTO/X86/cache.ll +++ b/llvm/test/ThinLTO/X86/cache.ll @@ -160,7 +160,7 @@ ; RUN: not ls %t.cache/llvmcache-foo-1024 ; RUN: not ls %t.cache/llvmcache-foo-7 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @globalfunc() #0 { diff --git a/llvm/test/ThinLTO/X86/callees-metadata.ll b/llvm/test/ThinLTO/X86/callees-metadata.ll index 3e416dd3debc62..457cdb319fa334 100644 --- a/llvm/test/ThinLTO/X86/callees-metadata.ll +++ b/llvm/test/ThinLTO/X86/callees-metadata.ll @@ -10,7 +10,7 @@ ; CHECK: define {{.*}} i32 @f1.llvm.0 ; CHECK: define {{.*}} i32 @f2.llvm.0 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 dso_local i32 @bar(i32 %x) { diff --git a/llvm/test/ThinLTO/X86/cfi-devirt.ll b/llvm/test/ThinLTO/X86/cfi-devirt.ll index dd83024e263443..760c02a24ea7bf 100644 --- a/llvm/test/ThinLTO/X86/cfi-devirt.ll +++ b/llvm/test/ThinLTO/X86/cfi-devirt.ll @@ -61,7 +61,7 @@ ; RUN: -r=%t.o,_ZTV1C,px 2>&1 | FileCheck %s --check-prefix=ERROR ; ERROR: failed: inconsistent LTO Unit splitting (recompile with -fsplit-lto-unit) -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.A = type { i32 (...)** } diff --git a/llvm/test/ThinLTO/X86/cfi-distributed.ll b/llvm/test/ThinLTO/X86/cfi-distributed.ll index 5959cc72988dd2..5339228515429b 100644 --- a/llvm/test/ThinLTO/X86/cfi-distributed.ll +++ b/llvm/test/ThinLTO/X86/cfi-distributed.ll @@ -40,7 +40,7 @@ ; INDEX2: typeid: (name: "_ZTS1A2" ; INDEX2: typeid: (name: "_ZTS1A3" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.B = type { %struct.A } diff --git a/llvm/test/ThinLTO/X86/cfi-icall-only-defuse.ll b/llvm/test/ThinLTO/X86/cfi-icall-only-defuse.ll index 1721778d780c82..842468508f5654 100644 --- a/llvm/test/ThinLTO/X86/cfi-icall-only-defuse.ll +++ b/llvm/test/ThinLTO/X86/cfi-icall-only-defuse.ll @@ -14,7 +14,7 @@ ; RUN: llvm-bcanalyzer -dump %t1.bc.thinlto.bc | FileCheck %s --check-prefix=FOOBAZ ; RUN: llvm-bcanalyzer -dump %t2.bc.thinlto.bc | FileCheck %s --check-prefix=BARQUX -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 !type !0 i8 @baz(i8*) diff --git a/llvm/test/ThinLTO/X86/cfi-icall.ll b/llvm/test/ThinLTO/X86/cfi-icall.ll index 96179e2562435f..42c26f15893105 100644 --- a/llvm/test/ThinLTO/X86/cfi-icall.ll +++ b/llvm/test/ThinLTO/X86/cfi-icall.ll @@ -5,7 +5,7 @@ ; RUN: -r %t1.bc,addrtaken,px ; RUN: llvm-bcanalyzer -dump %t.out.index.bc | FileCheck %s --check-prefix=COMBINED -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 i1 @foo(i8* %p) !type !0 { diff --git a/llvm/test/ThinLTO/X86/cfi.ll b/llvm/test/ThinLTO/X86/cfi.ll index e406009743e215..0edddb82be9ec6 100644 --- a/llvm/test/ThinLTO/X86/cfi.ll +++ b/llvm/test/ThinLTO/X86/cfi.ll @@ -22,7 +22,7 @@ ; RUN: -r=%t.o,_ZTV1B,px ; RUN: llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.B = type { %struct.A } diff --git a/llvm/test/ThinLTO/X86/crash_debuginfo.ll b/llvm/test/ThinLTO/X86/crash_debuginfo.ll index d0d63f25ee06db..31403269b6b69f 100644 --- a/llvm/test/ThinLTO/X86/crash_debuginfo.ll +++ b/llvm/test/ThinLTO/X86/crash_debuginfo.ll @@ -11,7 +11,7 @@ ; ModuleID = 'test/ThinLTO/X86/crash_debuginfo.ll' source_filename = "test/ThinLTO/X86/crash_debuginfo.ll" -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.7.0" define void @foo(i32 %arg) { diff --git a/llvm/test/ThinLTO/X86/deadstrip.ll b/llvm/test/ThinLTO/X86/deadstrip.ll index 9409039f430152..2f389c52c5c5d7 100644 --- a/llvm/test/ThinLTO/X86/deadstrip.ll +++ b/llvm/test/ThinLTO/X86/deadstrip.ll @@ -132,7 +132,7 @@ ; and called from @dead_func. ; CHECK-NM-NOTDEAD: T _baz -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/debuginfo-compositetype-import.ll b/llvm/test/ThinLTO/X86/debuginfo-compositetype-import.ll index 578b0ced870bd5..5859875b1611dd 100644 --- a/llvm/test/ThinLTO/X86/debuginfo-compositetype-import.ll +++ b/llvm/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-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/debuginfo-cu-import.ll b/llvm/test/ThinLTO/X86/debuginfo-cu-import.ll index 1f07f96f3239c0..93fd8dc86a3779 100644 --- a/llvm/test/ThinLTO/X86/debuginfo-cu-import.ll +++ b/llvm/test/ThinLTO/X86/debuginfo-cu-import.ll @@ -17,7 +17,7 @@ ; ModuleID = 'debuginfo-cu-import.c' source_filename = "debuginfo-cu-import.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() !dbg !28 { diff --git a/llvm/test/ThinLTO/X86/devirt-after-icp.ll b/llvm/test/ThinLTO/X86/devirt-after-icp.ll index af6eba77ba4e72..8edb8698198d50 100644 --- a/llvm/test/ThinLTO/X86/devirt-after-icp.ll +++ b/llvm/test/ThinLTO/X86/devirt-after-icp.ll @@ -85,7 +85,7 @@ ; REMARK: single-impl: devirtualized a call to _ZN1B3barEv ; REMARK-NOT: single-impl: devirtualized a call to _ZN1B3fooEv -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %class.A = type { i32 (...)** } diff --git a/llvm/test/ThinLTO/X86/devirt.ll b/llvm/test/ThinLTO/X86/devirt.ll index eae8c69eb06135..1bace72eba3720 100644 --- a/llvm/test/ThinLTO/X86/devirt.ll +++ b/llvm/test/ThinLTO/X86/devirt.ll @@ -106,7 +106,7 @@ ; REMARK-DAG: single-impl: devirtualized a call to _ZN1A1nEi ; REMARK-DAG: single-impl: devirtualized a call to _ZN1D1mEi -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.A = type { i32 (...)** } diff --git a/llvm/test/ThinLTO/X86/devirt2.ll b/llvm/test/ThinLTO/X86/devirt2.ll index 01eed382f24c91..9218f97ba17c3e 100644 --- a/llvm/test/ThinLTO/X86/devirt2.ll +++ b/llvm/test/ThinLTO/X86/devirt2.ll @@ -200,7 +200,7 @@ ; REMARK-DAG: single-impl: devirtualized a call to _ZN1E1mEi ; REMARK-DAG: single-impl: devirtualized a call to _ZN1E1mEi -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.A = type { i32 (...)** } diff --git a/llvm/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll b/llvm/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll index 94bad9b3ba329f..239e6efe3a1952 100644 --- a/llvm/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll +++ b/llvm/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll @@ -53,7 +53,7 @@ ; YAML2-NEXT: ... -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define i32 @bar() { diff --git a/llvm/test/ThinLTO/X86/diagnostic-handler-remarks.ll b/llvm/test/ThinLTO/X86/diagnostic-handler-remarks.ll index b83e93b7a29de8..f0ff9542ee1b3c 100644 --- a/llvm/test/ThinLTO/X86/diagnostic-handler-remarks.ll +++ b/llvm/test/ThinLTO/X86/diagnostic-handler-remarks.ll @@ -52,7 +52,7 @@ ; YAML2-NEXT: ... -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define i32 @bar() { diff --git a/llvm/test/ThinLTO/X86/dicompositetype-unique-alias.ll b/llvm/test/ThinLTO/X86/dicompositetype-unique-alias.ll index ff1f40d6ddcd68..2c4e3ea721daec 100644 --- a/llvm/test/ThinLTO/X86/dicompositetype-unique-alias.ll +++ b/llvm/test/ThinLTO/X86/dicompositetype-unique-alias.ll @@ -20,7 +20,7 @@ ; CHECK: DICompositeType ; CHECK-NOT: DICompositeType -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" %class.C = type <{ i32 (...)**, %class.A, %struct.CFVS, [6 x i8] }> diff --git a/llvm/test/ThinLTO/X86/dicompositetype-unique.ll b/llvm/test/ThinLTO/X86/dicompositetype-unique.ll index dbf14911c450f5..e61b515d4fd2a6 100644 --- a/llvm/test/ThinLTO/X86/dicompositetype-unique.ll +++ b/llvm/test/ThinLTO/X86/dicompositetype-unique.ll @@ -8,7 +8,7 @@ ; RUN: llvm-dis %t.1.3.import.bc -o - | FileCheck %s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" declare void @foo() diff --git a/llvm/test/ThinLTO/X86/dicompositetype-unique2.ll b/llvm/test/ThinLTO/X86/dicompositetype-unique2.ll index e7ecc97e31f1b9..f275ea1b23e02c 100644 --- a/llvm/test/ThinLTO/X86/dicompositetype-unique2.ll +++ b/llvm/test/ThinLTO/X86/dicompositetype-unique2.ll @@ -13,7 +13,7 @@ ; Only llvm-lto2 adds the dso_local keyword, hence the {{.*}} ; CHECK: define available_externally{{.*}} void @_ZN4CFVSD2Ev -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-scei-ps4" %class.C = type <{ i32 (...)**, %class.A, %struct.CFVS, [6 x i8] }> diff --git a/llvm/test/ThinLTO/X86/distributed_import.ll b/llvm/test/ThinLTO/X86/distributed_import.ll index b65c3be14f7138..a67fe20bd9c18d 100644 --- a/llvm/test/ThinLTO/X86/distributed_import.ll +++ b/llvm/test/ThinLTO/X86/distributed_import.ll @@ -59,7 +59,7 @@ ; EXPORT: @G.llvm. target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare i32 @g(...) declare void @analias(...) diff --git a/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll b/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll index d8acfaaf03b420..6d4d1efa9a32ea 100644 --- a/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll +++ b/llvm/test/ThinLTO/X86/dot-dumper-full-lto.ll @@ -14,7 +14,7 @@ ; CHECK: // Cross-module edges: ; CHECK: M4294967295_[[ID]] -> M0_{{[0-9]+}}{{.*}}// ref -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @A = external global i32 diff --git a/llvm/test/ThinLTO/X86/dot-dumper.ll b/llvm/test/ThinLTO/X86/dot-dumper.ll index 92925426d4254f..d546d90a2ace92 100644 --- a/llvm/test/ThinLTO/X86/dot-dumper.ll +++ b/llvm/test/ThinLTO/X86/dot-dumper.ll @@ -63,7 +63,7 @@ ; COMBINED-NEXT: M0_[[MAIN]] -> M1_[[FOO]] // call (hotness : Unknown) ; COMBINED-NEXT: } -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @A = external local_unnamed_addr global i32, align 4 diff --git a/llvm/test/ThinLTO/X86/dot-dumper2.ll b/llvm/test/ThinLTO/X86/dot-dumper2.ll index 1bfa4e0e6e7120..8cc9822aed4eb7 100644 --- a/llvm/test/ThinLTO/X86/dot-dumper2.ll +++ b/llvm/test/ThinLTO/X86/dot-dumper2.ll @@ -31,7 +31,7 @@ ; COMBINED-NEXT: M0_[[MAIN]] -> M1_[[A]] [style=dashed,color=violetred]; // writeOnly-ref ; COMBINED-NEXT: } -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @A = external local_unnamed_addr global i32, align 4 diff --git a/llvm/test/ThinLTO/X86/drop-debug-info.ll b/llvm/test/ThinLTO/X86/drop-debug-info.ll index 7bbbb9e59109a8..a097d6bac98eea 100644 --- a/llvm/test/ThinLTO/X86/drop-debug-info.ll +++ b/llvm/test/ThinLTO/X86/drop-debug-info.ll @@ -7,7 +7,7 @@ ; CHECK: define available_externally void @globalfunc ; CHECK-NOT: llvm.dbg.value -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/dsolocal_dllimport.ll b/llvm/test/ThinLTO/X86/dsolocal_dllimport.ll index 2c3815a15071fc..12f097f3949b0a 100644 --- a/llvm/test/ThinLTO/X86/dsolocal_dllimport.ll +++ b/llvm/test/ThinLTO/X86/dsolocal_dllimport.ll @@ -7,7 +7,7 @@ ; CHECK: declare dso_local void @foo() -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.11.0" define void @bar() { call void @foo() diff --git a/llvm/test/ThinLTO/X86/emit_imports.ll b/llvm/test/ThinLTO/X86/emit_imports.ll index 4246264654110d..41dc1482cb0f85 100644 --- a/llvm/test/ThinLTO/X86/emit_imports.ll +++ b/llvm/test/ThinLTO/X86/emit_imports.ll @@ -44,7 +44,7 @@ ; The index file should be created even for the input with an empty summary. ; RUN: ls %t3.bc.thinlto.bc -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @g(...) diff --git a/llvm/test/ThinLTO/X86/empty-module.ll b/llvm/test/ThinLTO/X86/empty-module.ll index 01e7089415f323..285e1bcec2e892 100644 --- a/llvm/test/ThinLTO/X86/empty-module.ll +++ b/llvm/test/ThinLTO/X86/empty-module.ll @@ -8,7 +8,7 @@ ; CHECK: Format: ELF64-x86-64 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = ifunc i32 (i32), i64 ()* @foo_ifunc diff --git a/llvm/test/ThinLTO/X86/empty_module_with_cache.ll b/llvm/test/ThinLTO/X86/empty_module_with_cache.ll index 8e58d9f0db959e..76fe3e91d20236 100644 --- a/llvm/test/ThinLTO/X86/empty_module_with_cache.ll +++ b/llvm/test/ThinLTO/X86/empty_module_with_cache.ll @@ -31,5 +31,5 @@ ; RUN: ls %t.cache | count 0 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/export.ll b/llvm/test/ThinLTO/X86/export.ll index b0db1e7468fa8b..cb87ddd063e860 100644 --- a/llvm/test/ThinLTO/X86/export.ll +++ b/llvm/test/ThinLTO/X86/export.ll @@ -8,7 +8,7 @@ ; CHECK-DAG: @staticvar.llvm.0 = hidden global ; CHECK-DAG: define hidden void @staticfunc.llvm.0 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" @staticvar = internal global i32 1, align 4 diff --git a/llvm/test/ThinLTO/X86/funcimport-debug.ll b/llvm/test/ThinLTO/X86/funcimport-debug.ll index 4e03813b6cf891..ca6128a51a941f 100644 --- a/llvm/test/ThinLTO/X86/funcimport-debug.ll +++ b/llvm/test/ThinLTO/X86/funcimport-debug.ll @@ -21,7 +21,7 @@ ; CHECK-DAG: ref -> 7546896869197086323 (baz) ; CHECK-DAG: edge -> 6699318081062747564 (foo) Threshold:100 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define i32 @main() #0 { diff --git a/llvm/test/ThinLTO/X86/funcimport-tbaa.ll b/llvm/test/ThinLTO/X86/funcimport-tbaa.ll index 5334fbecb31ea0..c3dfd7d90b0012 100644 --- a/llvm/test/ThinLTO/X86/funcimport-tbaa.ll +++ b/llvm/test/ThinLTO/X86/funcimport-tbaa.ll @@ -10,7 +10,7 @@ ; RUN: | llvm-dis -o - | FileCheck %s --check-prefix=IMPORTGLOB1 ; IMPORTGLOB1: define available_externally float @globalfunc1 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define float @globalfunc1(i32*, float*) { diff --git a/llvm/test/ThinLTO/X86/funcimport.ll b/llvm/test/ThinLTO/X86/funcimport.ll index cb75d55edf5831..fa1bdbf9f1199e 100644 --- a/llvm/test/ThinLTO/X86/funcimport.ll +++ b/llvm/test/ThinLTO/X86/funcimport.ll @@ -46,7 +46,7 @@ ; ALL: T _callfuncptr ; ALL2: T _main -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" @globalvar_in_section = global i32 1, align 4 diff --git a/llvm/test/ThinLTO/X86/funcimport2.ll b/llvm/test/ThinLTO/X86/funcimport2.ll index 9792fbc57e24c7..15087be6b569f9 100644 --- a/llvm/test/ThinLTO/X86/funcimport2.ll +++ b/llvm/test/ThinLTO/X86/funcimport2.ll @@ -33,7 +33,7 @@ ; RUN: llvm-dis %t.o.2.3.import.bc -o - | FileCheck %s --check-prefix=NOIMPORT ; NOIMPORT: declare dso_local void @foo(...) -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @foo() #0 { diff --git a/llvm/test/ThinLTO/X86/function_entry_count.ll b/llvm/test/ThinLTO/X86/function_entry_count.ll index 686c85291eacaa..4ca2ec26a59221 100644 --- a/llvm/test/ThinLTO/X86/function_entry_count.ll +++ b/llvm/test/ThinLTO/X86/function_entry_count.ll @@ -21,7 +21,7 @@ ; CHECK-DAG: ![[PROF2]] = !{!"synthetic_function_entry_count", i64 198} target triple = "x86_64-unknown-linux-gnu" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare void @g(); diff --git a/llvm/test/ThinLTO/X86/globals-import-blockaddr.ll b/llvm/test/ThinLTO/X86/globals-import-blockaddr.ll index 9bbbf76f109e8f..d4ed674030a70e 100644 --- a/llvm/test/ThinLTO/X86/globals-import-blockaddr.ll +++ b/llvm/test/ThinLTO/X86/globals-import-blockaddr.ll @@ -6,7 +6,7 @@ ; Verify that we haven't imported GV containing blockaddress ; CHECK: @label_addr.llvm.0 = external hidden constant -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 dso_local [1 x i8*]* @foo(); diff --git a/llvm/test/ThinLTO/X86/globals-import-const-fold.ll b/llvm/test/ThinLTO/X86/globals-import-const-fold.ll index 663b4ee7ebb440..a250ed2e92baed 100644 --- a/llvm/test/ThinLTO/X86/globals-import-const-fold.ll +++ b/llvm/test/ThinLTO/X86/globals-import-const-fold.ll @@ -12,7 +12,7 @@ ; OPTIMIZE: define i32 @main() ; OPTIMIZE-NEXT: ret i32 10 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" @baz = external local_unnamed_addr constant i32, align 4 diff --git a/llvm/test/ThinLTO/X86/globals-import.ll b/llvm/test/ThinLTO/X86/globals-import.ll index 0837cafd06f85c..9fe1ebefe8b159 100644 --- a/llvm/test/ThinLTO/X86/globals-import.ll +++ b/llvm/test/ThinLTO/X86/globals-import.ll @@ -24,7 +24,7 @@ ; PROMOTE2: @baz = internal constant i32 10, align 4 ; PROMOTE2: define available_externally i32 @foo() { -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" declare i32 @foo() diff --git a/llvm/test/ThinLTO/X86/import_opaque_type.ll b/llvm/test/ThinLTO/X86/import_opaque_type.ll index 0a49116a62a2e6..bfa251abacaba1 100644 --- a/llvm/test/ThinLTO/X86/import_opaque_type.ll +++ b/llvm/test/ThinLTO/X86/import_opaque_type.ll @@ -7,7 +7,7 @@ ; RUN: llvm-lto -thinlto-action=import %t.bc -thinlto-index=%t3.bc -o - | llvm-dis -o - | FileCheck %s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" ; CHECK: %0 = type { i8 } diff --git a/llvm/test/ThinLTO/X86/index-const-prop-O0.ll b/llvm/test/ThinLTO/X86/index-const-prop-O0.ll index c1e945010fbc61..6426d726843fc5 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-O0.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-O0.ll @@ -7,7 +7,7 @@ ; read-only globals ; CHECK: @g = dso_local global i32 42 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop-alias.ll b/llvm/test/ThinLTO/X86/index-const-prop-alias.ll index bd15b5a6204cdd..592fc9e081a7c2 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-alias.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-alias.ll @@ -26,7 +26,7 @@ ; PRESERVED: @g.alias = external dso_local global i32 ; PRESERVED-NEXT: @g = available_externally dso_local global i32 42, align 4 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g.alias = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop-cache.ll b/llvm/test/ThinLTO/X86/index-const-prop-cache.ll index 4e45d5e8dbc51f..62a22af0b1eba0 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-cache.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-cache.ll @@ -29,7 +29,7 @@ ; RUN: -r=%t2.bc,foo,pl -r=%t2.bc,bar,pl -r=%t2.bc,rand, ; RUN: ls %t.cache/llvmcache-* | count 6 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 ssp uwtable diff --git a/llvm/test/ThinLTO/X86/index-const-prop-comdat.ll b/llvm/test/ThinLTO/X86/index-const-prop-comdat.ll index 2fdc793b3c2d07..e05aaf98d7f0d6 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-comdat.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-comdat.ll @@ -6,7 +6,7 @@ ; Comdats are not internalized even if they are read only. ; CHECK: @g = available_externally dso_local global i32 42 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop-dead.ll b/llvm/test/ThinLTO/X86/index-const-prop-dead.ll index 44fc350e909d66..f3ffca8cbdf798 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-dead.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-dead.ll @@ -8,7 +8,7 @@ ; If we try to internalize such we'll get a broken module. ; CHECK: @g = external dso_local global i32 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop-full-lto.ll b/llvm/test/ThinLTO/X86/index-const-prop-full-lto.ll index f6260c535ed570..26fe4d644b7248 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-full-lto.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-full-lto.ll @@ -10,7 +10,7 @@ ; We cannot internalize @g ; CHECK: @g = available_externally dso_local global i32 42 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() diff --git a/llvm/test/ThinLTO/X86/index-const-prop-gvref.ll b/llvm/test/ThinLTO/X86/index-const-prop-gvref.ll index 972283774b8cbc..87103fee1410eb 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-gvref.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-gvref.ll @@ -13,7 +13,7 @@ ; DEST: @b = external dso_local global i32* ; DEST-NEXT: @a = available_externally dso_local global i32 42, align 4 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop-ldst.ll b/llvm/test/ThinLTO/X86/index-const-prop-ldst.ll index 3c6d03cb75da9d..4646557b6cfc36 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-ldst.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-ldst.ll @@ -7,7 +7,7 @@ ; even when there is 'load' instruction before it. ; CHECK: @g = available_externally dso_local global i32 42 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @g = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop-linkage.ll b/llvm/test/ThinLTO/X86/index-const-prop-linkage.ll index 2c7c794379fa8d..aac917721113ca 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop-linkage.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop-linkage.ll @@ -14,7 +14,7 @@ ; CHECK-NEXT: @g2 = available_externally dso_local global i32 42, align 4 ; CHECK-NEXT: @g3 = available_externally global i32 42, align 4 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() diff --git a/llvm/test/ThinLTO/X86/index-const-prop.ll b/llvm/test/ThinLTO/X86/index-const-prop.ll index 9718aec8a9441e..9dac8b81b910d9 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop.ll @@ -28,7 +28,7 @@ ; IMPORT2: @gBar = available_externally local_unnamed_addr global i32 2, align 4, !dbg !5 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" @gBar = external global i32 diff --git a/llvm/test/ThinLTO/X86/index-const-prop2.ll b/llvm/test/ThinLTO/X86/index-const-prop2.ll index 430c7e8156d2a5..a5fbbdf1e92965 100644 --- a/llvm/test/ThinLTO/X86/index-const-prop2.ll +++ b/llvm/test/ThinLTO/X86/index-const-prop2.ll @@ -74,7 +74,7 @@ ; CODEGEN2-SRC-NEXT: %2 = tail call i32 @rand() ; CODEGEN2-SRC-NEXT: ret void -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" ; We should be able to link external definition of gBar to its declaration diff --git a/llvm/test/ThinLTO/X86/internalize.ll b/llvm/test/ThinLTO/X86/internalize.ll index edd5abe8ab4247..0f7d4a5ca1f50a 100644 --- a/llvm/test/ThinLTO/X86/internalize.ll +++ b/llvm/test/ThinLTO/X86/internalize.ll @@ -58,7 +58,7 @@ ; INTERNALIZE2-OPTION-DISABLE: define weak dso_local void @weak_func_prevailing() ; INTERNALIZE2-OPTION-DISABLE: define weak dso_local void @weak_func_nonprevailing() -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @foo() { diff --git a/llvm/test/ThinLTO/X86/lazyload_metadata.ll b/llvm/test/ThinLTO/X86/lazyload_metadata.ll index d561f02818d18b..b590ffd417ee76 100644 --- a/llvm/test/ThinLTO/X86/lazyload_metadata.ll +++ b/llvm/test/ThinLTO/X86/lazyload_metadata.ll @@ -20,7 +20,7 @@ ; NOTLAZY: 7 bitcode-reader - Number of MDStrings loaded -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @globalfunc1(i32 %arg) { diff --git a/llvm/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll b/llvm/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll index 2cff8b4b275804..9086d9824b7b65 100644 --- a/llvm/test/ThinLTO/X86/linkonce_aliasee_ref_import.ll +++ b/llvm/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-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/linkonce_odr_unnamed_addr.ll b/llvm/test/ThinLTO/X86/linkonce_odr_unnamed_addr.ll index 8b8e3677cbb983..68ba48ebd4f19b 100644 --- a/llvm/test/ThinLTO/X86/linkonce_odr_unnamed_addr.ll +++ b/llvm/test/ThinLTO/X86/linkonce_odr_unnamed_addr.ll @@ -17,7 +17,7 @@ ; RUN: llvm-lto2 run -save-temps -o %t6.bc %t.bc %t4.bc -r=%t.bc,linkonceodrunnamed,p -r=%t.bc,odrunnamed,p -r=%t4.bc,linkonceodrunnamed, -r=%t4.bc,odrunnamed, ; RUN: llvm-dis %t6.bc.1.1.promote.bc -o - | FileCheck %s --check-prefix=NOSUMMARY -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; In this case all copies are linkonce_odr, so it may be hidden. diff --git a/llvm/test/ThinLTO/X86/linkonce_resolution_comdat.ll b/llvm/test/ThinLTO/X86/linkonce_resolution_comdat.ll index 2d8b7e773bb238..b61caf284172fa 100644 --- a/llvm/test/ThinLTO/X86/linkonce_resolution_comdat.ll +++ b/llvm/test/ThinLTO/X86/linkonce_resolution_comdat.ll @@ -21,7 +21,7 @@ ; and inlined into g() ; NM2-NOT: f -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/llvm.used.ll b/llvm/test/ThinLTO/X86/llvm.used.ll index 266ab2beb3b23c..4b379f72c255c8 100644 --- a/llvm/test/ThinLTO/X86/llvm.used.ll +++ b/llvm/test/ThinLTO/X86/llvm.used.ll @@ -8,7 +8,7 @@ ; CHECK: define available_externally void @globalfunc -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" diff --git a/llvm/test/ThinLTO/X86/load-store-caching.ll b/llvm/test/ThinLTO/X86/load-store-caching.ll index cb3a5c0d54d5a2..9ca9c40fd11213 100644 --- a/llvm/test/ThinLTO/X86/load-store-caching.ll +++ b/llvm/test/ThinLTO/X86/load-store-caching.ll @@ -5,7 +5,7 @@ ; RUN: opt -module-summary %s -o %t.bc ; RUN: llvm-dis %t.bc -o - | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.S = type { %struct.Derived* } diff --git a/llvm/test/ThinLTO/X86/local_name_conflict.ll b/llvm/test/ThinLTO/X86/local_name_conflict.ll index 9e5e79b6ae2b59..1912297cedee49 100644 --- a/llvm/test/ThinLTO/X86/local_name_conflict.ll +++ b/llvm/test/ThinLTO/X86/local_name_conflict.ll @@ -28,7 +28,7 @@ ; ModuleID = 'local_name_conflict_main.o' source_filename = "local_name_conflict_main.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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: noinline nounwind uwtable diff --git a/llvm/test/ThinLTO/X86/local_name_conflict_var.ll b/llvm/test/ThinLTO/X86/local_name_conflict_var.ll index ed5c6e4fd4f985..d203fe08e2c4c8 100644 --- a/llvm/test/ThinLTO/X86/local_name_conflict_var.ll +++ b/llvm/test/ThinLTO/X86/local_name_conflict_var.ll @@ -17,7 +17,7 @@ ; ModuleID = 'local_name_conflict_var_main.o' source_filename = "local_name_conflict_var_main.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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: noinline nounwind uwtable diff --git a/llvm/test/ThinLTO/X86/merge-triple.ll b/llvm/test/ThinLTO/X86/merge-triple.ll index 6c5eac6cfb23fa..11ab50236fe468 100644 --- a/llvm/test/ThinLTO/X86/merge-triple.ll +++ b/llvm/test/ThinLTO/X86/merge-triple.ll @@ -4,7 +4,7 @@ ; RUN: llvm-dis < %t1.bc.thinlto.imported.bc | FileCheck %s --check-prefix=CHECK1 ; RUN: llvm-dis < %t2.bc.thinlto.imported.bc | FileCheck %s --check-prefix=CHECK2 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.12.0" ; CHECK1: target triple = "x86_64-apple-macosx10.12.0" diff --git a/llvm/test/ThinLTO/X86/module_asm2.ll b/llvm/test/ThinLTO/X86/module_asm2.ll index 3f0033849f9cd6..b6e2f23509ec73 100644 --- a/llvm/test/ThinLTO/X86/module_asm2.ll +++ b/llvm/test/ThinLTO/X86/module_asm2.ll @@ -64,7 +64,7 @@ ; NM1-NOT: b ; NM1-NOT: x -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/module_asm_glob.ll b/llvm/test/ThinLTO/X86/module_asm_glob.ll index 45b6113cb2476c..3ce4816c9d65bc 100644 --- a/llvm/test/ThinLTO/X86/module_asm_glob.ll +++ b/llvm/test/ThinLTO/X86/module_asm_glob.ll @@ -17,7 +17,7 @@ ; NM0: T foo ; NM1-NOT: foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/ThinLTO/X86/module_summary_graph_traits.ll b/llvm/test/ThinLTO/X86/module_summary_graph_traits.ll index b6a649546500cd..d2f1dfbf7b69b0 100644 --- a/llvm/test/ThinLTO/X86/module_summary_graph_traits.ll +++ b/llvm/test/ThinLTO/X86/module_summary_graph_traits.ll @@ -31,7 +31,7 @@ ; CHECK-NEXT: {{^}} 0{{$}} ; CHECK-NEXT: } -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 void @external() diff --git a/llvm/test/ThinLTO/X86/newpm-basic.ll b/llvm/test/ThinLTO/X86/newpm-basic.ll index 860aa4c0158040..bfcc60c6807b08 100644 --- a/llvm/test/ThinLTO/X86/newpm-basic.ll +++ b/llvm/test/ThinLTO/X86/newpm-basic.ll @@ -3,7 +3,7 @@ ; RUN: -r=%t1.bc,_tinkywinky,pxl \ ; RUN: -use-new-pm -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @tinkywinky() { diff --git a/llvm/test/ThinLTO/X86/nodevirt-nonpromoted-typeid.ll b/llvm/test/ThinLTO/X86/nodevirt-nonpromoted-typeid.ll index 611a424143ac87..9ef408a237d9ab 100644 --- a/llvm/test/ThinLTO/X86/nodevirt-nonpromoted-typeid.ll +++ b/llvm/test/ThinLTO/X86/nodevirt-nonpromoted-typeid.ll @@ -30,7 +30,7 @@ ; RUN: -r=%t2.o,_ZN1D1mEi, ; RUN: llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.D = type { i32 (...)** } diff --git a/llvm/test/ThinLTO/X86/noinline.ll b/llvm/test/ThinLTO/X86/noinline.ll index 74461853efa7cd..27f59ab909678b 100644 --- a/llvm/test/ThinLTO/X86/noinline.ll +++ b/llvm/test/ThinLTO/X86/noinline.ll @@ -12,7 +12,7 @@ ; CHECK-NOT: define available_externally i32 @foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" ; Function Attrs: nounwind ssp uwtable diff --git a/llvm/test/ThinLTO/X86/personality-local.ll b/llvm/test/ThinLTO/X86/personality-local.ll index af88d2922a4fb1..8aa75efaad674d 100644 --- a/llvm/test/ThinLTO/X86/personality-local.ll +++ b/llvm/test/ThinLTO/X86/personality-local.ll @@ -18,7 +18,7 @@ ; CHECK-NEXT: Section: .text ; CHECK-NEXT: } -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" declare void @foo() diff --git a/llvm/test/ThinLTO/X86/personality.ll b/llvm/test/ThinLTO/X86/personality.ll index bf773a8ae9b64c..edf91057c1a1b7 100644 --- a/llvm/test/ThinLTO/X86/personality.ll +++ b/llvm/test/ThinLTO/X86/personality.ll @@ -42,7 +42,7 @@ ; BINDING-NOT: Name: personality_routine3 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" declare protected i32 @personality_routine(i32, i32, i64, i8*, i8*) diff --git a/llvm/test/ThinLTO/X86/pr35472.ll b/llvm/test/ThinLTO/X86/pr35472.ll index 324cb735e52268..96a95aa463659b 100644 --- a/llvm/test/ThinLTO/X86/pr35472.ll +++ b/llvm/test/ThinLTO/X86/pr35472.ll @@ -13,7 +13,7 @@ ; ThinLTOa-DAG: W _ZN4EchoD2Ev ; ThinLTOb-DAG: T _Z5Alphav -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.Delta = type { %struct.Charlie } diff --git a/llvm/test/ThinLTO/X86/reference_non_importable.ll b/llvm/test/ThinLTO/X86/reference_non_importable.ll index a488b2432f7bde..51e6f38c38b179 100644 --- a/llvm/test/ThinLTO/X86/reference_non_importable.ll +++ b/llvm/test/ThinLTO/X86/reference_non_importable.ll @@ -10,7 +10,7 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" ; We shouldn't promote the private because it has a section diff --git a/llvm/test/ThinLTO/X86/referenced_by_constant.ll b/llvm/test/ThinLTO/X86/referenced_by_constant.ll index b352cbb2ea42b0..ac72edd597042c 100644 --- a/llvm/test/ThinLTO/X86/referenced_by_constant.ll +++ b/llvm/test/ThinLTO/X86/referenced_by_constant.ll @@ -21,7 +21,7 @@ ; EXPORT: define void @referencedbyglobal() ; EXPORT: define internal void @localreferencedbyglobal() -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" declare void @bar() diff --git a/llvm/test/ThinLTO/X86/save_objects.ll b/llvm/test/ThinLTO/X86/save_objects.ll index 11b7e9da9ffd4c..b9a9c983f831ef 100644 --- a/llvm/test/ThinLTO/X86/save_objects.ll +++ b/llvm/test/ThinLTO/X86/save_objects.ll @@ -24,7 +24,7 @@ ; RUN: ls %t.thin.out | grep x86_64.thinlto.o | count 2 -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @globalfunc() #0 { diff --git a/llvm/test/ThinLTO/X86/strong_non_prevailing.ll b/llvm/test/ThinLTO/X86/strong_non_prevailing.ll index 4fd72cf3f05c6f..214af649fcfab4 100644 --- a/llvm/test/ThinLTO/X86/strong_non_prevailing.ll +++ b/llvm/test/ThinLTO/X86/strong_non_prevailing.ll @@ -5,7 +5,7 @@ ; RUN: llvm-nm -o - < %t.bc.thinlto.o | FileCheck %s --check-prefix=EXPORTED ; RUN: llvm-nm -o - < %t2.bc.thinlto.o 2>&1 | FileCheck %s --check-prefix=NOT_EXPORTED -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $__llvm_profile_filename = comdat any diff --git a/llvm/test/ThinLTO/X86/thinlto-internalize-used.ll b/llvm/test/ThinLTO/X86/thinlto-internalize-used.ll index e0a2eb7b3d3fb8..065f64ec09a0ff 100644 --- a/llvm/test/ThinLTO/X86/thinlto-internalize-used.ll +++ b/llvm/test/ThinLTO/X86/thinlto-internalize-used.ll @@ -4,7 +4,7 @@ ; RUN: llvm-lto -thinlto-action=internalize -thinlto-index %t-index.bc %t.bc -o %t.promote.bc ; RUN: llvm-dis %t.promote.bc -o - | FileCheck %s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.15.0" @llvm.used = appending global [1 x i8*] [i8* bitcast (i32 ()* @foo to i8*)], section "llvm.metadata" diff --git a/llvm/test/ThinLTO/X86/tli-nobuiltin.ll b/llvm/test/ThinLTO/X86/tli-nobuiltin.ll index bf9cf907aec31a..9a480cba11568e 100644 --- a/llvm/test/ThinLTO/X86/tli-nobuiltin.ll +++ b/llvm/test/ThinLTO/X86/tli-nobuiltin.ll @@ -25,7 +25,7 @@ ; ThinLTO-FREESTANDING: fprintf -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" declare i32 @fprintf(%FILE*, i8*, ...) diff --git a/llvm/test/ThinLTO/X86/weak_externals.ll b/llvm/test/ThinLTO/X86/weak_externals.ll index d5429b7234bf71..a07b431e936cb3 100644 --- a/llvm/test/ThinLTO/X86/weak_externals.ll +++ b/llvm/test/ThinLTO/X86/weak_externals.ll @@ -12,7 +12,7 @@ ; CHECK: @_ZZN9SingletonI1SE11getInstanceEvE13instance_weak = available_externally dso_local global %struct.S* null, align 8 ; CHECK: define internal dereferenceable(16) %struct.S* @_ZN9SingletonI1SE11getInstanceEv() comdat -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.S = type { i64, i64 } diff --git a/llvm/test/ThinLTO/X86/weak_resolution.ll b/llvm/test/ThinLTO/X86/weak_resolution.ll index b9f10afd6d624d..e39e42285294d4 100644 --- a/llvm/test/ThinLTO/X86/weak_resolution.ll +++ b/llvm/test/ThinLTO/X86/weak_resolution.ll @@ -12,7 +12,7 @@ ; When exported, we always preserve a linkonce ; RUN: llvm-lto -thinlto-action=promote %t.bc -thinlto-index=%t3.bc -o - --exported-symbol=linkonceodrfuncInSingleModule | llvm-dis -o - | FileCheck %s --check-prefix=EXPORTED -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" ; Alias are resolved, but can't be turned into "available_externally" diff --git a/llvm/test/ThinLTO/X86/writeonly.ll b/llvm/test/ThinLTO/X86/writeonly.ll index 20f4533efe6867..7c2af6d9cce347 100644 --- a/llvm/test/ThinLTO/X86/writeonly.ll +++ b/llvm/test/ThinLTO/X86/writeonly.ll @@ -25,7 +25,7 @@ ; OPTIMIZE-NEXT: %2 = tail call i32 @rand() ; OPTIMIZE-NEXT: ret i32 0 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" @gBar = external global i32 diff --git a/llvm/test/ThinLTO/X86/writeonly2.ll b/llvm/test/ThinLTO/X86/writeonly2.ll index a7383f25b48226..b1e53ba47b5cb1 100644 --- a/llvm/test/ThinLTO/X86/writeonly2.ll +++ b/llvm/test/ThinLTO/X86/writeonly2.ll @@ -37,7 +37,7 @@ ; CODEGEN-SRC-NEXT: %2 = tail call i32 @rand() ; CODEGEN-SRC-NEXT: ret void -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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-pc-linux-gnu" ; We should be able to link external definition of gBar to its declaration diff --git a/llvm/test/Transforms/FunctionImport/Inputs/comdat.ll b/llvm/test/Transforms/FunctionImport/Inputs/comdat.ll index 3eac3e31908a3c..1df6f25351e587 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/comdat.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/comdat.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" define void @main() { diff --git a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_debug.ll b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_debug.ll index 75ecf71c495eee..f553af41896fcb 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_debug.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_debug.ll @@ -1,5 +1,5 @@ ; ModuleID = 'funcimport_debug.o' -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved1.ll b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved1.ll index a2ea145f2b453d..2b2443c96afeb3 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved1.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved1.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define void @foo() { diff --git a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved2.ll b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved2.ll index 78da8b5994d2c0..278a7f4553fe0b 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved2.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_resolved2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define linkonce_odr void @linkonceodrfunc() { diff --git a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_var2.ll b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_var2.ll index 5a6240aa444de6..95abe658e34564 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/funcimport_var2.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/funcimport_var2.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @link = internal global i32 0, align 4 diff --git a/llvm/test/Transforms/FunctionImport/Inputs/hotness_based_import.ll b/llvm/test/Transforms/FunctionImport/Inputs/hotness_based_import.ll index 3ee74a25eb0025..6951b65818d589 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/hotness_based_import.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/hotness_based_import.ll @@ -1,5 +1,5 @@ ; ModuleID = 'thinlto-function-summary-callgraph-profile-summary2.ll' -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" diff --git a/llvm/test/Transforms/FunctionImport/Inputs/import_stats.ll b/llvm/test/Transforms/FunctionImport/Inputs/import_stats.ll index 413f6cea5178b9..818fbf20d6ff69 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/import_stats.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/import_stats.ll @@ -1,5 +1,5 @@ ; ModuleID = 'import_stats2.ll' -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @globalvar = global i32 1, align 4 diff --git a/llvm/test/Transforms/FunctionImport/Inputs/not-prevailing.ll b/llvm/test/Transforms/FunctionImport/Inputs/not-prevailing.ll index a3f1f070ff9661..ca17d7f377c7e2 100644 --- a/llvm/test/Transforms/FunctionImport/Inputs/not-prevailing.ll +++ b/llvm/test/Transforms/FunctionImport/Inputs/not-prevailing.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 weak i32 @foo() { diff --git a/llvm/test/Transforms/FunctionImport/comdat.ll b/llvm/test/Transforms/FunctionImport/comdat.ll index 5e6643f642ef68..29e8cb538ab665 100644 --- a/llvm/test/Transforms/FunctionImport/comdat.ll +++ b/llvm/test/Transforms/FunctionImport/comdat.ll @@ -11,7 +11,7 @@ ; RUN: -r %t2.bc,lwt_fun, ; RUN: llvm-dis -o - %t3.1.3.import.bc | FileCheck %s -target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc19.0.24215" ; CHECK: $lwt.llvm.[[HASH:[0-9]+]] = comdat any diff --git a/llvm/test/Transforms/FunctionImport/funcimport_debug.ll b/llvm/test/Transforms/FunctionImport/funcimport_debug.ll index d888ef4ad7b299..e764d78c300c7f 100644 --- a/llvm/test/Transforms/FunctionImport/funcimport_debug.ll +++ b/llvm/test/Transforms/FunctionImport/funcimport_debug.ll @@ -20,7 +20,7 @@ ; CHECK-NOT: distinct !DISubprogram ; ModuleID = 'funcimport_debug.o' -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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/llvm/test/Transforms/FunctionImport/funcimport_resolved.ll b/llvm/test/Transforms/FunctionImport/funcimport_resolved.ll index 2a06be4db7a509..b256a613602d29 100644 --- a/llvm/test/Transforms/FunctionImport/funcimport_resolved.ll +++ b/llvm/test/Transforms/FunctionImport/funcimport_resolved.ll @@ -38,7 +38,7 @@ ; INSTLIM8: Is importing function {{.*}} f from {{.*}}funcimport_resolved1.ll ; INSTLIM8-NOT: Is importing function {{.*}} linkonceodrfunc from {{.*}}funcimport_resolved2.ll -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" define i32 @main() #0 { diff --git a/llvm/test/Transforms/FunctionImport/funcimport_var.ll b/llvm/test/Transforms/FunctionImport/funcimport_var.ll index 0ed6442424fd52..edd874e6297d75 100644 --- a/llvm/test/Transforms/FunctionImport/funcimport_var.ll +++ b/llvm/test/Transforms/FunctionImport/funcimport_var.ll @@ -15,7 +15,7 @@ ; REQUIRES: x86-registered-target -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_Z4LinkPKcS0_(i8*, i8*) local_unnamed_addr { diff --git a/llvm/test/Transforms/FunctionImport/hotness_based_import.ll b/llvm/test/Transforms/FunctionImport/hotness_based_import.ll index bd90360dcd1879..9de8714072debd 100644 --- a/llvm/test/Transforms/FunctionImport/hotness_based_import.ll +++ b/llvm/test/Transforms/FunctionImport/hotness_based_import.ll @@ -74,7 +74,7 @@ ; ModuleID = 'thinlto-function-summary-callgraph.ll' -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; This function have high profile count, so entry block is hot. diff --git a/llvm/test/Transforms/FunctionImport/import_stats.ll b/llvm/test/Transforms/FunctionImport/import_stats.ll index 50d2167c6a5aed..2cb415d1e960b9 100644 --- a/llvm/test/Transforms/FunctionImport/import_stats.ll +++ b/llvm/test/Transforms/FunctionImport/import_stats.ll @@ -28,7 +28,7 @@ ; THINLINKSTATS-DAG: 1 function-import - Number of hot functions thin link decided to import ; ModuleID = 'import_stats.ll' -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; This function has a high profile count, so entry block is hot. diff --git a/llvm/test/Transforms/FunctionImport/not-prevailing.ll b/llvm/test/Transforms/FunctionImport/not-prevailing.ll index 0e0dd53950aef7..4412715e043910 100644 --- a/llvm/test/Transforms/FunctionImport/not-prevailing.ll +++ b/llvm/test/Transforms/FunctionImport/not-prevailing.ll @@ -5,7 +5,7 @@ ; CHECK: Interposable and available_externally/linkonce_odr/weak_odr symbol -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 available_externally i32 @foo() { diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_gen.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_gen.ll index 42c645db7cd4d6..bec04c6a3c8ce1 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_gen.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_gen.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $__llvm_profile_filename = comdat any diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_use.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_use.ll index ed1765f00b3a62..016172215902a0 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_use.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_cspgo_bar_use.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @odd = common dso_local global i32 0, align 4 diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_indirect_call_promotion.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_indirect_call_promotion.ll index 7412120bb52cf5..8732e54076768e 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_indirect_call_promotion.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_indirect_call_promotion.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" source_filename = "thinlto_indirect_call_promotion.c" diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp.ll index 709c950ce176c6..22860f52b5d3be 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = external local_unnamed_addr global void ()*, align 8 diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2a.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2a.ll index fc3cc935c67844..545b36c1180c2a 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2a.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2a.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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: norecurse nounwind readnone uwtable diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2b.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2b.ll index 67e091c7f114f0..f8de10c4d0dcae 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2b.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp2b.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_ZL3barv() #1 { diff --git a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp3.ll b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp3.ll index d040f1fcee9e8f..10d633be59f97f 100644 --- a/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp3.ll +++ b/llvm/test/Transforms/PGOProfile/Inputs/thinlto_samplepgo_icp3.ll @@ -1,4 +1,4 @@ -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = external local_unnamed_addr global void ()*, align 8 diff --git a/llvm/test/Transforms/PGOProfile/X86/macho.ll b/llvm/test/Transforms/PGOProfile/X86/macho.ll index 1dcfbbe44ecb2d..d2fe65f2fa7fdc 100644 --- a/llvm/test/Transforms/PGOProfile/X86/macho.ll +++ b/llvm/test/Transforms/PGOProfile/X86/macho.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-instr-gen -instrprof -S | llc | FileCheck %s --check-prefix=MACHO-DIRECTIVE -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" ; MACHO-DIRECTIVE: .weak_definition ___llvm_profile_raw_version diff --git a/llvm/test/Transforms/PGOProfile/branch1.ll b/llvm/test/Transforms/PGOProfile/branch1.ll index e3eb992286c05a..bbc7b7229131ff 100644 --- a/llvm/test/Transforms/PGOProfile/branch1.ll +++ b/llvm/test/Transforms/PGOProfile/branch1.ll @@ -18,7 +18,7 @@ ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -pass-remarks=pgo-instrumentation -pgo-emit-branch-prob -S 2>&1| FileCheck %s --check-prefix=ANALYSIS ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -pass-remarks=pgo-instrumentation -pgo-emit-branch-prob -S 2>&1| FileCheck %s --check-prefix=ANALYSIS -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN-DARWIN-LINKONCE: target triple = "x86_64-apple-darwin" diff --git a/llvm/test/Transforms/PGOProfile/branch2.ll b/llvm/test/Transforms/PGOProfile/branch2.ll index 4582ab7f725e98..f8df54b94d4091 100644 --- a/llvm/test/Transforms/PGOProfile/branch2.ll +++ b/llvm/test/Transforms/PGOProfile/branch2.ll @@ -3,7 +3,7 @@ ; RUN: llvm-profdata merge %S/Inputs/branch2.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN: $__llvm_profile_raw_version = comdat any diff --git a/llvm/test/Transforms/PGOProfile/comdat_internal.ll b/llvm/test/Transforms/PGOProfile/comdat_internal.ll index e88c61a27e59bb..74630179105a4e 100644 --- a/llvm/test/Transforms/PGOProfile/comdat_internal.ll +++ b/llvm/test/Transforms/PGOProfile/comdat_internal.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-instr-gen -instrprof -S | FileCheck %s ; RUN: opt < %s -passes=pgo-instr-gen,instrprof -S | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = comdat any diff --git a/llvm/test/Transforms/PGOProfile/criticaledge.ll b/llvm/test/Transforms/PGOProfile/criticaledge.ll index 93798b56358c1a..4b2ea6becfec6e 100644 --- a/llvm/test/Transforms/PGOProfile/criticaledge.ll +++ b/llvm/test/Transforms/PGOProfile/criticaledge.ll @@ -3,7 +3,7 @@ ; RUN: llvm-profdata merge %S/Inputs/criticaledge.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN: $__llvm_profile_raw_version = comdat any diff --git a/llvm/test/Transforms/PGOProfile/cspgo_profile_summary.ll b/llvm/test/Transforms/PGOProfile/cspgo_profile_summary.ll index b3098336f5efa2..ad977658f8988a 100644 --- a/llvm/test/Transforms/PGOProfile/cspgo_profile_summary.ll +++ b/llvm/test/Transforms/PGOProfile/cspgo_profile_summary.ll @@ -4,7 +4,7 @@ ; RUN: opt < %s -O2 -disable-preinline -pgo-kind=pgo-instr-use-pipeline -profile-file=%t.profdata -S | FileCheck %s --check-prefix=PGOSUMMARY ; RUN: opt < %s -O2 -disable-preinline -pgo-kind=pgo-instr-use-pipeline -profile-file=%t.profdata -S -cspgo-kind=cspgo-instr-use-pipeline| FileCheck %s --check-prefix=CSPGOSUMMARY -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @odd = common dso_local global i32 0, align 4 diff --git a/llvm/test/Transforms/PGOProfile/diag_FE_profile.ll b/llvm/test/Transforms/PGOProfile/diag_FE_profile.ll index e5f58ff135f5ba..cd33954284f8ab 100644 --- a/llvm/test/Transforms/PGOProfile/diag_FE_profile.ll +++ b/llvm/test/Transforms/PGOProfile/diag_FE_profile.ll @@ -4,7 +4,7 @@ ; CHECK: Not an IR level instrumentation profile -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/llvm/test/Transforms/PGOProfile/diag_mismatch.ll b/llvm/test/Transforms/PGOProfile/diag_mismatch.ll index c1f6c6d59809c7..e2b7f8cdcc58e8 100644 --- a/llvm/test/Transforms/PGOProfile/diag_mismatch.ll +++ b/llvm/test/Transforms/PGOProfile/diag_mismatch.ll @@ -4,7 +4,7 @@ ; CHECK: Function control flow change detected (hash mismatch) foo -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/llvm/test/Transforms/PGOProfile/diag_no_funcprofdata.ll b/llvm/test/Transforms/PGOProfile/diag_no_funcprofdata.ll index 88133e2178cca6..61c1f7ab6d18d6 100644 --- a/llvm/test/Transforms/PGOProfile/diag_no_funcprofdata.ll +++ b/llvm/test/Transforms/PGOProfile/diag_no_funcprofdata.ll @@ -8,7 +8,7 @@ ; CHECK: No profile data available for function bar ; DEFAULT-NOT: No profile data available for function bar -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar() { diff --git a/llvm/test/Transforms/PGOProfile/diag_no_profile.ll b/llvm/test/Transforms/PGOProfile/diag_no_profile.ll index 7a60dc9c16463d..222d9bd098612c 100644 --- a/llvm/test/Transforms/PGOProfile/diag_no_profile.ll +++ b/llvm/test/Transforms/PGOProfile/diag_no_profile.ll @@ -1,7 +1,7 @@ ; RUN: not opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S 2>&1 ; RUN: not opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S 2>&1 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/llvm/test/Transforms/PGOProfile/diag_no_value_sites.ll b/llvm/test/Transforms/PGOProfile/diag_no_value_sites.ll index d5cf2abea1111f..251e5ce7d9f14c 100644 --- a/llvm/test/Transforms/PGOProfile/diag_no_value_sites.ll +++ b/llvm/test/Transforms/PGOProfile/diag_no_value_sites.ll @@ -3,7 +3,7 @@ ; CHECK: Inconsistent number of value sites for memory intrinsic functions size profiling -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i8* %dst, i8* %src, i64 %n) { diff --git a/llvm/test/Transforms/PGOProfile/do-not-instrument.ll b/llvm/test/Transforms/PGOProfile/do-not-instrument.ll index ca950a621e8e44..616e94273756cb 100644 --- a/llvm/test/Transforms/PGOProfile/do-not-instrument.ll +++ b/llvm/test/Transforms/PGOProfile/do-not-instrument.ll @@ -1,7 +1,7 @@ ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s ; RUN: opt < %s -passes=pgo-instr-gen -S | FileCheck %s -target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.12.0" define i32 @f1() { diff --git a/llvm/test/Transforms/PGOProfile/func_entry.ll b/llvm/test/Transforms/PGOProfile/func_entry.ll index 37fad27f2f2fed..dac996e35cb3da 100644 --- a/llvm/test/Transforms/PGOProfile/func_entry.ll +++ b/llvm/test/Transforms/PGOProfile/func_entry.ll @@ -1,7 +1,7 @@ ; RUN: llvm-profdata merge %S/Inputs/func_entry.proftext -o %t.profdata ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @s = common dso_local local_unnamed_addr global i32 0, align 4 diff --git a/llvm/test/Transforms/PGOProfile/icp_covariant_call_return.ll b/llvm/test/Transforms/PGOProfile/icp_covariant_call_return.ll index c2101a98d0d142..aba075461deb35 100644 --- a/llvm/test/Transforms/PGOProfile/icp_covariant_call_return.ll +++ b/llvm/test/Transforms/PGOProfile/icp_covariant_call_return.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM ; RUN: opt < %s -passes=pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.D = type { %struct.B } diff --git a/llvm/test/Transforms/PGOProfile/icp_covariant_invoke_return.ll b/llvm/test/Transforms/PGOProfile/icp_covariant_invoke_return.ll index d0f27ac73e7825..0a4444783eb027 100644 --- a/llvm/test/Transforms/PGOProfile/icp_covariant_invoke_return.ll +++ b/llvm/test/Transforms/PGOProfile/icp_covariant_invoke_return.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM ; RUN: opt < %s -passes=pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.D = type { %struct.B } %struct.B = type { i32 (...)** } diff --git a/llvm/test/Transforms/PGOProfile/icp_invoke.ll b/llvm/test/Transforms/PGOProfile/icp_invoke.ll index c30aeb6e7df01c..1cacc1bc1aca52 100644 --- a/llvm/test/Transforms/PGOProfile/icp_invoke.ll +++ b/llvm/test/Transforms/PGOProfile/icp_invoke.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -icp-lto -pgo-icall-prom -S | FileCheck %s --check-prefix=ICP ; RUN: opt < %s -icp-lto -passes=pgo-icall-prom -S | FileCheck %s --check-prefix=ICP -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @foo1 = global void ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/icp_invoke_nouse.ll b/llvm/test/Transforms/PGOProfile/icp_invoke_nouse.ll index 55eb8588168b27..096d2e0f222e87 100644 --- a/llvm/test/Transforms/PGOProfile/icp_invoke_nouse.ll +++ b/llvm/test/Transforms/PGOProfile/icp_invoke_nouse.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -icp-lto -pgo-icall-prom -S | FileCheck %s --check-prefix=ICP -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @_ZTISt9exception = external constant i8* diff --git a/llvm/test/Transforms/PGOProfile/icp_mismatch_msg.ll b/llvm/test/Transforms/PGOProfile/icp_mismatch_msg.ll index 8a606e3233d818..5484d221a35b26 100644 --- a/llvm/test/Transforms/PGOProfile/icp_mismatch_msg.ll +++ b/llvm/test/Transforms/PGOProfile/icp_mismatch_msg.ll @@ -5,7 +5,7 @@ ; CHECK: remark: :0:0: Cannot promote indirect call: target with md5sum{{.*}} not found ; CHECK: remark: :0:0: Cannot promote indirect call to func2 with count of 7890: Return type mismatch -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = common global i32 ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/icp_vararg.ll b/llvm/test/Transforms/PGOProfile/icp_vararg.ll index ba803cf85c78e5..ec243470290ad4 100644 --- a/llvm/test/Transforms/PGOProfile/icp_vararg.ll +++ b/llvm/test/Transforms/PGOProfile/icp_vararg.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM ; RUN: opt < %s -passes=pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = common global i32 (i32, ...)* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/indirect_call_annotation.ll b/llvm/test/Transforms/PGOProfile/indirect_call_annotation.ll index 7842df37e7351e..6f72a998784b5b 100644 --- a/llvm/test/Transforms/PGOProfile/indirect_call_annotation.ll +++ b/llvm/test/Transforms/PGOProfile/indirect_call_annotation.ll @@ -1,7 +1,7 @@ ; RUN: llvm-profdata merge %S/Inputs/indirect_call.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=VP-ANNOTATION ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=VP-ANNOTATION -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = common global i32 (i32)* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/indirect_call_profile.ll b/llvm/test/Transforms/PGOProfile/indirect_call_profile.ll index a3c05e5b47015f..e1f499c08a7b23 100644 --- a/llvm/test/Transforms/PGOProfile/indirect_call_profile.ll +++ b/llvm/test/Transforms/PGOProfile/indirect_call_profile.ll @@ -2,7 +2,7 @@ ; RUN: opt < %s -passes=pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -passes=pgo-instr-gen,instrprof -S | FileCheck %s --check-prefix=LOWER -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $foo3 = comdat any diff --git a/llvm/test/Transforms/PGOProfile/indirect_call_promotion.ll b/llvm/test/Transforms/PGOProfile/indirect_call_promotion.ll index 6a9b652119900e..85df5260f19977 100644 --- a/llvm/test/Transforms/PGOProfile/indirect_call_promotion.ll +++ b/llvm/test/Transforms/PGOProfile/indirect_call_promotion.ll @@ -15,7 +15,7 @@ ; PASS2-REMARK-NOT: remark: :0:0: Promote indirect call to func3 ; PASS2-REMARK-NOT: remark: :0:0: Promote indirect call to func1 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = common global i32 ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/indirect_call_promotion_vla.ll b/llvm/test/Transforms/PGOProfile/indirect_call_promotion_vla.ll index 6a815275e4cf8d..0065031d1477c7 100644 --- a/llvm/test/Transforms/PGOProfile/indirect_call_promotion_vla.ll +++ b/llvm/test/Transforms/PGOProfile/indirect_call_promotion_vla.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-icall-prom -S | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" %struct.A = type { i8 } diff --git a/llvm/test/Transforms/PGOProfile/indirectbr.ll b/llvm/test/Transforms/PGOProfile/indirectbr.ll index 8c961adbf6f955..ce7261d39a93c2 100644 --- a/llvm/test/Transforms/PGOProfile/indirectbr.ll +++ b/llvm/test/Transforms/PGOProfile/indirectbr.ll @@ -4,7 +4,7 @@ ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | opt -S -analyze -branch-prob | FileCheck %s --check-prefix=BRANCHPROB -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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.table = internal unnamed_addr constant [3 x i8*] [i8* blockaddress(@foo, %return), i8* blockaddress(@foo, %label2), i8* blockaddress(@foo, %label3)], align 16 diff --git a/llvm/test/Transforms/PGOProfile/landingpad.ll b/llvm/test/Transforms/PGOProfile/landingpad.ll index 932d2299bbf175..3a1a3eb57b0d55 100644 --- a/llvm/test/Transforms/PGOProfile/landingpad.ll +++ b/llvm/test/Transforms/PGOProfile/landingpad.ll @@ -3,7 +3,7 @@ ; RUN: llvm-profdata merge %S/Inputs/landingpad.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @val = global i32 0, align 4 diff --git a/llvm/test/Transforms/PGOProfile/large_count_remarks.ll b/llvm/test/Transforms/PGOProfile/large_count_remarks.ll index 65ab2db72166ee..15088c39663da1 100644 --- a/llvm/test/Transforms/PGOProfile/large_count_remarks.ll +++ b/llvm/test/Transforms/PGOProfile/large_count_remarks.ll @@ -2,7 +2,7 @@ ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -pass-remarks=pgo-instrumentation -pgo-emit-branch-prob -S 2>&1| FileCheck %s --check-prefix=ANALYSIS ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -pass-remarks=pgo-instrumentation -pgo-emit-branch-prob -S 2>&1| FileCheck %s --check-prefix=ANALYSIS -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @test(i32 %i) { diff --git a/llvm/test/Transforms/PGOProfile/loop1.ll b/llvm/test/Transforms/PGOProfile/loop1.ll index dbc29547b3cfdb..dbc728a49bb042 100644 --- a/llvm/test/Transforms/PGOProfile/loop1.ll +++ b/llvm/test/Transforms/PGOProfile/loop1.ll @@ -3,7 +3,7 @@ ; RUN: llvm-profdata merge %S/Inputs/loop1.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN: $__llvm_profile_raw_version = comdat any diff --git a/llvm/test/Transforms/PGOProfile/loop2.ll b/llvm/test/Transforms/PGOProfile/loop2.ll index 1334dd26156b25..5a86f0299adc45 100644 --- a/llvm/test/Transforms/PGOProfile/loop2.ll +++ b/llvm/test/Transforms/PGOProfile/loop2.ll @@ -3,7 +3,7 @@ ; RUN: llvm-profdata merge %S/Inputs/loop2.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN: $__llvm_profile_raw_version = comdat any diff --git a/llvm/test/Transforms/PGOProfile/memcpy.ll b/llvm/test/Transforms/PGOProfile/memcpy.ll index 6047c95e7c0849..0a6c44b43742c1 100644 --- a/llvm/test/Transforms/PGOProfile/memcpy.ll +++ b/llvm/test/Transforms/PGOProfile/memcpy.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-instr-gen -instrprof -S | FileCheck %s ; RUN: opt <%s -passes=pgo-instr-gen,instrprof -S | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i8* %dst, i8* %src, i32* %a, i32 %n) { diff --git a/llvm/test/Transforms/PGOProfile/memop_size_annotation.ll b/llvm/test/Transforms/PGOProfile/memop_size_annotation.ll index a59988462ae641..4310d8ec9debc6 100644 --- a/llvm/test/Transforms/PGOProfile/memop_size_annotation.ll +++ b/llvm/test/Transforms/PGOProfile/memop_size_annotation.ll @@ -4,7 +4,7 @@ ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefixes=MEMOP_ANNOTATION,MEMOP_ANNOTATION4 ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefixes=MEMOP_ANNOTATION,MEMOP_ANNOTATION4 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i8* %dst, i8* %src, i32* %a, i32 %n) { diff --git a/llvm/test/Transforms/PGOProfile/memop_size_opt.ll b/llvm/test/Transforms/PGOProfile/memop_size_opt.ll index 8d6215cf9252ec..69cdd81ddf7ffc 100644 --- a/llvm/test/Transforms/PGOProfile/memop_size_opt.ll +++ b/llvm/test/Transforms/PGOProfile/memop_size_opt.ll @@ -6,7 +6,7 @@ ; RUN: FileCheck %s -input-file=%t.opt.yaml --check-prefix=YAML -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i8* %dst, i8* %src, i8* %dst2, i8* %src2, i32* %a, i32 %n) !prof !27 { diff --git a/llvm/test/Transforms/PGOProfile/memop_size_opt_zero.ll b/llvm/test/Transforms/PGOProfile/memop_size_opt_zero.ll index e46cadf412e5fb..43ca710534e904 100644 --- a/llvm/test/Transforms/PGOProfile/memop_size_opt_zero.ll +++ b/llvm/test/Transforms/PGOProfile/memop_size_opt_zero.ll @@ -3,7 +3,7 @@ ; RUN: opt < %s -passes=pgo-memop-opt -verify-dom-info -pgo-memop-count-threshold=1 -S | FileCheck %s --check-prefix=MEMOP_OPT ; RUN: opt < %s -pgo-memop-opt -verify-dom-info -pgo-memop-count-threshold=1 -S | FileCheck %s --check-prefix=MEMOP_OPT -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i8* %dst, i8* %src, i64 %conv) !prof !0 { diff --git a/llvm/test/Transforms/PGOProfile/multiple_hash_profile.ll b/llvm/test/Transforms/PGOProfile/multiple_hash_profile.ll index fdfb16b9e2e55f..6da94826a95478 100644 --- a/llvm/test/Transforms/PGOProfile/multiple_hash_profile.ll +++ b/llvm/test/Transforms/PGOProfile/multiple_hash_profile.ll @@ -1,7 +1,7 @@ ; RUN: llvm-profdata merge %S/Inputs/multiple_hash_profile.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $_Z3fooi = comdat any diff --git a/llvm/test/Transforms/PGOProfile/noreturncall.ll b/llvm/test/Transforms/PGOProfile/noreturncall.ll index 4470285e1edbf0..c108a82abf014a 100644 --- a/llvm/test/Transforms/PGOProfile/noreturncall.ll +++ b/llvm/test/Transforms/PGOProfile/noreturncall.ll @@ -3,7 +3,7 @@ ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; REQUIRES: asserts -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @bar0(i32) diff --git a/llvm/test/Transforms/PGOProfile/preinline.ll b/llvm/test/Transforms/PGOProfile/preinline.ll index 9a42e97d196e12..277baf99c33b9e 100644 --- a/llvm/test/Transforms/PGOProfile/preinline.ll +++ b/llvm/test/Transforms/PGOProfile/preinline.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -O2 -pgo-kind=pgo-instr-gen-pipeline -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -O2 -pgo-kind=pgo-instr-gen-pipeline -profile-file=default.profraw -S | FileCheck %s --check-prefix=GEN -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i32 %i) { diff --git a/llvm/test/Transforms/PGOProfile/remap.ll b/llvm/test/Transforms/PGOProfile/remap.ll index e84c3c40f83571..2fdca9e33d1875 100644 --- a/llvm/test/Transforms/PGOProfile/remap.ll +++ b/llvm/test/Transforms/PGOProfile/remap.ll @@ -1,7 +1,7 @@ ; RUN: llvm-profdata merge %S/Inputs/remap.proftext -o %t.profdata ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-test-profile-remapping-file=%S/Inputs/remap.map -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @_ZN3foo3barERKN1M1XINS_6detail3quxEEE(i32 %i) { diff --git a/llvm/test/Transforms/PGOProfile/select1.ll b/llvm/test/Transforms/PGOProfile/select1.ll index 47d83c84aa0917..34e30a23ab0a77 100644 --- a/llvm/test/Transforms/PGOProfile/select1.ll +++ b/llvm/test/Transforms/PGOProfile/select1.ll @@ -5,7 +5,7 @@ ; RUN: llvm-profdata merge %S/Inputs/select1.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-instr-select=true -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-instr-select=true -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @test_br_2(i32 %i) { diff --git a/llvm/test/Transforms/PGOProfile/select2.ll b/llvm/test/Transforms/PGOProfile/select2.ll index e95d00b248f44a..b19fa1ff798f4a 100644 --- a/llvm/test/Transforms/PGOProfile/select2.ll +++ b/llvm/test/Transforms/PGOProfile/select2.ll @@ -2,7 +2,7 @@ ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-instr-select=true -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-instr-select=true -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo(i32 %n) { diff --git a/llvm/test/Transforms/PGOProfile/select_hash_conflict.ll b/llvm/test/Transforms/PGOProfile/select_hash_conflict.ll index ab91db48c0f5de..e7c3cdb2184b53 100644 --- a/llvm/test/Transforms/PGOProfile/select_hash_conflict.ll +++ b/llvm/test/Transforms/PGOProfile/select_hash_conflict.ll @@ -2,7 +2,7 @@ ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-instr-select=true -S | FileCheck %s ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -pgo-instr-select=true -S | FileCheck %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @a = common dso_local local_unnamed_addr global [16 x i32] zeroinitializer, align 16 diff --git a/llvm/test/Transforms/PGOProfile/single_bb.ll b/llvm/test/Transforms/PGOProfile/single_bb.ll index 646f798a6ff894..874d8e4d22d692 100644 --- a/llvm/test/Transforms/PGOProfile/single_bb.ll +++ b/llvm/test/Transforms/PGOProfile/single_bb.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -pgo-instr-gen -S | FileCheck %s --check-prefix=GEN ; RUN: opt < %s -passes=pgo-instr-gen -S | FileCheck %s --check-prefix=GEN -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN: $__llvm_profile_raw_version = comdat any diff --git a/llvm/test/Transforms/PGOProfile/statics_counter_naming.ll b/llvm/test/Transforms/PGOProfile/statics_counter_naming.ll index dc15151f350f9c..c329ddba930044 100644 --- a/llvm/test/Transforms/PGOProfile/statics_counter_naming.ll +++ b/llvm/test/Transforms/PGOProfile/statics_counter_naming.ll @@ -4,7 +4,7 @@ ; RUN: opt %s -passes=pgo-instr-gen -static-func-strip-dirname-prefix=1000 -S | FileCheck %s --check-prefix=NOPATH ; RUN: opt %s --pgo-instr-gen -static-func-strip-dirname-prefix=1 -S | FileCheck %s --check-prefix=HASPATH ; RUN: opt %s -passes=pgo-instr-gen -static-func-strip-dirname-prefix=1 -S | FileCheck %s --check-prefix=HASPATH -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; NOPATH: @__profn_statics_counter_naming.ll_func = private constant [30 x i8] c"statics_counter_naming.ll:func" diff --git a/llvm/test/Transforms/PGOProfile/switch.ll b/llvm/test/Transforms/PGOProfile/switch.ll index 2cefd34d855ca2..e590e217013a8b 100644 --- a/llvm/test/Transforms/PGOProfile/switch.ll +++ b/llvm/test/Transforms/PGOProfile/switch.ll @@ -3,7 +3,7 @@ ; RUN: llvm-profdata merge %S/Inputs/switch.proftext -o %t.profdata ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" ; GEN: $__llvm_profile_raw_version = comdat any diff --git a/llvm/test/Transforms/PGOProfile/thinlto_cspgo_gen.ll b/llvm/test/Transforms/PGOProfile/thinlto_cspgo_gen.ll index 1a213e8211cced..1f6264378b84e6 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_cspgo_gen.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_cspgo_gen.ll @@ -19,7 +19,7 @@ ; CSGEN: @__profd_ source_filename = "cspgo.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" $__llvm_profile_filename = comdat any diff --git a/llvm/test/Transforms/PGOProfile/thinlto_cspgo_use.ll b/llvm/test/Transforms/PGOProfile/thinlto_cspgo_use.ll index 1be8de4c0841cc..6a8b034315de64 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_cspgo_use.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_cspgo_use.ll @@ -18,7 +18,7 @@ ; CSUSE-DAG: {{![0-9]+}} = !{!"branch_weights", i32 0, i32 100000} source_filename = "cspgo.c" -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 dso_local void @foo() #0 !prof !29 { diff --git a/llvm/test/Transforms/PGOProfile/thinlto_indirect_call_promotion.ll b/llvm/test/Transforms/PGOProfile/thinlto_indirect_call_promotion.ll index b4c9c6fc55a21b..6d928eaca7244f 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_indirect_call_promotion.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_indirect_call_promotion.ll @@ -12,7 +12,7 @@ ; PASS-REMARK: Promote indirect call to a with count 1 out of 1 ; PASS-REMARK: Promote indirect call to c.llvm.0 with count 1 out of 1 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 = external local_unnamed_addr global void ()*, align 8 diff --git a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp.ll b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp.ll index e89e43f447f3c8..b6b668dbc29a04 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp.ll @@ -9,7 +9,7 @@ ; IMPORTS: Import _ZL3foov.llvm.0 ; RUN: opt %t4.bc -icp-lto -pgo-icall-prom -S | FileCheck %s --check-prefix=ICALL-PROM -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = local_unnamed_addr global void ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp2.ll b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp2.ll index 1271b7780e4954..7e3afb0775a97e 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp2.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp2.ll @@ -24,7 +24,7 @@ ; RUN: llvm-dis < %t3.3.2.internalize.bc | FileCheck %s --check-prefix=INTERNALIZE ; INTERNALIZE: define dso_local void @_ZL3barv -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = local_unnamed_addr global void ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp3.ll b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp3.ll index 15fa0398b8be89..3044964f33ced7 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp3.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp3.ll @@ -10,7 +10,7 @@ ; Make sure we import the promted indirectly called target ; IMPORTS: Import _ZL3foov.llvm.0 -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = local_unnamed_addr global void ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp_droppeddead.ll b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp_droppeddead.ll index df93826a7b7cec..fcbc2d6454121c 100644 --- a/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp_droppeddead.ll +++ b/llvm/test/Transforms/PGOProfile/thinlto_samplepgo_icp_droppeddead.ll @@ -12,7 +12,7 @@ ; RUN: -r %t.bc,main,plx -r %t.bc,_ZL3foov,l -compute-dead=false ; RUN: llvm-dis < %t2.1.4.opt.bc | FileCheck %s --check-prefix=OPT-NODEAD -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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" @fptr = local_unnamed_addr global void ()* null, align 8 diff --git a/llvm/test/Transforms/PGOProfile/unreachable_bb.ll b/llvm/test/Transforms/PGOProfile/unreachable_bb.ll index 1b7fe4b05697eb..a27fbe77526760 100644 --- a/llvm/test/Transforms/PGOProfile/unreachable_bb.ll +++ b/llvm/test/Transforms/PGOProfile/unreachable_bb.ll @@ -2,7 +2,7 @@ ; RUN: opt < %s -pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE ; RUN: opt < %s -passes=pgo-instr-use -pgo-test-profile-file=%t.profdata -S | FileCheck %s --check-prefix=USE -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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 @foo() { diff --git a/llvm/test/tools/llvm-lto2/X86/pipeline.ll b/llvm/test/tools/llvm-lto2/X86/pipeline.ll index f9759b590857c8..9ab81ac70a7dcc 100644 --- a/llvm/test/tools/llvm-lto2/X86/pipeline.ll +++ b/llvm/test/tools/llvm-lto2/X86/pipeline.ll @@ -15,7 +15,7 @@ ; is accepted). ; RUN: llvm-lto2 run %t1.bc -o %t.o -use-new-pm -r %t1.bc,patatino,px -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() { diff --git a/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll b/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll index 948c5220220405..c73c5021f626d0 100644 --- a/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll +++ b/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll @@ -6,7 +6,7 @@ ; RUN: llvm-lto2 run %t1.bc -o %t.o -r %t1.bc,patatino,px -stats-file=%t2.stats ; RUN: FileCheck --input-file=%t2.stats %s -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-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() { diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu index 50b86542bb9833..b7b800216288aa 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu @@ -10,6 +10,7 @@ // //===----------------------------------------------------------------------===// #include "omptarget-nvptx.h" +#include "target_impl.h" #include // Warp ID in the CUDA block @@ -430,9 +431,10 @@ INLINE static void* data_sharing_push_stack_common(size_t PushSize) { } } // Get address from lane 0. - ((int *)&FrameP)[0] = __SHFL_SYNC(CurActive, ((int *)&FrameP)[0], 0); + int *FP = (int *)&FrameP; + FP[0] = __kmpc_impl_shfl_sync(CurActive, FP[0], 0); if (sizeof(FrameP) == 8) - ((int *)&FrameP)[1] = __SHFL_SYNC(CurActive, ((int *)&FrameP)[1], 0); + FP[1] = __kmpc_impl_shfl_sync(CurActive, FP[1], 0); return FrameP; } diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu index ff9fac39090168..4f24adace556f9 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu @@ -383,8 +383,8 @@ public: INLINE static int64_t Shuffle(unsigned active, int64_t val, int leader) { int lo, hi; __kmpc_impl_unpack(val, lo, hi); - hi = __SHFL_SYNC(active, hi, leader); - lo = __SHFL_SYNC(active, lo, leader); + hi = __kmpc_impl_shfl_sync(active, hi, leader); + lo = __kmpc_impl_shfl_sync(active, lo, leader); return __kmpc_impl_pack(lo, hi); } diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h b/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h index a5e4a71bdf3a90..9fcd1a925834e4 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h @@ -51,13 +51,11 @@ #ifndef CUDA_VERSION #error CUDA_VERSION macro is undefined, something wrong with cuda. #elif CUDA_VERSION >= 9000 -#define __SHFL_SYNC(mask, var, srcLane) __shfl_sync((mask), (var), (srcLane)) #define __SHFL_DOWN_SYNC(mask, var, delta, width) \ __shfl_down_sync((mask), (var), (delta), (width)) #define __ACTIVEMASK() __activemask() #define __SYNCWARP(Mask) __syncwarp(Mask) #else -#define __SHFL_SYNC(mask, var, srcLane) __shfl((var), (srcLane)) #define __SHFL_DOWN_SYNC(mask, var, delta, width) \ __shfl_down((var), (delta), (width)) #define __ACTIVEMASK() __ballot(1) diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu index 67472350d1834f..182a4f68cc5793 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu @@ -33,6 +33,7 @@ //===----------------------------------------------------------------------===// #include "omptarget-nvptx.h" +#include "target_impl.h" typedef struct ConvergentSimdJob { omptarget_nvptx_TaskDescr taskDescr; @@ -64,7 +65,7 @@ EXTERN bool __kmpc_kernel_convergent_simd(void *buffer, uint32_t Mask, omptarget_nvptx_threadPrivateContext->SimdLimitForNextSimd(threadId); job->slimForNextSimd = SimdLimit; - int32_t SimdLimitSource = __SHFL_SYNC(Mask, SimdLimit, *LaneSource); + int32_t SimdLimitSource = __kmpc_impl_shfl_sync(Mask, SimdLimit, *LaneSource); // reset simdlimit to avoid propagating to successive #simd if (SimdLimitSource > 0 && threadId == sourceThreadId) omptarget_nvptx_threadPrivateContext->SimdLimitForNextSimd(threadId) = 0; @@ -138,7 +139,8 @@ EXTERN bool __kmpc_kernel_convergent_parallel(void *buffer, uint32_t Mask, omptarget_nvptx_threadPrivateContext->NumThreadsForNextParallel(threadId); job->tnumForNextPar = NumThreadsClause; - int32_t NumThreadsSource = __SHFL_SYNC(Mask, NumThreadsClause, *LaneSource); + int32_t NumThreadsSource = + __kmpc_impl_shfl_sync(Mask, NumThreadsClause, *LaneSource); // reset numthreads to avoid propagating to successive #parallel if (NumThreadsSource > 0 && threadId == sourceThreadId) omptarget_nvptx_threadPrivateContext->NumThreadsForNextParallel(threadId) = diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h index a1b4c20653ce65..caa9feafe037c2 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h @@ -38,6 +38,20 @@ INLINE int __kmpc_impl_ffs(uint32_t x) { return __ffs(x); } INLINE int __kmpc_impl_popc(uint32_t x) { return __popc(x); } +#ifndef CUDA_VERSION +#error CUDA_VERSION macro is undefined, something wrong with cuda. +#endif + +// In Cuda 9.0, the *_sync() version takes an extra argument 'mask'. +INLINE int32_t __kmpc_impl_shfl_sync(__kmpc_impl_lanemask_t Mask, int32_t Var, + int32_t SrcLane) { +#if CUDA_VERSION >= 9000 + return __shfl_sync(Mask, Var, SrcLane); +#else + return __shfl(Var, SrcLane); +#endif // CUDA_VERSION +} + INLINE void __kmpc_impl_syncwarp(int32_t Mask) { __SYNCWARP(Mask); } #endif