Subzero: Fix new issues after the LLVM 3.5 merge.

tests_lit/llvm2ice_tests/fp.pnacl.ll

 ; This tries to be a comprehensive test of f32 and f64 operations.
 ; The CHECK lines are only checking for basic instruction patterns
 ; that should be present regardless of the optimization level, so
 ; there are no special OPTM1 match lines.
 
-; 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
 ; RUN: %p2i -i %s --args -O2 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
 ; RUN: %p2i -i %s --args -Om1 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
 
 @__init_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__fini_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__tls_template_start = internal constant [0 x i8] zeroinitializer, align 8
@@ skipping 18 matching lines @@
 define internal i32 @passFpArgs(float %a, double %b, float %c, double %d, float %e, double %f) {
 entry:
   %call = call i32 @ignoreFpArgsNoInline(float %a, i32 123, double %b)
   %call1 = call i32 @ignoreFpArgsNoInline(float %c, i32 123, double %d)
   %call2 = call i32 @ignoreFpArgsNoInline(float %e, i32 123, double %f)
   %add = add i32 %call1, %call
   %add3 = add i32 %add, %call2
   ret i32 %add3
 }
 ; CHECK-LABEL: passFpArgs
-; CALLTARGETS-LABEL: passFpArgs
 ; CHECK: mov dword ptr [esp + 4], 123
-; CHECK: call -4
-; CALLTARGETS: .long ignoreFpArgsNoInline
+; CHECK: call ignoreFpArgsNoInline
 ; CHECK: mov dword ptr [esp + 4], 123
-; CHECK: call -4
-; CALLTARGETS: .long ignoreFpArgsNoInline
+; CHECK: call ignoreFpArgsNoInline
 ; CHECK: mov dword ptr [esp + 4], 123
-; CHECK: call -4
-; CALLTARGETS: .long ignoreFpArgsNoInline
+; CHECK: call ignoreFpArgsNoInline
 
 declare i32 @ignoreFpArgsNoInline(float %x, i32 %y, double %z)
 
 define internal i32 @passFpConstArg(float %a, double %b) {
 entry:
   %call = call i32 @ignoreFpArgsNoInline(float %a, i32 123, double 2.340000e+00)
   ret i32 %call
 }
 ; CHECK-LABEL: passFpConstArg
-; CALLTARGETS-LABEL: passFpConstArg
 ; CHECK: mov dword ptr [esp + 4], 123
-; CHECK: call -4
-; CALLTARGETS: .long ignoreFpArgsNoInline
+; CHECK: call ignoreFpArgsNoInline
 
 define internal i32 @passFp32ConstArg(float %a) {
 entry:
   %call = call i32 @ignoreFp32ArgsNoInline(float %a, i32 123, float 2.0)
   ret i32 %call
 }
 ; CHECK-LABEL: passFp32ConstArg
 ; CHECK: mov dword ptr [esp + 4], 123
 ; CHECK: movss dword ptr [esp + 8]
 ; CHECK: call ignoreFp32ArgsNoInline
@@ skipping 102 matching lines @@
 ; CHECK-LABEL: divDouble
 ; CHECK: divsd
 ; CHECK: fld
 
 define internal float @remFloat(float %a, float %b) {
 entry:
   %div = frem float %a, %b
   ret float %div
 }
 ; CHECK-LABEL: remFloat
-; CALLTARGETS-LABEL: remFloat
-; CHECK: call -4
-; CALLTARGETS: .long fmodf
+; CHECK: call fmodf
 
 define internal double @remDouble(double %a, double %b) {
 entry:
   %div = frem double %a, %b
   ret double %div
 }
 ; CHECK-LABEL: remDouble
