Clean up run script to use for testing Subzero.

tests_lit/llvm2ice_tests/fpcall.ll

 ; Test that for calls returning a floating-point value, the calling
 ; ABI with respect to the x87 floating point stack is honored.  In
 ; particular, the top-of-stack must be popped regardless of whether
 ; its value is used.
 
-; RUN: %llvm2ice -O2 --verbose none %s \
+; RUN: %p2i -i %s --args -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 --args -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 --args --verbose none | FileCheck --check-prefix=ERRORS %s
+; RUN: %p2i -i %s --insts | %szdiff %s | FileCheck --check-prefix=DUMP %s
 
 define float @dummy() {
 entry:
   ret float 0.000000e+00
 }
 ; CHECK-LABEL: dummy
 
 ; The call is ignored, but the top of the FP stack still needs to be
 ; popped.
 define i32 @ignored_fp_call() {
@@ skipping 25 matching lines @@
   %fp = call float @dummy()
   ret float %fp
 }
 ; CHECK-LABEL: returned_fp_call
 ; CHECK: call dummy
 ; CHECK: fstp
 ; CHECK: fld
 
 ; ERRORS-NOT: ICE translation error
 ; DUMP-NOT: SZ