Revert "[PPC] Give unaligned memory access lower cost on processor that supports it"

This reverts commit r292680. It is causing significantly worse
performance and test timeouts in our internal builds. I have already
routed reproduction instructions your way.

llvm-svn: 293092

3 files changed, 1 insertions, 31 deletions

diff --git a/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp b/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp
index 2f1bceaa481..f94d1eab097 100644
--- a/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp
@@ -401,10 +401,6 @@ int PPCTTIImpl::getMemoryOpCost(unsigned Opcode, Type *Src, unsigned Alignment,
   if (IsVSXType || (ST->hasVSX() && IsAltivecType))
     return Cost;
 
-  // Newer PPC supports unaligned memory access.
-  if (TLI->allowsMisalignedMemoryAccesses(LT.second, 0))
-    return Cost;
-
   // PPC in general does not support unaligned loads and stores. They'll need
   // to be decomposed based on the alignment factor.
 
diff --git a/llvm/test/Analysis/CostModel/PowerPC/load_store.ll b/llvm/test/Analysis/CostModel/PowerPC/load_store.ll
index b77dd444774..d48be5b5f62 100644
--- a/llvm/test/Analysis/CostModel/PowerPC/load_store.ll
+++ b/llvm/test/Analysis/CostModel/PowerPC/load_store.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s  -cost-model -analyze -mtriple=powerpc64-unknown-linux-gnu -mcpu=g5 -disable-ppc-unaligned | FileCheck %s
+; RUN: opt < %s  -cost-model -analyze -mtriple=powerpc64-unknown-linux-gnu -mcpu=g5 | FileCheck %s
 target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64"
 target triple = "powerpc64-unknown-linux-gnu"
 
diff --git a/llvm/test/Analysis/CostModel/PowerPC/unaligned_ld_st.ll b/llvm/test/Analysis/CostModel/PowerPC/unaligned_ld_st.ll
deleted file mode 100644
index 6addf25949e..00000000000
--- a/llvm/test/Analysis/CostModel/PowerPC/unaligned_ld_st.ll
+++ /dev/null
@@ -1,26 +0,0 @@
-; RUN: opt < %s -cost-model -analyze -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr8 -mattr=+vsx | FileCheck %s
-target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64"
-target triple = "powerpc64-unknown-linux-gnu"
-
-define i32 @test(i32 %arg) {
-
-  ; CHECK: cost of 1 {{.*}} load
-  load i8, i8* undef, align 1
-  ; CHECK: cost of 1 {{.*}} load
-  load i16, i16* undef, align 1
-  ; CHECK: cost of 1 {{.*}} load
-  load i32, i32* undef, align 1
-  ; CHECK: cost of 1 {{.*}} load
-  load i64, i64* undef, align 1
-
-  ; CHECK: cost of 1 {{.*}} store
-  store i8 undef, i8* undef, align 1
-  ; CHECK: cost of 1 {{.*}} store
-  store i16 undef, i16* undef, align 1
-  ; CHECK: cost of 1 {{.*}} store
-  store i32 undef, i32* undef, align 1
-  ; CHECK: cost of 1 {{.*}} store
-  store i64 undef, i64* undef, align 1
-
-  ret i32 undef
-}