-; CALLTARGETS-LABEL: remDouble
-; CHECK: call -4
-; CALLTARGETS: .long fmod
+; CHECK: call fmod
 
 define internal float @fptrunc(double %a) {
 entry:
   %conv = fptrunc double %a to float
   ret float %conv
 }
 ; CHECK-LABEL: fptrunc
 ; CHECK: cvtsd2ss
 ; CHECK: fld
 
 define internal double @fpext(float %a) {
 entry:
   %conv = fpext float %a to double
   ret double %conv
 }
 ; CHECK-LABEL: fpext
 ; CHECK: cvtss2sd
 ; CHECK: fld
 
 define internal i64 @doubleToSigned64(double %a) {
 entry:
   %conv = fptosi double %a to i64
   ret i64 %conv
 }
 ; CHECK-LABEL: doubleToSigned64
-; CALLTARGETS-LABEL: doubleToSigned64
-; CHECK: call -4
-; CALLTARGETS: .long cvtdtosi64
+; CHECK: call cvtdtosi64
 
 define internal i64 @floatToSigned64(float %a) {
 entry:
   %conv = fptosi float %a to i64
   ret i64 %conv
 }
 ; CHECK-LABEL: floatToSigned64
-; CALLTARGETS-LABEL: floatToSigned64
-; CHECK: call -4
-; CALLTARGETS: .long cvtftosi64
+; CHECK: call cvtftosi64
 
 define internal i64 @doubleToUnsigned64(double %a) {
 entry:
   %conv = fptoui double %a to i64
   ret i64 %conv
 }
 ; CHECK-LABEL: doubleToUnsigned64
-; CALLTARGETS-LABEL: doubleToUnsigned64
-; CHECK: call -4
-; CALLTARGETS: .long cvtdtoui64
+; CHECK: call cvtdtoui64
 
 define internal i64 @floatToUnsigned64(float %a) {
 entry:
   %conv = fptoui float %a to i64
   ret i64 %conv
 }
 ; CHECK-LABEL: floatToUnsigned64
-; CALLTARGETS-LABEL: floatToUnsigned64
-; CHECK: call -4
-; CALLTARGETS: .long cvtftoui64
+; CHECK: call cvtftoui64
 
 define internal i32 @doubleToSigned32(double %a) {
 entry:
   %conv = fptosi double %a to i32
   ret i32 %conv
 }
 ; CHECK-LABEL: doubleToSigned32
 ; CHECK: cvttsd2si
 
 define internal i32 @doubleToSigned32Const() {
@@ skipping 11 matching lines @@
 }
 ; CHECK-LABEL: floatToSigned32
 ; CHECK: cvttss2si
 
 define internal i32 @doubleToUnsigned32(double %a) {
 entry:
   %conv = fptoui double %a to i32
   ret i32 %conv
 }
 ; CHECK-LABEL: doubleToUnsigned32
-; CALLTARGETS-LABEL: doubleToUnsigned32
-; CHECK: call -4
-; CALLTARGETS: .long cvtdtoui32
+; CHECK: call cvtdtoui32
 
 define internal i32 @floatToUnsigned32(float %a) {
 entry:
   %conv = fptoui float %a to i32
   ret i32 %conv
 }
 ; CHECK-LABEL: floatToUnsigned32
-; CALLTARGETS-LABEL: floatToUnsigned32
-; CHECK: call -4
-; CALLTARGETS: .long cvtftoui32
+; CHECK: call cvtftoui32
 
 
 define internal i32 @doubleToSigned16(double %a) {
 entry:
   %conv = fptosi double %a to i16
   %conv.ret_ext = sext i16 %conv to i32
   ret i32 %conv.ret_ext
 }
 ; CHECK-LABEL: doubleToSigned16
 ; CHECK: cvttsd2si
@@ skipping 88 matching lines @@
 ; CHECK-LABEL: floatToUnsigned1
 ; CHECK: cvttss2si
 ; CHECK: and eax, 1
 
 define internal double @signed64ToDouble(i64 %a) {
 entry:
   %conv = sitofp i64 %a to double
   ret double %conv
 }
 ; CHECK-LABEL: signed64ToDouble
