Clean up run script to use for testing Subzero.

tests_lit/llvm2ice_tests/vector-arith.ll

 ; This test checks support for vector arithmetic.
 
 ; TODO(jvoung): fix extra "CALLTARGETS" run. The llvm-objdump symbolizer
 ; doesn't know how to symbolize non-section-local functions.
 ; The newer LLVM 3.6 one does work, but watch out for other bugs.
 
-; RUN: %llvm2ice -O2 --verbose none %s \
+; RUN: %p2i -i %s -a -O2 --verbose none\
 ; RUN:   | FileCheck --check-prefix=CALLTARGETS %s
-; RUN: %llvm2ice -O2 --verbose none %s \
+; RUN: %p2i -i %s -a -O2 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -x86-asm-syntax=intel -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
-; RUN: %llvm2ice -Om1 --verbose none %s \
+; RUN: %p2i -i %s -a -Om1 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -x86-asm-syntax=intel -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
-; RUN: %llvm2ice -O2 -mattr=sse4.1 --verbose none %s \
+; RUN: %p2i -i %s -a -O2 -mattr=sse4.1 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -x86-asm-syntax=intel -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
 ; RUN:   | FileCheck --check-prefix=SSE41 %s
-; RUN: %llvm2ice -Om1 -mattr=sse4.1 --verbose none %s \
+; RUN: %p2i -i %s -a -Om1 -mattr=sse4.1 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -x86-asm-syntax=intel -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
 ; RUN:   | FileCheck --check-prefix=SSE41 %s
-; RUN: %llvm2ice --verbose none %s | FileCheck --check-prefix=ERRORS %s
-; RUN: %llvm2iceinsts %s | %szdiff %s | FileCheck --check-prefix=DUMP %s
-; RUN: %llvm2iceinsts --pnacl %s | %szdiff %s \
-; RUN:                           | FileCheck --check-prefix=DUMP %s
+; RUN: %p2i -i %s -a --verbose none | FileCheck --check-prefix=ERRORS %s
+; RUN: %p2i -i %s --insts | %szdiff %s | FileCheck --check-prefix=DUMP %s
 
 define <4 x float> @test_fadd(<4 x float> %arg0, <4 x float> %arg1) {
 entry:
   %res = fadd <4 x float> %arg0, %arg1
   ret <4 x float> %res
 ; CHECK-LABEL: test_fadd:
 ; CHECK: addps
 }
 
 define <4 x float> @test_fsub(<4 x float> %arg0, <4 x float> %arg1) {
@@ skipping 540 matching lines @@
   ret <4 x i32> %res
 ; CHECK-LABEL: test_srem_v4i32:
 ; CHECK: idiv
 ; CHECK: idiv
 ; CHECK: idiv
 ; CHECK: idiv
 }
 
 ; ERRORS-NOT: ICE translation error
 ; DUMP-NOT: SZ