r197430 - Clang DataLayout string cleanup: don't print the pointer defaults.
Rafael Espindola
rafael.espindola at gmail.com
Mon Dec 16 13:59:14 PST 2013
Author: rafael
Date: Mon Dec 16 15:59:14 2013
New Revision: 197430
URL: http://llvm.org/viewvc/llvm-project?rev=197430&view=rev
Log:
Clang DataLayout string cleanup: don't print the pointer defaults.
Modified:
cfe/trunk/lib/Basic/Targets.cpp
cfe/trunk/test/CodeGen/target-data.c
Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=197430&r1=197429&r2=197430&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Mon Dec 16 15:59:14 2013
@@ -1224,11 +1224,11 @@ public:
if (getTriple().getOS() == llvm::Triple::FreeBSD) {
LongDoubleWidth = LongDoubleAlign = 64;
LongDoubleFormat = &llvm::APFloat::IEEEdouble;
- DescriptionString = "E-p:64:64:64-"
+ DescriptionString = "E-"
"i64:64:64-"
"n32:64";
} else
- DescriptionString = "E-p:64:64:64-"
+ DescriptionString = "E-"
"i64:64:64-f128:128:128-"
"n32:64";
@@ -1268,7 +1268,7 @@ public:
: DarwinTargetInfo<PPC64TargetInfo>(Triple) {
HasAlignMac68kSupport = true;
SuitableAlign = 128;
- DescriptionString = "E-p:64:64:64-"
+ DescriptionString = "E-"
"i64:64:64-n32:64";
}
};
@@ -1388,7 +1388,7 @@ namespace {
PointerWidth = PointerAlign = 64;
SizeType = PtrDiffType = IntPtrType = TargetInfo::UnsignedLongLong;
DescriptionString
- = "e-p:64:64:64-i64:64:64"
+ = "e-i64:64:64"
"-v16:16:16-v32:32:32-"
"n16:32:64";
}
@@ -1424,7 +1424,7 @@ static const char *DescriptionStringR600
static const char *DescriptionStringSI =
"e"
- "-p:64:64:64"
+ ""
"-p3:32:32:32"
"-i64:64:64"
"-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128"
@@ -3224,7 +3224,7 @@ public:
Int64Type = SignedLong;
RegParmMax = 6;
- DescriptionString = "e-p:64:64:64-"
+ DescriptionString = "e-"
"i64:64:64-"
"s:64:64-f80:128:128-n8:16:32:64-S128";
@@ -4502,7 +4502,7 @@ class SparcV9TargetInfo : public SparcTa
public:
SparcV9TargetInfo(const llvm::Triple &Triple) : SparcTargetInfo(Triple) {
// FIXME: Support Sparc quad-precision long double?
- DescriptionString = "E-p:64:64:64-"
+ DescriptionString = "E-"
"i64:64:64-n32:64-S128";
// This is an LP64 platform.
LongWidth = LongAlign = PointerWidth = PointerAlign = 64;
@@ -4569,7 +4569,7 @@ namespace {
LongDoubleAlign = 64;
LongDoubleFormat = &llvm::APFloat::IEEEquad;
MinGlobalAlign = 16;
- DescriptionString = "E-p:64:64:64-i1:8:16-i8:8:16-i16:16-i32:32-i64:64"
+ DescriptionString = "E-i1:8:16-i8:8:16-i16:16-i32:32-i64:64"
"-f32:32-f64:64-f128:64-a:8:16-n32:64";
MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 64;
}
@@ -5246,7 +5246,7 @@ class Mips64EBTargetInfo : public Mips64
"i64:64:64-f128:128:128-"
"n32:64-S128";
else
- DescriptionString = "E-p:64:64:64-i8:8:32-i16:16:32-"
+ DescriptionString = "E-i8:8:32-i16:16:32-"
"i64:64:64-f128:128:128-"
"n32:64-S128";
@@ -5270,7 +5270,7 @@ class Mips64ELTargetInfo : public Mips64
"i64:64:64-f128:128:128"
"-n32:64-S128";
else
- DescriptionString = "e-p:64:64:64-i8:8:32-i16:16:32-"
+ DescriptionString = "e-i8:8:32-i16:16:32-"
"i64:64:64-f128:128:128-"
"n32:64-S128";
}
@@ -5436,7 +5436,7 @@ namespace {
SizeType = TargetInfo::UnsignedLong;
PtrDiffType = IntPtrType = TargetInfo::SignedLong;
DescriptionString
- = "e-p:64:64:64-i64:64:64"
+ = "e-i64:64:64"
"-v16:16:16-v24:32:32-v32:32:32-v48:64:64-"
"v96:128:128-v192:256:256-v256:256:256-"
"v512:512:512-v1024:1024:1024";
Modified: cfe/trunk/test/CodeGen/target-data.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/target-data.c?rev=197430&r1=197429&r2=197430&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/target-data.c (original)
+++ cfe/trunk/test/CodeGen/target-data.c Mon Dec 16 15:59:14 2013
@@ -16,7 +16,7 @@
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | \
// RUN: FileCheck --check-prefix=X86_64 %s
-// X86_64: target datalayout = "e-p:64:64:64-i64:64:64-s:64:64-f80:128:128-n8:16:32:64-S128"
+// X86_64: target datalayout = "e-i64:64:64-s:64:64-f80:128:128-n8:16:32:64-S128"
// RUN: %clang_cc1 -triple xcore-unknown-unknown -emit-llvm -o - %s | \
// RUN: FileCheck --check-prefix=XCORE %s
@@ -28,7 +28,7 @@
// RUN: %clang_cc1 -triple sparcv9-sun-solaris -emit-llvm -o - %s | \
// RUN: FileCheck %s --check-prefix=SPARC-V9
-// SPARC-V9: target datalayout = "E-p:64:64:64-i64:64:64-n32:64-S128"
+// SPARC-V9: target datalayout = "E-i64:64:64-n32:64-S128"
// RUN: %clang_cc1 -triple mipsel-linux-gnu -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=MIPS-32EL
@@ -40,7 +40,7 @@
// RUN: %clang_cc1 -triple mips64el-linux-gnu -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=MIPS-64EL
-// MIPS-64EL: target datalayout = "e-p:64:64:64-i8:8:32-i16:16:32-i64:64:64-f128:128:128-n32:64-S128"
+// MIPS-64EL: target datalayout = "e-i8:8:32-i16:16:32-i64:64:64-f128:128:128-n32:64-S128"
// RUN: %clang_cc1 -triple mips64el-linux-gnu -o - -emit-llvm -target-abi n32 \
// RUN: %s | FileCheck %s -check-prefix=MIPS-64EL-N32
@@ -48,7 +48,7 @@
// RUN: %clang_cc1 -triple mips64-linux-gnu -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=MIPS-64EB
-// MIPS-64EB: target datalayout = "E-p:64:64:64-i8:8:32-i16:16:32-i64:64:64-f128:128:128-n32:64-S128"
+// MIPS-64EB: target datalayout = "E-i8:8:32-i16:16:32-i64:64:64-f128:128:128-n32:64-S128"
// RUN: %clang_cc1 -triple mips64-linux-gnu -o - -emit-llvm %s -target-abi n32 \
// RUN: | FileCheck %s -check-prefix=MIPS-64EB-N32
@@ -70,11 +70,11 @@
// RUN: %clang_cc1 -triple powerpc64-freebsd -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=PPC64-FREEBSD
-// PPC64-FREEBSD: target datalayout = "E-p:64:64:64-i64:64:64-n32:64"
+// PPC64-FREEBSD: target datalayout = "E-i64:64:64-n32:64"
// RUN: %clang_cc1 -triple powerpc64-linux -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=PPC64-LINUX
-// PPC64-LINUX: target datalayout = "E-p:64:64:64-i64:64:64-f128:128:128-n32:64"
+// PPC64-LINUX: target datalayout = "E-i64:64:64-f128:128:128-n32:64"
// RUN: %clang_cc1 -triple powerpc-darwin -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=PPC32-DARWIN
@@ -82,7 +82,7 @@
// RUN: %clang_cc1 -triple powerpc64-darwin -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=PPC64-DARWIN
-// PPC64-DARWIN: target datalayout = "E-p:64:64:64-i64:64:64-n32:64"
+// PPC64-DARWIN: target datalayout = "E-i64:64:64-n32:64"
// RUN: %clang_cc1 -triple nvptx-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=NVPTX
@@ -90,7 +90,7 @@
// RUN: %clang_cc1 -triple nvptx64-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=NVPTX64
-// NVPTX64: target datalayout = "e-p:64:64:64-i64:64:64-v16:16:16-v32:32:32-n16:32:64"
+// NVPTX64: target datalayout = "e-i64:64:64-v16:16:16-v32:32:32-n16:32:64"
// RUN: %clang_cc1 -triple r600-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=R600
@@ -102,7 +102,7 @@
// RUN: %clang_cc1 -triple r600-unknown -target-cpu hawaii -o - -emit-llvm %s \
// RUN: | FileCheck %s -check-prefix=R600SI
-// R600SI: target datalayout = "e-p:64:64:64-p3:32:32:32-i64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-v2048:2048:2048-n32:64"
+// R600SI: target datalayout = "e-p3:32:32:32-i64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-v2048:2048:2048-n32:64"
// RUN: %clang_cc1 -triple aarch64-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=AARCH64
@@ -130,7 +130,7 @@
// RUN: %clang_cc1 -triple s390x-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=SYSTEMZ
-// SYSTEMZ: target datalayout = "E-p:64:64:64-i1:8:16-i8:8:16-i16:16-i32:32-i64:64-f32:32-f64:64-f128:64-a:8:16-n32:64"
+// SYSTEMZ: target datalayout = "E-i1:8:16-i8:8:16-i16:16-i32:32-i64:64-f32:32-f64:64-f128:64-a:8:16-n32:64"
// RUN: %clang_cc1 -triple msp430-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=MSP430
@@ -146,4 +146,4 @@
// RUN: %clang_cc1 -triple spir64-unknown -o - -emit-llvm %s | \
// RUN: FileCheck %s -check-prefix=SPIR64
-// SPIR64: target datalayout = "e-p:64:64:64-i64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024"
+// SPIR64: target datalayout = "e-i64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024"
More information about the cfe-commits
mailing list