Clean up run script to use for testing Subzero.

tests_lit/llvm2ice_tests/convert.ll

 ; Simple test of signed and unsigned integer conversions.
 
 ; TODO(jvoung): llvm-objdump doesn't symbolize global symbols well, so we
 ; have [0] == i8v, [2] == i16v, [4] == i32v, [8] == i64v, etc.
 
-; 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
+; TODO(kschimpf) Find out why lc2i is needed.
+; RUN: %lc2i -i %s --insts | %szdiff %s | FileCheck --check-prefix=DUMP %s
 
 @i8v = internal global [1 x i8] zeroinitializer, align 1
 @i16v = internal global [2 x i8] zeroinitializer, align 2
 @i32v = internal global [4 x i8] zeroinitializer, align 4
 @i64v = internal global [8 x i8] zeroinitializer, align 8
 @u8v = internal global [1 x i8] zeroinitializer, align 1
 @u16v = internal global [2 x i8] zeroinitializer, align 2
 @u32v = internal global [4 x i8] zeroinitializer, align 4
 @u64v = internal global [8 x i8] zeroinitializer, align 8
 
@@ skipping 177 matching lines @@
   ret void
 }
 ; CHECK-LABEL: from_uint64
 ; CHECK: [24]
 ; CHECK: [0]
 ; CHECK: [2]
 ; CHECK: [4]
 
 ; ERRORS-NOT: ICE translation error
 ; DUMP-NOT: SZ