[MSP430] Fix data layout string.

Summary:
Without this patch some types have incorrect size and/or alignment
according to the MSP430 EABI.

Reviewers: asl, awygle

Reviewed By: asl

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D34561

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@306159 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 64 insertions, 3 deletions

diff --git a/lib/Target/MSP430/MSP430TargetMachine.cpp b/lib/Target/MSP430/MSP430TargetMachine.cpp
index d8fdc8ba674..982c6fea62d 100644
--- a/lib/Target/MSP430/MSP430TargetMachine.cpp
+++ b/lib/Target/MSP430/MSP430TargetMachine.cpp
@@ -32,16 +32,20 @@ static Reloc::Model getEffectiveRelocModel(Optional<Reloc::Model> RM) {
   return *RM;
 }
 
+static std::string computeDataLayout(const Triple &TT, StringRef CPU,
+                                     const TargetOptions &Options) {
+  return "e-m:e-p:16:16-i32:16-i64:16-f32:16-f64:16-a:8-n8:16-S16";
+}
+
 MSP430TargetMachine::MSP430TargetMachine(const Target &T, const Triple &TT,
                                          StringRef CPU, StringRef FS,
                                          const TargetOptions &Options,
                                          Optional<Reloc::Model> RM,
                                          CodeModel::Model CM,
                                          CodeGenOpt::Level OL)
-    : LLVMTargetMachine(T, "e-m:e-p:16:16-i32:16:32-a:16-n8:16", TT, CPU, FS,
+    : LLVMTargetMachine(T, computeDataLayout(TT, CPU, Options), TT, CPU, FS,
                         Options, getEffectiveRelocModel(RM), CM, OL),
       TLOF(make_unique<TargetLoweringObjectFileELF>()),
-      // FIXME: Check DataLayout string.
       Subtarget(TT, CPU, FS, *this) {
   initAsmInfo();
 }
diff --git a/test/CodeGen/MSP430/Inst16mm.ll b/test/CodeGen/MSP430/Inst16mm.ll
index a48d8592c1a..951002d60a0 100644
--- a/test/CodeGen/MSP430/Inst16mm.ll
+++ b/test/CodeGen/MSP430/Inst16mm.ll
@@ -64,6 +64,6 @@ entry:
  %0 = load i16, i16* %retval                          ; <i16> [#uses=1]
  ret i16 %0
 ; CHECK-LABEL: mov2:
-; CHECK:	mov.w	2(r1), 6(r1)
 ; CHECK:	mov.w	0(r1), 4(r1)
+; CHECK:	mov.w	2(r1), 6(r1)
 }
diff --git a/test/CodeGen/MSP430/struct_layout.ll b/test/CodeGen/MSP430/struct_layout.ll
new file mode 100644
index 00000000000..60ae9f09b4e
--- /dev/null
+++ b/test/CodeGen/MSP430/struct_layout.ll
@@ -0,0 +1,57 @@
+; RUN: llc < %s | FileCheck %s
+
+target triple = "msp430"
+
+%struct.X = type { i8 }
+
+; CHECK-LABEL: @foo
+; CHECK: sub.w   #4, r1
+; CHECK: mov.b   #1, 3(r1)
+define void @foo() {
+  %1 = alloca %struct.X
+  %2 = alloca %struct.X
+  %3 = alloca %struct.X
+  %4 = getelementptr inbounds %struct.X, %struct.X* %1, i32 0, i32 0
+  store i8 1, i8* %4
+  %5 = getelementptr inbounds %struct.X, %struct.X* %2, i32 0, i32 0
+  store i8 1, i8* %5
+  %6 = getelementptr inbounds %struct.X, %struct.X* %3, i32 0, i32 0
+  store i8 1, i8* %6
+  ret void
+}
+
+; CHECK-LABEL: @bar
+; CHECK: sub.w   #4, r1
+; CHECK: mov.b   #1, 3(r1)
+define void @bar() {
+  %1 = alloca [3 x %struct.X]
+  %2 = getelementptr inbounds [3 x %struct.X], [3 x %struct.X]* %1, i16 0, i16 0
+  %3 = getelementptr inbounds %struct.X, %struct.X* %2, i32 0, i32 0
+  store i8 1, i8* %3
+  %4 = getelementptr inbounds [3 x %struct.X], [3 x %struct.X]* %1, i16 0, i16 1
+  %5 = getelementptr inbounds %struct.X, %struct.X* %4, i32 0, i32 0
+  store i8 1, i8* %5
+  %6 = getelementptr inbounds [3 x %struct.X], [3 x %struct.X]* %1, i16 0, i16 2
+  %7 = getelementptr inbounds %struct.X, %struct.X* %6, i32 0, i32 0
+  store i8 1, i8* %7
+  ret void
+}
+
+%struct.Y = type { i8, i16 }
+
+; CHECK-LABEL: @baz
+; CHECK: sub.w   #8, r1
+; CHECK: mov.w   #2, 6(r1)
+define void @baz() {
+  %1 = alloca %struct.Y, align 2
+  %2 = alloca %struct.Y, align 2
+  %3 = getelementptr inbounds %struct.Y, %struct.Y* %1, i32 0, i32 0
+  store i8 1, i8* %3, align 2
+  %4 = getelementptr inbounds %struct.Y, %struct.Y* %1, i32 0, i32 1
+  store i16 2, i16* %4, align 2
+  %5 = getelementptr inbounds %struct.Y, %struct.Y* %2, i32 0, i32 0
+  store i8 1, i8* %5, align 2
+  %6 = getelementptr inbounds %struct.Y, %struct.Y* %2, i32 0, i32 1
+  store i16 2, i16* %6, align 2
+  ret void
+}