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

tests_lit/llvm2ice_tests/randomize-regalloc.ll

Index: tests_lit/llvm2ice_tests/randomize-regalloc.ll
diff --git a/tests_lit/llvm2ice_tests/randomize-regalloc.ll b/tests_lit/llvm2ice_tests/randomize-regalloc.ll
index 1834c16ff736cb06a39b0adf316ee351ef7ee848..2f0df94b5e6bf806b2455865833537a9a0266428 100644
--- a/tests_lit/llvm2ice_tests/randomize-regalloc.ll
+++ b/tests_lit/llvm2ice_tests/randomize-regalloc.ll
@@ -2,46 +2,42 @@
 ; of this test will change with changes to the random number generator
 ; implementation.
 
-; RUN: %p2i -i %s --args -O2 -sz-seed=1 -randomize-regalloc \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
+; RUN: %p2i -i %s --assemble --disassemble --args -O2 -sz-seed=1 \
+; RUN:   -randomize-regalloc \
 ; RUN:   | FileCheck %s --check-prefix=CHECK_1
-; RUN: %p2i -i %s --args -Om1 -sz-seed=1 -randomize-regalloc \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
+; RUN: %p2i -i %s --assemble --disassemble --args -Om1 -sz-seed=1 \
+; RUN:   -randomize-regalloc \
 ; RUN:   | FileCheck %s --check-prefix=OPTM1_1
 
 ; Same tests but with a different seed, just to verify randomness.
-; RUN: %p2i -i %s --args -O2 -sz-seed=123 -randomize-regalloc \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
+; RUN: %p2i -i %s --assemble --disassemble --args -O2 -sz-seed=123 \
+; RUN:   -randomize-regalloc \
 ; RUN:   | FileCheck %s --check-prefix=CHECK_123
-; RUN: %p2i -i %s --args -Om1 -sz-seed=123 -randomize-regalloc \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
+; RUN: %p2i -i %s --assemble --disassemble --args -Om1 -sz-seed=123 \
+; RUN:   -randomize-regalloc \
 ; RUN:   | FileCheck %s --check-prefix=OPTM1_123
 
 define <4 x i32> @mul_v4i32(<4 x i32> %a, <4 x i32> %b) {
 entry:
   %res = mul <4 x i32> %a, %b
   ret <4 x i32> %res
-; OPTM1_1-LABEL: mul_v4i32:
+; OPTM1_1-LABEL: mul_v4i32
 ; OPTM1_1: sub     esp, 60
-; OPTM1_1-NEXT: movups  xmmword ptr [esp + 32], xmm0
-; OPTM1_1-NEXT: movups  xmmword ptr [esp + 16], xmm1
-; OPTM1_1-NEXT: movups  xmm0, xmmword ptr [esp + 32]
-; OPTM1_1-NEXT: pshufd  xmm7, xmmword ptr [esp + 32], 49
-; OPTM1_1-NEXT: pshufd  xmm4, xmmword ptr [esp + 16], 49
-; OPTM1_1-NEXT: pmuludq xmm0, xmmword ptr [esp + 16]
+; OPTM1_1-NEXT: movups  XMMWORD PTR [esp + 32], xmm0
+; OPTM1_1-NEXT: movups  XMMWORD PTR [esp + 16], xmm1
+; OPTM1_1-NEXT: movups  xmm0, XMMWORD PTR [esp + 32]
+; OPTM1_1-NEXT: pshufd  xmm7, XMMWORD PTR [esp + 32], 49
+; OPTM1_1-NEXT: pshufd  xmm4, XMMWORD PTR [esp + 16], 49
+; OPTM1_1-NEXT: pmuludq xmm0, XMMWORD PTR [esp + 16]
 ; OPTM1_1-NEXT: pmuludq xmm7, xmm4
 ; OPTM1_1-NEXT: shufps  xmm0, xmm7, -120
 ; OPTM1_1-NEXT: pshufd  xmm0, xmm0, -40
-; OPTM1_1-NEXT: movups  xmmword ptr [esp], xmm0
-; OPTM1_1-NEXT: movups  xmm0, xmmword ptr [esp]
+; OPTM1_1-NEXT: movups  XMMWORD PTR [esp], xmm0
+; OPTM1_1-NEXT: movups  xmm0, XMMWORD PTR [esp]
 ; OPTM1_1-NEXT: add     esp, 60
 ; OPTM1_1-NEXT: ret
 
-; CHECK_1-LABEL: mul_v4i32:
+; CHECK_1-LABEL: mul_v4i32
 ; CHECK_1: movups  xmm6, xmm0
 ; CHECK_1-NEXT: pshufd  xmm0, xmm0, 49
 ; CHECK_1-NEXT: pshufd  xmm5, xmm1, 49
@@ -52,23 +48,23 @@ entry:
 ; CHECK_1-NEXT: movups  xmm0, xmm6
 ; CHECK_1-NEXT: ret
 
-; OPTM1_123-LABEL: mul_v4i32:
+; OPTM1_123-LABEL: mul_v4i32
 ; OPTM1_123: sub     esp, 60
-; OPTM1_123-NEXT: movups  xmmword ptr [esp + 32], xmm0
-; OPTM1_123-NEXT: movups  xmmword ptr [esp + 16], xmm1
-; OPTM1_123-NEXT: movups  xmm0, xmmword ptr [esp + 32]
-; OPTM1_123-NEXT: pshufd  xmm2, xmmword ptr [esp + 32], 49
-; OPTM1_123-NEXT: pshufd  xmm6, xmmword ptr [esp + 16], 49
-; OPTM1_123-NEXT: pmuludq xmm0, xmmword ptr [esp + 16]
+; OPTM1_123-NEXT: movups  XMMWORD PTR [esp + 32], xmm0
+; OPTM1_123-NEXT: movups  XMMWORD PTR [esp + 16], xmm1
+; OPTM1_123-NEXT: movups  xmm0, XMMWORD PTR [esp + 32]
+; OPTM1_123-NEXT: pshufd  xmm2, XMMWORD PTR [esp + 32], 49
+; OPTM1_123-NEXT: pshufd  xmm6, XMMWORD PTR [esp + 16], 49
+; OPTM1_123-NEXT: pmuludq xmm0, XMMWORD PTR [esp + 16]
 ; OPTM1_123-NEXT: pmuludq xmm2, xmm6
 ; OPTM1_123-NEXT: shufps  xmm0, xmm2, -120
 ; OPTM1_123-NEXT: pshufd  xmm0, xmm0, -40
-; OPTM1_123-NEXT: movups  xmmword ptr [esp], xmm0
-; OPTM1_123-NEXT: movups  xmm0, xmmword ptr [esp]
+; OPTM1_123-NEXT: movups  XMMWORD PTR [esp], xmm0
+; OPTM1_123-NEXT: movups  xmm0, XMMWORD PTR [esp]
 ; OPTM1_123-NEXT: add     esp, 60
 ; OPTM1_123-NEXT: ret
 
-; CHECK_123-LABEL: mul_v4i32:
+; CHECK_123-LABEL: mul_v4i32
 ; CHECK_123: movups  xmm3, xmm0
 ; CHECK_123-NEXT: pshufd  xmm0, xmm0, 49
 ; CHECK_123-NEXT: pshufd  xmm7, xmm1, 49