-; CALLTARGETS-LABEL: signed64ToDouble
-; CHECK: call -4
-; CALLTARGETS: .long cvtsi64tod
+; CHECK: call cvtsi64tod
 ; CHECK: fstp qword
 
 define internal float @signed64ToFloat(i64 %a) {
 entry:
   %conv = sitofp i64 %a to float
   ret float %conv
 }
 ; CHECK-LABEL: signed64ToFloat
-; CALLTARGETS-LABEL: signed64ToFloat
-; CHECK: call -4
-; CALLTARGETS: .long cvtsi64tof
+; CHECK: call cvtsi64tof
 ; CHECK: fstp dword
 
 define internal double @unsigned64ToDouble(i64 %a) {
 entry:
   %conv = uitofp i64 %a to double
   ret double %conv
 }
 ; CHECK-LABEL: unsigned64ToDouble
-; CALLTARGETS-LABEL: unsigned64ToDouble
-; CHECK: call -4
-; CALLTARGETS: .long cvtui64tod
+; CHECK: call cvtui64tod
 ; CHECK: fstp
 
 define internal float @unsigned64ToFloat(i64 %a) {
 entry:
   %conv = uitofp i64 %a to float
   ret float %conv
 }
 ; CHECK-LABEL: unsigned64ToFloat
-; CALLTARGETS-LABEL: unsigned64ToFloat
-; CHECK: call -4
-; CALLTARGETS: .long cvtui64tof
+; CHECK: call cvtui64tof
 ; CHECK: fstp
 
 define internal double @unsigned64ToDoubleConst() {
 entry:
   %conv = uitofp i64 12345678901234 to double
   ret double %conv
 }
 ; CHECK-LABEL: unsigned64ToDouble
-; CALLTARGETS-LABEL: unsigned64ToDouble
 ; CHECK: mov dword ptr [esp + 4], 2874
 ; CHECK: mov dword ptr [esp], 1942892530
-; CHECK: call -4
-; CALLTARGETS: .long cvtui64tod
+; CHECK: call cvtui64tod
 ; CHECK: fstp
 
 define internal double @signed32ToDouble(i32 %a) {
 entry:
   %conv = sitofp i32 %a to double
   ret double %conv
 }
 ; CHECK-LABEL: signed32ToDouble
 ; CHECK: cvtsi2sd
 ; CHECK: fld
@@ skipping 15 matching lines @@
 ; CHECK-LABEL: signed32ToFloat
 ; CHECK: cvtsi2ss
 ; CHECK: fld
 
 define internal double @unsigned32ToDouble(i32 %a) {
 entry:
   %conv = uitofp i32 %a to double
   ret double %conv
 }
 ; CHECK-LABEL: unsigned32ToDouble
-; CALLTARGETS-LABEL: unsigned32ToDouble
-; CHECK: call -4
-; CALLTARGETS: .long cvtui32tod
+; CHECK: call cvtui32tod
 ; CHECK: fstp qword
 
 define internal float @unsigned32ToFloat(i32 %a) {
 entry:
   %conv = uitofp i32 %a to float
   ret float %conv
 }
 ; CHECK-LABEL: unsigned32ToFloat
-; CALLTARGETS-LABEL: unsigned32ToFloat
-; CHECK: call -4
-; CALLTARGETS: .long cvtui32tof
+; CHECK: call cvtui32tof
 ; CHECK: fstp dword
 
 define internal double @signed16ToDouble(i32 %a) {
 entry:
   %a.arg_trunc = trunc i32 %a to i16
   %conv = sitofp i16 %a.arg_trunc to double
   ret double %conv
 }
 ; CHECK-LABEL: signed16ToDouble
 ; CHECK: cvtsi2sd
@@ skipping 701 matching lines @@
 define internal double @selectDoubleVarVar(double %a, double %b) {
 entry:
   %cmp = fcmp olt double %a, %b
   %cond = select i1 %cmp, double %a, double %b
   ret double %cond
 }
 ; CHECK-LABEL: selectDoubleVarVar
 ; CHECK: ucomisd
 ; CHECK: ja {{[0-9]}}
 ; CHECK: fld