Revert "reimplement the second half of the or/add optimization. We should now",

which depends on r116007, which I am about to revert.

llvm-svn: 116031

1 files changed, 2 insertions, 36 deletions

diff --git a/llvm/test/CodeGen/X86/3addr-or.ll b/llvm/test/CodeGen/X86/3addr-or.ll
index 912bdc21547..30a1f36850d 100644
--- a/llvm/test/CodeGen/X86/3addr-or.ll
+++ b/llvm/test/CodeGen/X86/3addr-or.ll
@@ -1,9 +1,9 @@
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin | FileCheck %s
 ; rdar://7527734
 
-define i32 @test1(i32 %x) nounwind readnone ssp {
+define i32 @test(i32 %x) nounwind readnone ssp {
 entry:
-; CHECK: test1:
+; CHECK: test:
 ; CHECK: leal 3(%rdi), %eax
   %0 = shl i32 %x, 5                              ; <i32> [#uses=1]
   %1 = or i32 %0, 3                               ; <i32> [#uses=1]
@@ -25,37 +25,3 @@ define i64 @test2(i8 %A, i8 %B) nounwind {
   %H = or i64 %G, %E                              ; <i64> [#uses=1]
   ret i64 %H
 }
-
-;; Test that OR is only emitted as LEA, not as ADD.
-
-define void @test3(i32 %x, i32* %P) nounwind readnone ssp {
-entry:
-; No reason to emit an add here, should be an or.
-; CHECK: test3:
-; CHECK: orl $3, %edi
-  %0 = shl i32 %x, 5
-  %1 = or i32 %0, 3
-  store i32 %1, i32* %P
-  ret void
-}
-
-define i32 @test4(i32 %a, i32 %b) nounwind readnone ssp {
-entry:
-  %and = and i32 %a, 6
-  %and2 = and i32 %b, 16
-  %or = or i32 %and2, %and
-  ret i32 %or
-; CHECK: test4:
-; CHECK: leal	(%rsi,%rdi), %eax
-}
-
-define void @test5(i32 %a, i32 %b, i32* nocapture %P) nounwind ssp {
-entry:
-  %and = and i32 %a, 6
-  %and2 = and i32 %b, 16
-  %or = or i32 %and2, %and
-  store i32 %or, i32* %P, align 4
-  ret void
-; CHECK: test5:
-; CHECK: orl
-}