Subzero: switch from llvm-objdump to objdump for lit tests (for LLVM merge)

tests_lit/llvm2ice_tests/ebp_args.ll

 ; This test originally exhibited a bug in ebp-based stack slots.  The
 ; problem was that during a function call push sequence, the esp
 ; adjustment was incorrectly added to the stack/frame offset for
 ; ebp-based frames.
 
-; RUN: %p2i -i %s --args -Om1 --target=x8632 --verbose none \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
+; RUN: %p2i --assemble --disassemble -i %s --args -Om1 --target=x8632 \
+; RUN:   --verbose none | FileCheck %s
 
 declare i32 @memcpy_helper2(i32 %buf, i32 %buf2, i32 %n)
 
 define i32 @memcpy_helper(i32 %buf, i32 %n) {
 entry:
   %buf2 = alloca i8, i32 128, align 4
   %n.arg_trunc = trunc i32 %n to i8
-  %arg_ext = zext i8 %n.arg_trunc to i32
+  %arg.ext = zext i8 %n.arg_trunc to i32
   %buf2.asint = ptrtoint i8* %buf2 to i32
-  %call = call i32 @memcpy_helper2(i32 %buf, i32 %buf2.asint, i32 %arg_ext)
+  %call = call i32 @memcpy_helper2(i32 %buf, i32 %buf2.asint, i32 %arg.ext)
   ret i32 %call
 }
 
 ; This check sequence is highly specific to the current Om1 lowering
 ; and stack slot assignment code, and may need to be relaxed if the
 ; lowering code changes.
 
-; CHECK-LABEL: memcpy_helper:
+; CHECK-LABEL: memcpy_helper
 ; CHECK:  push  ebp
-; CHECK:  mov   ebp, esp
+; CHECK:  mov   ebp,esp
 ; CHECK:  sub   esp, 24
 ; CHECK:  sub   esp, 128
-; CHECK:  mov   dword ptr [ebp - 4], esp
-; CHECK:  mov   eax, dword ptr [ebp + 12]
-; CHECK:  mov   dword ptr [ebp - 8], eax
-; CHECK:  movzx eax, byte ptr [ebp - 8]
-; CHECK:  mov   dword ptr [ebp - 12], eax
+; CHECK:  mov   DWORD PTR [ebp-4],esp
+; CHECK:  mov   eax,DWORD ptr [ebp+12]
+; CHECK:  mov   DWORD PTR [ebp-8],eax
+; CHECK:  movzx eax,BYTE PTR [ebp-8]
+; CHECK:  mov   DWORD PTR [ebp-12],eax
 ; CHECK:  sub   esp, 16
-; CHECK:  mov   eax, dword ptr [ebp + 8]
-; CHECK:  mov   dword ptr [esp], eax
-; CHECK:  mov   eax, dword ptr [ebp - 4]
-; CHECK:  mov   dword ptr [esp + 4], eax
-; CHECK:  mov   eax, dword ptr [ebp - 12]
-; CHECK:  mov   dword ptr [esp + 8], eax
-; CHECK:  call  memcpy_helper2
+; CHECK:  mov   eax,DWORD ptr [ebp+8]
+; CHECK:  mov   DWORD PTR [esp],eax
+; CHECK:  mov   eax,DWORD ptr [ebp-4]
+; CHECK:  mov   DWORD PTR [esp+4],eax
+; CHECK:  mov   eax,DWORD ptr [ebp-12]
+; CHECK:  mov   DWORD PTR [esp+8],eax
+; CHECK:  call 
+; CHECK-NEXT: R_{{.*}}  memcpy_helper2