From: Diana Picus <diana.picus@linaro.org>
Date: Fri, 24 Feb 2017 10:35:39 +0000 (+0000)
Subject: Revert "[ARM] GlobalISel: Legalize stores"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=269c5fd3e9b1412f46b360dca4b04de41e883dfd;p=llvm

Revert "[ARM] GlobalISel: Legalize stores"

This reverts commit r296103 because the test broke on one of the bots. Sorry!

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

diff --git a/lib/Target/ARM/ARMLegalizerInfo.cpp b/lib/Target/ARM/ARMLegalizerInfo.cpp
index 01752d67f9c..ceebc39e898 100644
--- a/lib/Target/ARM/ARMLegalizerInfo.cpp
+++ b/lib/Target/ARM/ARMLegalizerInfo.cpp
@@ -37,11 +37,9 @@ ARMLegalizerInfo::ARMLegalizerInfo(const ARMSubtarget &ST) {
 
   setAction({G_FRAME_INDEX, p0}, Legal);
 
-  for (unsigned Op : {G_LOAD, G_STORE}) {
-    for (auto Ty : {s1, s8, s16, s32, p0})
-      setAction({Op, Ty}, Legal);
-    setAction({Op, 1, p0}, Legal);
-  }
+  for (auto Ty : {s1, s8, s16, s32, p0})
+    setAction({G_LOAD, Ty}, Legal);
+  setAction({G_LOAD, 1, p0}, Legal);
 
   for (auto Ty : {s1, s8, s16, s32})
     setAction({G_ADD, Ty}, Legal);
diff --git a/test/CodeGen/ARM/GlobalISel/arm-legalizer.mir b/test/CodeGen/ARM/GlobalISel/arm-legalizer.mir
index 6a1a58ca636..4943a7305fb 100644
--- a/test/CodeGen/ARM/GlobalISel/arm-legalizer.mir
+++ b/test/CodeGen/ARM/GlobalISel/arm-legalizer.mir
@@ -9,7 +9,6 @@
 
   define void @test_load_from_stack() { ret void }
   define void @test_legal_loads() #0 { ret void }
-  define void @test_legal_stores() #0 { ret void }
 
   define void @test_fadd_s32() #0 { ret void }
   define void @test_fadd_s64() #0 { ret void }
@@ -200,42 +199,6 @@ body:             |
     BX_RET 14, _
 ...
 ---
-name:            test_legal_stores
-# CHECK-LABEL: name: test_legal_stores
-legalized:       false
-# CHECK: legalized: true
-regBankSelected: false
-selected:        false
-tracksRegLiveness: true
-registers:
-  - { id: 0, class: _ }
-  - { id: 1, class: _ }
-  - { id: 2, class: _ }
-  - { id: 3, class: _ }
-  - { id: 4, class: _ }
-  - { id: 5, class: _ }
-  - { id: 6, class: _ }
-body:             |
-  bb.0:
-    liveins: %r0, %r1, %r2, %r3
-
-    ; These are all legal, so we should find them unchanged in the output
-    ; CHECK-DAG: G_STORE {{%[0-9]+}}(s64), %0(p0)
-    ; CHECK-DAG: G_STORE {{%[0-9]+}}(s32), %0(p0)
-    ; CHECK-DAG: G_STORE {{%[0-9]+}}(s16), %0(p0)
-    ; CHECK-DAG: G_STORE {{%[0-9]+}}(s8), %0(p0)
-    ; CHECK-DAG: G_STORE {{%[0-9]+}}(s1), %0(p0)
-    ; CHECK-DAG: G_STORE {{%[0-9]+}}(p0), %0(p0)
-    %0(p0) = COPY %r0
-    G_STORE %1(s64), %0(p0) :: (store 8)
-    G_STORE %2(s32), %0(p0) :: (store 4)
-    G_STORE %3(s16), %0(p0) :: (store 2)
-    G_STORE %4(s8), %0(p0) :: (store 1)
-    G_STORE %5(s1), %0(p0) :: (store 1)
-    G_STORE %6(p0), %0(p0) :: (store 4)
-    BX_RET 14, _
-...
----
 name:            test_fadd_s32
 # CHECK-LABEL: name: test_fadd_s32
 legalized:       false