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

tests_lit/llvm2ice_tests/phi.ll

Index: tests_lit/llvm2ice_tests/phi.ll
diff --git a/tests_lit/llvm2ice_tests/phi.ll b/tests_lit/llvm2ice_tests/phi.ll
index 83fdee5182587dd1d9de3aab67a55927d32a4b36..133ba0fc31172d053fa32c8a15762fabdf572f94 100644
--- a/tests_lit/llvm2ice_tests/phi.ll
+++ b/tests_lit/llvm2ice_tests/phi.ll
@@ -2,9 +2,9 @@
 ; it tests that it does the right thing when it tries to enable
 ; compare/branch fusing.
 
-; RUN: %p2i -i %s --args -O2 --verbose none --phi-edge-split=0 \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d -symbolize -x86-asm-syntax=intel - | FileCheck %s
+; RUN: %p2i -i %s --assemble --disassemble --args -O2 --verbose none \
+; RUN:   --phi-edge-split=0 \
+; RUN:   | FileCheck %s
 
 define internal i32 @testPhi1(i32 %arg) {
 entry:
@@ -20,15 +20,15 @@ target:
 ; Test that compare/branch fusing does not happen, and Phi lowering is
 ; put in the right place.
 ; CHECK-LABEL: testPhi1
-; CHECK: cmp {{.*}}, 0
-; CHECK: mov {{.*}}, 1
+; CHECK: cmp {{.*}},0x0
+; CHECK: mov {{.*}},0x1
 ; CHECK: jg
-; CHECK: mov {{.*}}, 0
+; CHECK: mov {{.*}},0x0
 ; CHECK: mov [[PHI:.*]],
-; CHECK: cmp {{.*}}, 0
+; CHECK: cmp {{.*}},0x0
 ; CHECK: je
-; CHECK: mov [[PHI]], 0
-; CHECK: movzx {{.*}}, [[PHI]]
+; CHECK: mov [[PHI]],0x0
+; CHECK: movzx {{.*}},[[PHI]]
 
 define internal i32 @testPhi2(i32 %arg) {
 entry:
@@ -42,11 +42,11 @@ target:
 }
 ; Test that compare/branch fusing and Phi lowering happens as expected.
 ; CHECK-LABEL: testPhi2
-; CHECK: mov {{.*}}, 12345
-; CHECK: cmp {{.*}}, 0
+; CHECK: mov {{.*}},0x3039
+; CHECK: cmp {{.*}},0x0
 ; CHECK-NEXT: jle
-; CHECK: mov [[PHI:.*]], 54321
-; CHECK: mov {{.*}}, [[PHI]]
+; CHECK: mov [[PHI:.*]],0xd431
+; CHECK: mov {{.*}},[[PHI]]
 
 ; Test that address mode inference doesn't extend past
 ; multi-definition, non-SSA Phi temporaries.
@@ -77,14 +77,14 @@ exit:
 ;
 ; testPhi3:
 ; .LtestPhi3$entry:
-;         mov     eax, dword ptr [esp+4]
+;         mov     eax, DWORD PTR [esp+4]
 ;         mov     ecx, eax
 ; .LtestPhi3$body:
-;         mov     ecx, dword ptr [ecx+1000]
+;         mov     ecx, DWORD PTR [ecx+1000]
 ;         cmp     ecx, 0
 ;         jne     .LtestPhi3$body
 ; .LtestPhi3$exit:
-;         mov     dword ptr [ecx+1000], eax
+;         mov     DWORD PTR [ecx+1000], eax
 ;         ret
 ;
 ; This is bad because the final store address is supposed to be the
@@ -93,10 +93,10 @@ exit:
 
 ; CHECK-LABEL: testPhi3
 ; CHECK: push [[EBX:.*]]
-; CHECK: mov {{.*}}, dword ptr [esp
+; CHECK: mov {{.*}},DWORD PTR [esp
 ; CHECK: mov
-; CHECK: mov {{.*}}, dword ptr [[ADDR:.*1000]]
-; CHECK: cmp {{.*}}, 0
+; CHECK: mov {{.*}},DWORD PTR [[ADDR:.*0x3e8]]
+; CHECK: cmp {{.*}},0x0
 ; CHECK: jne
-; CHECK: mov dword ptr [[ADDR]]
+; CHECK: mov DWORD PTR [[ADDR]]
 ; CHECK: pop [[EBX]]