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

tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll

Index: tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll
diff --git a/tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll b/tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll
index e13fb9b30ef4f95a01de520249f4cd2862ed0de1..b363f01002372eede73f61218be1522f2fe521b8 100644
--- a/tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll
+++ b/tests_lit/llvm2ice_tests/nacl-atomic-cmpxchg-optimization.ll
@@ -1,12 +1,8 @@
 ; This tests the optimization of atomic cmpxchg w/ following cmp + branches.
 
-; RUN: %p2i -i %s --args -O2 --verbose none \
-; 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 --verbose none \

[jvoung (off chromium), 2015/02/13 23:37:23]

Maybe this should pass the architecture flag to the assemble / disassemble too
while we are at it...

 ; RUN:   | FileCheck --check-prefix=O2 %s
-; RUN: %p2i -i %s --args -Om1 --verbose none \
-; 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 --verbose none \
 ; RUN:   | FileCheck --check-prefix=OM1 %s
 
 declare i32 @llvm.nacl.atomic.cmpxchg.i32(i32*, i32, i32, i32, i32)
@@ -37,7 +33,7 @@ done:
 }
 ; O2-LABEL: test_atomic_cmpxchg_loop
 ; O2: lock
-; O2-NEXT: cmpxchg dword ptr [e{{[^a].}}], e{{[^a]}}
+; O2-NEXT: cmpxchg DWORD PTR [e{{[^a].}}], e{{[^a]}}
 ; O2-NEXT: j{{e|ne}}
 ; Make sure the call isn't accidentally deleted.
 ; O2: call
@@ -45,7 +41,7 @@ done:
 ; Check that the unopt version does have a cmp
 ; OM1-LABEL: test_atomic_cmpxchg_loop
 ; OM1: lock
-; OM1-NEXT: cmpxchg dword ptr [e{{[^a].}}], e{{[^a]}}
+; OM1-NEXT: cmpxchg DWORD PTR [e{{[^a].}}], e{{[^a]}}
 ; OM1: cmp
 ; OM1: je
 ; OM1: call
@@ -68,7 +64,7 @@ done:
 }
 ; O2-LABEL: test_atomic_cmpxchg_loop2
 ; O2: lock
-; O2-NEXT: cmpxchg dword ptr [e{{[^a].}}], e{{[^a]}}
+; O2-NEXT: cmpxchg DWORD PTR [e{{[^a].}}], e{{[^a]}}
 ; O2-NOT: cmp
 ; O2: jne
 
@@ -91,7 +87,7 @@ done:
 }
 ; O2-LABEL: test_atomic_cmpxchg_loop_const
 ; O2: lock
-; O2-NEXT: cmpxchg dword ptr [e{{[^a].}}], e{{[^a]}}
+; O2-NEXT: cmpxchg DWORD PTR [e{{[^a].}}], e{{[^a]}}
 ; O2-NEXT: j{{e|ne}}
 
 ; This is a case where the flags cannot be reused (compare is for some
@@ -113,7 +109,7 @@ done:
 }
 ; O2-LABEL: test_atomic_cmpxchg_no_opt
 ; O2: lock
-; O2-NEXT: cmpxchg dword ptr [e{{[^a].}}], e{{[^a]}}
+; O2-NEXT: cmpxchg DWORD PTR [e{{[^a].}}], e{{[^a]}}
 ; O2: cmp
 ; O2: jle
 
@@ -137,7 +133,7 @@ done:
 }
 ; O2-LABEL: test_atomic_cmpxchg_no_opt2
 ; O2: lock
-; O2-NEXT: cmpxchg dword ptr [e{{[^a].}}], e{{[^a]}}
+; O2-NEXT: cmpxchg DWORD PTR [e{{[^a].}}], e{{[^a]}}
 ; O2: mov {{.*}}
 ; O2: cmp
 ; O2: je