Subzero: Adjust expectations now that llvm-mc aligns calls not just naclcall.

tests_lit/llvm2ice_tests/64bit.pnacl.ll

 ; This tries to be a comprehensive test of i64 operations, in
 ; particular the patterns for lowering i64 operations into constituent
 ; i32 operations on x86-32.
 
 ; 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: %p2i -i %s --args -O2 --verbose none \
 ; RUN:   | FileCheck --check-prefix=CALLTARGETS %s
@@ skipping 84 matching lines @@
 }
 ; CHECK-LABEL: pass64BitConstArg
 ; CALLTARGETS-LABEL: pass64BitConstArg
 ; CHECK:      sub     esp
 ; CHECK:      mov     dword ptr [esp + 4]
 ; CHECK-NEXT: mov     dword ptr [esp]
 ; CHECK-NEXT: mov     dword ptr [esp + 8], 123
 ; Bundle padding might be added (so not using -NEXT).
 ; CHECK:      mov     dword ptr [esp + 16], 3735928559
 ; CHECK-NEXT: mov     dword ptr [esp + 12], 305419896
-; CHECK-NEXT: call    -4
+; Bundle padding will push the call down.
+; CHECK-NOT:  mov
+; CHECK:      call    -4
 ; CALLTARGETS: call ignore64BitArgNoInline
 ;
 ; OPTM1-LABEL: pass64BitConstArg
 ; OPTM1:      sub     esp
 ; OPTM1:      mov     dword ptr [esp + 4]
 ; OPTM1-NEXT: mov     dword ptr [esp]
 ; OPTM1-NEXT: mov     dword ptr [esp + 8], 123
 ; Bundle padding might be added (so not using -NEXT).
 ; OPTM1:      mov     dword ptr [esp + 16], 3735928559
 ; OPTM1-NEXT: mov     dword ptr [esp + 12], 305419896
-; OPTM1-NEXT: call    -4
+; OPTM1-NOT:  mov
+; OPTM1:      call    -4
 
 define internal i64 @return64BitArg(i64 %a) {
 entry:
   ret i64 %a
 }
 ; CHECK-LABEL: return64BitArg
 ; CHECK: mov     {{.*}}, dword ptr [esp + 4]
 ; CHECK: mov     {{.*}}, dword ptr [esp + 8]
 ;
 ; OPTM1-LABEL: return64BitArg
@@ skipping 1193 matching lines @@
   ret void
 }
 ; The following checks are not strictly necessary since one of the RUN
 ; lines actually runs the output through the assembler.
 ; CHECK-LABEL: icmpLt64Imm
 ; CHECK-NOT: cmp {{[0-9]+}},
 ; OPTM1-LABEL: icmpLt64Imm
 ; OPTM1-NOT: cmp {{[0-9]+}},
 
 ; ERRORS-NOT: ICE translation error