Clean up run script to use for testing Subzero.

tests_lit/llvm2ice_tests/vector-fcmp.ll

 ; This file checks support for comparing vector values with the fcmp
 ; instruction.
 
-; 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 --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
 
 ; Check that sext elimination occurs when the result of the comparison
 ; instruction is alrady sign extended.  Sign extension to 4 x i32 uses
 ; the pslld instruction.
 define <4 x i32> @sextElimination(<4 x float> %a, <4 x float> %b) {
 entry:
   %res.trunc = fcmp oeq <4 x float> %a, %b
   %res = sext <4 x i1> %res.trunc to <4 x i32>
   ret <4 x i32> %res
 ; CHECK-LABEL: sextElimination:
@@ skipping 145 matching lines @@
   %res.trunc = fcmp uno <4 x float> %a, %b
   %res = sext <4 x i1> %res.trunc to <4 x i32>
   ret <4 x i32> %res
 ; CHECK-LABEL: fcmpUnoVector:
 ; CHECK: cmpunordps
 }
 
 ; ERRORS-NOT: ICE translation error
 ; DUMP-NOT: SZ