ARM: Fix fastcc calling convention for Thumb1

When targetting Thumb1 on a processor which has a VFP unit (which
is not accessible from Thumb1), we were converting the fastcc calling
convention to AAPCS-VFP, which is not possible.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210889 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Oliver Stannard 2014-06-13 08:33:03 +00:00
parent efa4805b58
commit a19c2d4a6d
2 changed files with 39 additions and 3 deletions

View File

@ -1205,7 +1205,7 @@ ARMTargetLowering::getEffectiveCallingConv(CallingConv::ID CC,
case CallingConv::C:
if (!Subtarget->isAAPCS_ABI())
return CallingConv::ARM_APCS;
else if (Subtarget->hasVFP2() &&
else if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() &&
getTargetMachine().Options.FloatABIType == FloatABI::Hard &&
!isVarArg)
return CallingConv::ARM_AAPCS_VFP;
@ -1213,10 +1213,10 @@ ARMTargetLowering::getEffectiveCallingConv(CallingConv::ID CC,
return CallingConv::ARM_AAPCS;
case CallingConv::Fast:
if (!Subtarget->isAAPCS_ABI()) {
if (Subtarget->hasVFP2() && !isVarArg)
if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() && !isVarArg)
return CallingConv::Fast;
return CallingConv::ARM_APCS;
} else if (Subtarget->hasVFP2() && !isVarArg)
} else if (Subtarget->hasVFP2() && !Subtarget->isThumb1Only() && !isVarArg)
return CallingConv::ARM_AAPCS_VFP;
else
return CallingConv::ARM_AAPCS;

View File

@ -0,0 +1,36 @@
; RUN: llc < %s -mcpu=arm926ej-s -mattr=+vfp2
; This is a regression test, to ensure that fastcc functions are correctly
; handled when compiling for a processor which has a floating-point unit which
; is not accessible from the selected instruction set.
target datalayout = "e-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-v128:64:128-a:0:32-n32-S64"
target triple = "thumbv5e-none-linux-gnueabi"
; Function Attrs: optsize
define fastcc void @_foo(float %walpha) #0 {
entry:
br label %for.body13
for.body13: ; preds = %for.body13, %entry
br i1 undef, label %for.end182.critedge, label %for.body13
for.end182.critedge: ; preds = %for.body13
%conv183 = fpext float %walpha to double
%mul184 = fmul double %conv183, 8.200000e-01
%conv185 = fptrunc double %mul184 to float
%conv188 = fpext float %conv185 to double
%mul189 = fmul double %conv188, 6.000000e-01
%conv190 = fptrunc double %mul189 to float
br label %for.body193
for.body193: ; preds = %for.body193, %for.end182.critedge
%mul195 = fmul float %conv190, undef
br label %for.body193
}
attributes #0 = { optsize "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
!llvm.ident = !{!0}
!0 = metadata !{metadata !"clang version 3.5.0 "}