Revert "[AArch64] Change the preferred alignment for char and short to word alignment"

This reverts commit r273279 as the change was not properly approved.

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

diff --git a/lib/Target/AArch64/AArch64TargetMachine.cpp b/lib/Target/AArch64/AArch64TargetMachine.cpp
index 0b6345ff8011b22fbb38db50a13fbdd694eec265..9237bc03f4a2e6977bf32140d5a553cfa89d6353 100644 (file)
--- a/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -133,8 +133,8 @@ static std::string computeDataLayout(const Triple &TT, bool LittleEndian) {
   if (TT.isOSBinFormatMachO())
     return "e-m:o-i64:64-i128:128-n32:64-S128";
   if (LittleEndian)
-    return "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128";
-  return "E-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128";
+    return "e-m:e-i64:64-i128:128-n32:64-S128";
+  return "E-m:e-i64:64-i128:128-n32:64-S128";
 }
 
 // Helper function to set up the defaults for reciprocals.

diff --git a/test/CodeGen/AArch64/preferred-alignment.ll b/test/CodeGen/AArch64/preferred-alignment.ll
deleted file mode 100644 (file)
index c032e83..0000000
--- a/test/CodeGen/AArch64/preferred-alignment.ll
+++ /dev/null
@@ -1,28 +0,0 @@
-; RUN: llc -mtriple=aarch64 -O0 < %s | FileCheck %s
-
-; Function Attrs: nounwind
-define i32 @foo() #0 {
-entry:
-  %c = alloca i8, align 1
-; CHECK:       add     x0, sp, #12
-  %s = alloca i16, align 2
-; CHECK-NEXT:  add     x1, sp, #8
-  %i = alloca i32, align 4
-; CHECK-NEXT:  add     x2, sp, #4
-  %call = call i32 @bar(i8* %c, i16* %s, i32* %i)
-  %0 = load i8, i8* %c, align 1
-  %conv = zext i8 %0 to i32
-  %add = add nsw i32 %call, %conv
-  %1 = load i16, i16* %s, align 2
-  %conv1 = sext i16 %1 to i32
-  %add2 = add nsw i32 %add, %conv1
-  %2 = load i32, i32* %i, align 4
-  %add3 = add nsw i32 %add2, %2
-  ret i32 %add3
-}
-
-declare i32 @bar(i8*, i16*, i32*) #1
-
-attributes #0 = { nounwind "no-frame-pointer-elim"="false" }
-attributes #1 = { "no-frame-pointer-elim"="false" }
-